diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-23 15:10:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-23 15:10:26 +0300 |
commit | 5c9f6c66fabf22927e862b2b60362e4ea25b250b (patch) | |
tree | 6ff391dcb7fdd3126f71af9fa4ca5e776a9ecbe3 /scripts/frontend | |
parent | 65fdda8d39a9af414dbe5aa3a385b9bcba00960b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/frontend')
-rw-r--r-- | scripts/frontend/frontend_script_utils.js | 7 | ||||
-rw-r--r-- | scripts/frontend/prettier.js | 4 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint-duplicate-selectors.js | 4 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint-utility-classes.js | 4 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint-utility-map.js | 2 | ||||
-rw-r--r-- | scripts/frontend/stylelint/stylelint-utils.js | 2 | ||||
-rwxr-xr-x | scripts/frontend/webpack_dev_server.js | 6 |
7 files changed, 12 insertions, 17 deletions
diff --git a/scripts/frontend/frontend_script_utils.js b/scripts/frontend/frontend_script_utils.js index e3d357b4a40..5614737d278 100644 --- a/scripts/frontend/frontend_script_utils.js +++ b/scripts/frontend/frontend_script_utils.js @@ -9,12 +9,7 @@ const exec = (command, args) => { return execFileSync(command, args, options); }; -const execGitCmd = args => - exec('git', args) - .trim() - .toString() - .split('\n') - .filter(Boolean); +const execGitCmd = args => exec('git', args).trim().toString().split('\n').filter(Boolean); module.exports = { getStagedFiles: fileExtensionFilter => { diff --git a/scripts/frontend/prettier.js b/scripts/frontend/prettier.js index 7772f80c233..b55822505c3 100644 --- a/scripts/frontend/prettier.js +++ b/scripts/frontend/prettier.js @@ -11,7 +11,7 @@ const globIgnore = ['**/node_modules/**', 'vendor/**', 'public/**']; const readFileAsync = (file, options) => new Promise((resolve, reject) => { - fs.readFile(file, options, function(err, data) { + fs.readFile(file, options, function (err, data) { if (err) reject(err); else resolve(data); }); @@ -19,7 +19,7 @@ const readFileAsync = (file, options) => const writeFileAsync = (file, data, options) => new Promise((resolve, reject) => { - fs.writeFile(file, data, options, function(err) { + fs.writeFile(file, data, options, function (err) { if (err) reject(err); else resolve(); }); diff --git a/scripts/frontend/stylelint/stylelint-duplicate-selectors.js b/scripts/frontend/stylelint/stylelint-duplicate-selectors.js index 4b46ee21a7a..89242158157 100644 --- a/scripts/frontend/stylelint/stylelint-duplicate-selectors.js +++ b/scripts/frontend/stylelint/stylelint-duplicate-selectors.js @@ -8,12 +8,12 @@ const messages = stylelint.utils.ruleMessages(ruleName, { }, }); -module.exports = stylelint.createPlugin(ruleName, function(enabled) { +module.exports = stylelint.createPlugin(ruleName, function (enabled) { if (!enabled) { return; } - return function(root, result) { + return function (root, result) { const selectorGroups = {}; utils.createPropertiesHashmap(root, result, ruleName, messages, selectorGroups, true); }; diff --git a/scripts/frontend/stylelint/stylelint-utility-classes.js b/scripts/frontend/stylelint/stylelint-utility-classes.js index 8a1cfdbf302..1b266fc31c9 100644 --- a/scripts/frontend/stylelint/stylelint-utility-classes.js +++ b/scripts/frontend/stylelint/stylelint-utility-classes.js @@ -10,12 +10,12 @@ const messages = stylelint.utils.ruleMessages(ruleName, { }, }); -module.exports = stylelint.createPlugin(ruleName, function(enabled) { +module.exports = stylelint.createPlugin(ruleName, function (enabled) { if (!enabled) { return; } - return function(root, result) { + return function (root, result) { utils.createPropertiesHashmap(root, result, ruleName, messages, utilityClasses, false); }; }); diff --git a/scripts/frontend/stylelint/stylelint-utility-map.js b/scripts/frontend/stylelint/stylelint-utility-map.js index 941198e82a4..cc555fb6d2a 100644 --- a/scripts/frontend/stylelint/stylelint-utility-map.js +++ b/scripts/frontend/stylelint/stylelint-utility-map.js @@ -42,7 +42,7 @@ sass.render( prettierOptions, ); - fs.writeFile(hashMapPath, prettyHashmap, function(err) { + fs.writeFile(hashMapPath, prettyHashmap, function (err) { if (err) { return console.log(err); } diff --git a/scripts/frontend/stylelint/stylelint-utils.js b/scripts/frontend/stylelint/stylelint-utils.js index 2d931c1c4c2..09b75bb1d63 100644 --- a/scripts/frontend/stylelint/stylelint-utils.js +++ b/scripts/frontend/stylelint/stylelint-utils.js @@ -25,7 +25,7 @@ module.exports.createPropertiesHashmap = ( ) ) { let cssArray = []; - rule.nodes.forEach(function(property) { + rule.nodes.forEach(function (property) { const { prop, value } = property; if (property && value) { const propval = `${prop}${value}${property.important ? '!important' : ''}`; diff --git a/scripts/frontend/webpack_dev_server.js b/scripts/frontend/webpack_dev_server.js index 8026a8d47e2..fbb80c9617d 100755 --- a/scripts/frontend/webpack_dev_server.js +++ b/scripts/frontend/webpack_dev_server.js @@ -51,7 +51,7 @@ else { // print useful messages for nodemon events nodemon - .on('start', function() { + .on('start', function () { console.log(`Starting webpack webserver on http://${DEV_SERVER_HOST}:${DEV_SERVER_PORT}`); if (STATIC_MODE) { console.log('You are starting webpack in compile-once mode'); @@ -59,10 +59,10 @@ nodemon console.log('If you change them often, you might want to unset DEV_SERVER_STATIC'); } }) - .on('quit', function() { + .on('quit', function () { console.log('Shutting down webpack process'); process.exit(); }) - .on('restart', function(files) { + .on('restart', function (files) { console.log('Restarting webpack process due to: ', files); }); |