From cc3972827c546f1cb922dd6f9561153c8094d38b Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Mon, 9 Sep 2019 13:34:44 +0100 Subject: [PATCH] Additional changes required --- docs/migration-guide.md | 4 ++-- packages/airbnb-base/README.md | 2 +- packages/airbnb/README.md | 2 +- packages/create-project/commands/init/constants.js | 2 +- packages/eslint/README.md | 2 +- packages/eslint/index.js | 14 +++++++------- packages/standardjs/README.md | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/migration-guide.md b/docs/migration-guide.md index c25a63ace..6e6d72910 100644 --- a/docs/migration-guide.md +++ b/docs/migration-guide.md @@ -190,8 +190,8 @@ module.exports = { } ``` -- **BREAKING CHANGE** Upgraded to latest major versions of webpack, webpack-dev-server, Babel 7, -ESLint 5, and related packages [#809](https://github.com/neutrinojs/neutrino/pull/809). +- **BREAKING CHANGE** Upgraded to latest major versions of webpack, webpack-dev-server, Babel, +ESLint, and related packages [#809](https://github.com/neutrinojs/neutrino/pull/809) and others. - **BREAKING CHANGE** The `@neutrinojs/chunk` middleware has been removed in favor of webpack's improved functionality around `splitChunks` [#809](https://github.com/neutrinojs/neutrino/pull/809). See [the split chunks documentation](https://webpack.js.org/plugins/split-chunks-plugin/) for more information. diff --git a/packages/airbnb-base/README.md b/packages/airbnb-base/README.md index 1d7d276de..346ef5f25 100644 --- a/packages/airbnb-base/README.md +++ b/packages/airbnb-base/README.md @@ -25,7 +25,7 @@ instead._ - Yarn v1.2.1+, or npm v5.4+ - Neutrino 9 and one of the Neutrino build presets - webpack 4 -- ESLint 5 +- ESLint 6 ## Quickstart diff --git a/packages/airbnb/README.md b/packages/airbnb/README.md index e75314151..6baca9eac 100644 --- a/packages/airbnb/README.md +++ b/packages/airbnb/README.md @@ -20,7 +20,7 @@ with Airbnb's ESLint config, following the - Yarn v1.2.1+, or npm v5.4+ - Neutrino 9 and one of the Neutrino build presets - webpack 4 -- ESLint 5 +- ESLint 6 ## Quickstart diff --git a/packages/create-project/commands/init/constants.js b/packages/create-project/commands/init/constants.js index be747f114..9d097c066 100644 --- a/packages/create-project/commands/init/constants.js +++ b/packages/create-project/commands/init/constants.js @@ -32,7 +32,7 @@ const N = { }; // Tool dependencies -const ESLINT = 'eslint@^5'; +const ESLINT = 'eslint@^6'; const JEST = 'jest@^24'; const KARMA = 'karma@^4'; const KARMA_CLI = 'karma-cli@^2'; diff --git a/packages/eslint/README.md b/packages/eslint/README.md index 24ba592c5..9b581c112 100644 --- a/packages/eslint/README.md +++ b/packages/eslint/README.md @@ -11,7 +11,7 @@ and eslint-loader. - Yarn v1.2.1+, or npm v5.4+ - Neutrino 9 and one of the Neutrino build presets - webpack 4 -- ESLint 5 +- ESLint 6 ## Installation diff --git a/packages/eslint/index.js b/packages/eslint/index.js index 1cdf52313..ffe4188b4 100644 --- a/packages/eslint/index.js +++ b/packages/eslint/index.js @@ -4,7 +4,7 @@ const arrayToObject = array => array.reduce((obj, item) => Object.assign(obj, { [item]: true }), {}); // Return an ESLint config object matching the schema here: -// https://github.com/eslint/eslint/blob/v5.7.0/conf/config-schema.js +// https://github.com/eslint/eslint/blob/v6.3.0/conf/config-schema.js const eslintrc = neutrino => { const options = neutrino.config.module .rule('lint') @@ -55,10 +55,8 @@ const eslintrc = neutrino => { const validLoaderOptions = [ // Used by eslint-loader itself. See: - // https://github.com/webpack-contrib/eslint-loader#options - // (Plus more that aren't documented) + // https://github.com/webpack-contrib/eslint-loader/blob/v3.0.0/src/options.json 'cache', - 'cacheIdentifier', 'emitError', 'emitWarning', 'eslintPath', @@ -70,7 +68,7 @@ const validLoaderOptions = [ 'quiet', // Used by CLIEngine. See: // https://eslint.org/docs/developer-guide/nodejs-api#cliengine - // https://github.com/eslint/eslint/blob/v5.7.0/lib/cli-engine.js#L39-L62 + // https://github.com/eslint/eslint/blob/v6.3.0/lib/cli-engine/cli-engine.js#L54-L76 // Excluding the cache options (since eslint-loader handles that), // and any that are not applicable to `CLIEngine.executeOnText()`. 'allowInlineConfig', @@ -78,6 +76,7 @@ const validLoaderOptions = [ 'configFile', 'cwd', 'envs', + 'fixTypes', 'globals', 'ignore', 'ignorePath', @@ -86,14 +85,15 @@ const validLoaderOptions = [ 'parserOptions', 'plugins', 'reportUnusedDisableDirectives', + 'resolvePluginsRelativeTo', 'rulePaths', 'rules', 'useEslintrc', ]; module.exports = ({ test, include, exclude, eslint = {} } = {}) => { - // Neither eslint-loader nor ESLint's `CLIEngine` validate passed options, so - // we do so here to make it easier to work out why settings seemingly aren't + // Neither eslint-loader nor ESLint's `CLIEngine` fully validate passed options, + // so we do so here to make it easier to work out why settings seemingly aren't // taking effect. This is particularly important given that the configuration // options are inconsistently named between CLIEngine and the eslintrc schema. // Upstream issues for adding validation: diff --git a/packages/standardjs/README.md b/packages/standardjs/README.md index a3c959e63..797445ec0 100644 --- a/packages/standardjs/README.md +++ b/packages/standardjs/README.md @@ -20,7 +20,7 @@ projects with the [StandardJS ESLint config](https://standardjs.com). - Yarn v1.2.1+, or npm v5.4+ - Neutrino 9 and one of the Neutrino build presets - webpack 4 -- ESLint 5 +- ESLint 6 ## Quickstart