Merge branch 'mg-remove-node6-support' into 'master'
Remove node 6 config See merge request gitlab-org/gitlab-ce!25933
This commit is contained in:
commit
6474eca196
10
.prettierrc
10
.prettierrc
|
@ -1,13 +1,5 @@
|
||||||
{
|
{
|
||||||
"printWidth": 100,
|
"printWidth": 100,
|
||||||
"singleQuote": true,
|
"singleQuote": true,
|
||||||
"trailingComma": "es5",
|
"trailingComma": "all"
|
||||||
"overrides": [
|
|
||||||
{
|
|
||||||
"files": ["**/app/**/*", "**/spec/**/*"],
|
|
||||||
"options": {
|
|
||||||
"trailingComma": "all"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ webpackConfig.devtool = 'cheap-inline-source-map';
|
||||||
webpackConfig.plugins.push(
|
webpackConfig.plugins.push(
|
||||||
new webpack.DefinePlugin({
|
new webpack.DefinePlugin({
|
||||||
'process.env.BABEL_ENV': JSON.stringify(process.env.BABEL_ENV || process.env.NODE_ENV || null),
|
'process.env.BABEL_ENV': JSON.stringify(process.env.BABEL_ENV || process.env.NODE_ENV || null),
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
const specFilters = argumentsParser
|
const specFilters = argumentsParser
|
||||||
|
@ -37,7 +37,7 @@ const specFilters = argumentsParser
|
||||||
memo.push(filter, filter.replace(/\/?$/, '/**/*.js'));
|
memo.push(filter, filter.replace(/\/?$/, '/**/*.js'));
|
||||||
return memo;
|
return memo;
|
||||||
},
|
},
|
||||||
[]
|
[],
|
||||||
)
|
)
|
||||||
.parse(process.argv).filterSpec;
|
.parse(process.argv).filterSpec;
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ if (specFilters.length) {
|
||||||
root: ROOT_PATH,
|
root: ROOT_PATH,
|
||||||
matchBase: true,
|
matchBase: true,
|
||||||
})
|
})
|
||||||
.filter(path => path.endsWith('spec.js'))
|
.filter(path => path.endsWith('spec.js')),
|
||||||
);
|
);
|
||||||
|
|
||||||
// flatten
|
// flatten
|
||||||
|
@ -78,8 +78,8 @@ if (specFilters.length) {
|
||||||
new webpack.ContextReplacementPlugin(
|
new webpack.ContextReplacementPlugin(
|
||||||
/spec[\\\/]javascripts$/,
|
/spec[\\\/]javascripts$/,
|
||||||
path.join(ROOT_PATH, 'spec/javascripts'),
|
path.join(ROOT_PATH, 'spec/javascripts'),
|
||||||
newContext
|
newContext,
|
||||||
)
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -251,7 +251,7 @@ module.exports = {
|
||||||
} else {
|
} else {
|
||||||
resource.request = path.join(
|
resource.request = path.join(
|
||||||
ROOT_PATH,
|
ROOT_PATH,
|
||||||
'app/assets/javascripts/vue_shared/components/empty_component.js'
|
'app/assets/javascripts/vue_shared/components/empty_component.js',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
@ -267,7 +267,7 @@ module.exports = {
|
||||||
const missingDeps = Array.from(compilation.missingDependencies);
|
const missingDeps = Array.from(compilation.missingDependencies);
|
||||||
const nodeModulesPath = path.join(ROOT_PATH, 'node_modules');
|
const nodeModulesPath = path.join(ROOT_PATH, 'node_modules');
|
||||||
const hasMissingNodeModules = missingDeps.some(
|
const hasMissingNodeModules = missingDeps.some(
|
||||||
file => file.indexOf(nodeModulesPath) !== -1
|
file => file.indexOf(nodeModulesPath) !== -1,
|
||||||
);
|
);
|
||||||
|
|
||||||
// watch for changes to missing node_modules
|
// watch for changes to missing node_modules
|
||||||
|
@ -278,7 +278,7 @@ module.exports = {
|
||||||
|
|
||||||
// report our auto-generated bundle count
|
// report our auto-generated bundle count
|
||||||
console.log(
|
console.log(
|
||||||
`${autoEntriesCount} entries from '/pages' automatically added to webpack output.`
|
`${autoEntriesCount} entries from '/pages' automatically added to webpack output.`,
|
||||||
);
|
);
|
||||||
|
|
||||||
callback();
|
callback();
|
||||||
|
|
|
@ -169,7 +169,7 @@
|
||||||
"nodemon": "^1.18.9",
|
"nodemon": "^1.18.9",
|
||||||
"pixelmatch": "^4.0.2",
|
"pixelmatch": "^4.0.2",
|
||||||
"postcss": "^7.0.14",
|
"postcss": "^7.0.14",
|
||||||
"prettier": "1.16.1",
|
"prettier": "1.16.4",
|
||||||
"stylelint": "^9.10.1",
|
"stylelint": "^9.10.1",
|
||||||
"stylelint-config-recommended": "^2.1.0",
|
"stylelint-config-recommended": "^2.1.0",
|
||||||
"stylelint-scss": "^3.5.3",
|
"stylelint-scss": "^3.5.3",
|
||||||
|
|
|
@ -13,7 +13,7 @@ if (process.platform === 'darwin') {
|
||||||
ensure that it is supported by the fsevents library.
|
ensure that it is supported by the fsevents library.
|
||||||
|
|
||||||
You can try installing again with \`${chalk.cyan('yarn install --force')}\`
|
You can try installing again with \`${chalk.cyan('yarn install --force')}\`
|
||||||
`)
|
`),
|
||||||
);
|
);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ let globDir = process.argv[3] || '';
|
||||||
if (globDir && globDir.charAt(globDir.length - 1) !== '/') globDir += '/';
|
if (globDir && globDir.charAt(globDir.length - 1) !== '/') globDir += '/';
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
`Loading all ${allFiles ? '' : 'staged '}files ${globDir ? `within ${globDir} ` : ''}...`
|
`Loading all ${allFiles ? '' : 'staged '}files ${globDir ? `within ${globDir} ` : ''}...`,
|
||||||
);
|
);
|
||||||
|
|
||||||
const globPatterns = matchExtensions.map(ext => `${globDir}**/*.${ext}`);
|
const globPatterns = matchExtensions.map(ext => `${globDir}**/*.${ext}`);
|
||||||
|
@ -105,7 +105,7 @@ Promise.all(matchedFiles.map(checkFileWithPrettierConfig))
|
||||||
.then(() => {
|
.then(() => {
|
||||||
const failAction = shouldSave ? 'fixed' : 'failed';
|
const failAction = shouldSave ? 'fixed' : 'failed';
|
||||||
console.log(
|
console.log(
|
||||||
`\nSummary:\n ${matchedCount} files processed (${passedCount} passed, ${failedCount} ${failAction}, ${ignoredCount} ignored)\n`
|
`\nSummary:\n ${matchedCount} files processed (${passedCount} passed, ${failedCount} ${failAction}, ${ignoredCount} ignored)\n`,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (didWarn) process.exit(1);
|
if (didWarn) process.exit(1);
|
||||||
|
|
10
yarn.lock
10
yarn.lock
|
@ -8086,16 +8086,16 @@ prepend-http@^2.0.0:
|
||||||
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
|
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
|
||||||
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
|
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
|
||||||
|
|
||||||
prettier@1.16.1:
|
|
||||||
version "1.16.1"
|
|
||||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.1.tgz#534c2c9d7853f8845e5e078384e71973bd74089f"
|
|
||||||
integrity sha512-XXUITwIkGb3CPJ2hforHah/zTINRyie5006Jd2HKy2qz7snEJXl0KLfsJZW/wst9g6R2rFvqba3VpNYdu1hDcA==
|
|
||||||
|
|
||||||
prettier@1.16.3:
|
prettier@1.16.3:
|
||||||
version "1.16.3"
|
version "1.16.3"
|
||||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
|
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
|
||||||
integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
|
integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
|
||||||
|
|
||||||
|
prettier@1.16.4:
|
||||||
|
version "1.16.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
|
||||||
|
integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
|
||||||
|
|
||||||
pretty-format@^24.0.0:
|
pretty-format@^24.0.0:
|
||||||
version "24.0.0"
|
version "24.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0.tgz#cb6599fd73ac088e37ed682f61291e4678f48591"
|
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.0.0.tgz#cb6599fd73ac088e37ed682f61291e4678f48591"
|
||||||
|
|
Loading…
Reference in New Issue