diff --git a/package.json b/package.json index 8827981c0a..bdd465fdcf 100644 --- a/package.json +++ b/package.json @@ -11,13 +11,11 @@ "eslint-plugin-babel": "^4.0.0", "eslint-plugin-react": "^6.8.0", "eslint-plugin-redux-saga": "^0.3.0", - "gitbook-cli": "^2.3.2", "istanbul": "~0.4.2", "jest": "^22.4.3", "jest-cli": "^22.4.4", "lerna": "^2.0.0", "lodash": "^4.17.5", - "mocha": "~2.4.5", "pre-commit": "~1.1.2", "redux-saga": "^0.14.3", "request": "^2.87.0", diff --git a/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json b/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json deleted file mode 100644 index c7c8cc075a..0000000000 --- a/packages/strapi-helper-plugin/lib/internals/eslint/.eslintrc.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "parser": "babel-eslint", - "extends": [ - "airbnb", - "prettier", - "eslint:recommended" - ], - "env": { - "browser": true, - "node": true, - "mocha": true, - "es6": true - }, - "plugins": [ - "redux-saga", - "react", - "jsx-a11y" - ], - "parserOptions": { - "ecmaVersion": 7, - "sourceType": "module", - "ecmaFeatures": { - "impliedStrict": true, - "jsx": true - } - }, - "rules": { - "comma-dangle": [ - 2, - "always-multiline" - ], - "import/newline-after-import": 0, - "import/no-dynamic-require": 0, - "import/no-extraneous-dependencies": 0, - "import/no-named-as-default": 0, - "import/no-unresolved": 2, - "import/prefer-default-export": 0, - "import/order": [ - "error", - { - "groups": [ - "builtin", - "external", - "internal", - "parent", - "sibling", - "index" - ] - } - ], - "import/imports-first": 2, - "indent": [ - 2, - 2, - { - "SwitchCase": 1 - } - ], - "jsx-a11y/aria-props": 2, - "jsx-a11y/no-static-element-interactions": 0, - "jsx-a11y/heading-has-content": 0, - "jsx-a11y/interactive-supports-focus": 0, - "jsx-a11y/label-has-for": 2, - "jsx-a11y/mouse-events-have-key-events": 2, - "jsx-a11y/role-has-required-aria-props": 2, - "jsx-a11y/role-supports-aria-props": 2, - "jsx-a11y/href-no-hash": "off", - "jsx-a11y/anchor-is-valid": ["warn", { "aspects": ["invalidHref"] }], - "jsx-a11y/no-noninteractive-element-interactions": 0, - "max-len": 0, - "newline-per-chained-call": 0, - "no-console": 1, - "no-use-before-define": 0, - "prefer-template": 2, - "class-methods-use-this": 0, - "react/react-in-jsx-scope": 0, - "react/forbid-prop-types": 0, - "react/jsx-first-prop-new-line": [ - 2, - "multiline" - ], - "react/jsx-filename-extension": 0, - "react/jsx-no-target-blank": 0, - "react/no-did-mount-set-state": 0, - "react/require-extension": 0, - "react/self-closing-comp": 0, - "redux-saga/no-yield-in-race": 2, - "redux-saga/yield-effects": 2, - "require-yield": 0, - "react/forbid-prop-types": 0, - "react/no-unescaped-entities": 0, - "react/prefer-stateless-function": 0, - "react/sort-prop-types": 2, - "react/require-default-props": 2, - "no-undef": 0, - "react/no-array-index-key": 0, - "react/sort-comp": 0, - "react/jsx-handler-names": [ - 2, - { - "eventHandlerPrefix": "handle", - "eventHandlerPropPrefix": "on" - } - ], - "semi": 2 - }, - "settings": { - "import/resolver": { - "webpack": { - "config": "node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.test.babel.js" - } - } - } -} diff --git a/packages/strapi-helper-plugin/lib/internals/eslint/eslint-config.js b/packages/strapi-helper-plugin/lib/internals/eslint/eslint-config.js deleted file mode 100644 index 2071d00ce5..0000000000 --- a/packages/strapi-helper-plugin/lib/internals/eslint/eslint-config.js +++ /dev/null @@ -1,8 +0,0 @@ -const config = require('./.eslintrc.json'); - -// Update the eslint configuration for `strapi-helper-plugin` module -if (process.env.IS_HELPER) { - config.settings['import/resolver'].webpack.config = './lib/internals/webpack/webpack.test.babel.js'; -} - -module.exports = config; diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 9321aeae1d..00671a816e 100644 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -30,7 +30,6 @@ "add-asset-html-webpack-plugin": "^2.1.2", "babel-cli": "^6.26.0", "babel-core": "^6.26.0", - "babel-eslint": "^7.2.3", "babel-loader": "^7.1.1", "babel-plugin-istanbul": "^4.1.5", "babel-plugin-styled-components": "^1.5.1", @@ -39,7 +38,7 @@ "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-plugin-transform-react-constant-elements": "^6.23.0", "babel-plugin-transform-react-inline-elements": "^6.22.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.8", + "babel-plugin-transform-react-remove-prop-types": "^0.4.18", "babel-polyfill": "^6.26.0", "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.24.1", @@ -51,15 +50,6 @@ "copy-webpack-plugin": "^4.3.1", "cross-env": "^5.0.5", "css-loader": "^0.28.5", - "eslint": "4.4.1", - "eslint-config-airbnb": "15.1.0", - "eslint-config-airbnb-base": "11.3.1", - "eslint-config-prettier": "2.3.0", - "eslint-import-resolver-webpack": "0.8.3", - "eslint-plugin-import": "2.8.0", - "eslint-plugin-jsx-a11y": "6.0.2", - "eslint-plugin-react": "7.2.1", - "eslint-plugin-redux-saga": "0.4.0", "exports-loader": "^0.6.4", "express": "^4.15.4", "extract-text-webpack-plugin": "^3.0.0", @@ -67,15 +57,14 @@ "history": "^4.6.3", "html-loader": "^0.5.1", "html-webpack-plugin": "^2.30.1", - "image-webpack-loader": "^3.3.1", - "immutable": "^3.8.1", + "image-webpack-loader": "^4.3.1", + "immutable": "^3.8.2", "imports-loader": "^0.7.1", "intl": "^1.2.5", "invariant": "2.2.1", "json-loader": "^0.5.7", "lodash": "^4.17.5", "lodash-webpack-plugin": "^0.11.4", - "mocha": "3.1.2", "moment": "^2.16.0", "node-sass": "^4.5.3", "null-loader": "^0.1.1", @@ -88,29 +77,29 @@ "precss": "^2.0.0", "prettier": "^1.5.3", "prop-types": "^15.5.10", - "react": "^16.0.0", - "react-datetime": "^2.8.6", + "react": "^16.5.2", + "react-datetime": "^2.15.0", "react-dnd": "^5.0.0", "react-dnd-html5-backend": "^5.0.1", - "react-dom": "^16.0.0", + "react-dom": "^16.5.2", "react-helmet": "^5.1.3", - "react-intl": "^2.3.0", - "react-loadable": "^5.3.1", - "react-redux": "^5.0.6", - "react-router-dom": "^4.1.2", - "react-router-redux": "^5.0.0-alpha.6", - "react-transition-group": "^2.2.0", - "reactstrap": "^5.0.0-alpha.3", - "redux": "^3.7.2", + "react-intl": "^2.7.0", + "react-loadable": "^5.5.0", + "react-redux": "^5.0.7", + "react-router-dom": "^4.3.1", + "react-router-redux": "^5.0.0-alpha.9", + "react-transition-group": "^2.5.0", + "reactstrap": "^5.0.0", + "redux": "^4.0.0", "redux-immutable": "^4.0.0", - "redux-saga": "^0.15.6", + "redux-saga": "^0.16.0", "reselect": "^3.0.1", "rimraf": "^2.6.1", "sass-loader": "^6.0.6", "shelljs": "^0.7.8", "style-loader": "^0.18.2", - "styled-components": "3.2.6", - "url-loader": "^0.5.9", + "styled-components": "^3.2.6", + "url-loader": "^1.1.1", "webpack": "^3.5.5", "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-middleware": "^1.12.0", diff --git a/packages/strapi-hook-mongoose/package.json b/packages/strapi-hook-mongoose/package.json index 47db3f710c..ad78bbb365 100644 --- a/packages/strapi-hook-mongoose/package.json +++ b/packages/strapi-hook-mongoose/package.json @@ -16,7 +16,7 @@ "main": "./lib", "dependencies": { "lodash": "^4.17.5", - "mongoose": "^5.0.16", + "mongoose": "^5.2.17", "mongoose-float": "^1.0.2", "pluralize": "^6.0.0", "rimraf": "^2.6.2", diff --git a/scripts/test.sh b/scripts/test.sh deleted file mode 100644 index c817012d50..0000000000 --- a/scripts/test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ -z "$TEST_GREP" ]; then - TEST_GREP="" -fi - -node node_modules/mocha/bin/_mocha `scripts/_get-test-directories.sh` --opts test/mocha.opts --grep "$TEST_GREP"