BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Unverified Commit 9238c5d5 by Mike Greiling
Options

prettify all node scripts

parent 5b6931b8
Showing with 74 additions and 79 deletions
.babelrc
{ {
"presets": [ "presets": [["latest", { "es2015": { "modules": false } }], "stage-2"],
["latest", { "es2015": { "modules": false } }],
"stage-2"
],
"env": { "env": {
"coverage": { "coverage": {
"plugins": [ "plugins": [
["istanbul", { [
"exclude": [ "istanbul",
"spec/javascripts/**/*", {
"app/assets/javascripts/locale/**/app.js" "exclude": ["spec/javascripts/**/*", "app/assets/javascripts/locale/**/app.js"]
] }
}], ],
["transform-define", { [
"process.env.BABEL_ENV": "coverage" "transform-define",
}] {
"process.env.BABEL_ENV": "coverage"
}
]
] ]
} }
} }
......
config/karma.config.js
...@@ -5,7 +5,7 @@ var ROOT_PATH = path.resolve(__dirname, '..'); ...@@ -5,7 +5,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
// remove problematic plugins // remove problematic plugins
if (webpackConfig.plugins) { if (webpackConfig.plugins) {
webpackConfig.plugins = webpackConfig.plugins.filter(function (plugin) { webpackConfig.plugins = webpackConfig.plugins.filter(function(plugin) {
return !( return !(
plugin instanceof webpack.optimize.CommonsChunkPlugin || plugin instanceof webpack.optimize.CommonsChunkPlugin ||
plugin instanceof webpack.optimize.ModuleConcatenationPlugin || plugin instanceof webpack.optimize.ModuleConcatenationPlugin ||
...@@ -24,7 +24,7 @@ module.exports = function(config) { ...@@ -24,7 +24,7 @@ module.exports = function(config) {
var karmaConfig = { var karmaConfig = {
basePath: ROOT_PATH, basePath: ROOT_PATH,
browsers: ['ChromeHeadlessCustom'], browsers: ['ChromeHeadlessCustom'],
customLaunchers: { customLaunchers: {
ChromeHeadlessCustom: { ChromeHeadlessCustom: {
base: 'ChromeHeadless', base: 'ChromeHeadless',
...@@ -34,7 +34,7 @@ module.exports = function(config) { ...@@ -34,7 +34,7 @@ module.exports = function(config) {
// escalated kernel privileges (e.g. docker run --cap-add=CAP_SYS_ADMIN) // escalated kernel privileges (e.g. docker run --cap-add=CAP_SYS_ADMIN)
'--no-sandbox', '--no-sandbox',
], ],
} },
}, },
frameworks: ['jasmine'], frameworks: ['jasmine'],
files: [ files: [
...@@ -55,7 +55,7 @@ module.exports = function(config) { ...@@ -55,7 +55,7 @@ module.exports = function(config) {
reports: ['html', 'text-summary'], reports: ['html', 'text-summary'],
dir: 'coverage-javascript/', dir: 'coverage-javascript/',
subdir: '.', subdir: '.',
fixWebpackSourcePaths: true fixWebpackSourcePaths: true,
}; };
karmaConfig.browserNoActivityTimeout = 60000; // 60 seconds karmaConfig.browserNoActivityTimeout = 60000; // 60 seconds
} }
......
config/webpack.config.js
'use strict';
const crypto = require('crypto'); const crypto = require('crypto');
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
...@@ -27,10 +25,10 @@ let watchAutoEntries = []; ...@@ -27,10 +25,10 @@ let watchAutoEntries = [];
function generateEntries() { function generateEntries() {
// generate automatic entry points // generate automatic entry points
const autoEntries = {}; const autoEntries = {};
const pageEntries = glob.sync('pages/**/index.js', { cwd: path.join(ROOT_PATH, 'app/assets/javascripts') }); const pageEntries = glob.sync('pages/**/index.js', {
watchAutoEntries = [ cwd: path.join(ROOT_PATH, 'app/assets/javascripts'),
path.join(ROOT_PATH, 'app/assets/javascripts/pages/'), });
]; watchAutoEntries = [path.join(ROOT_PATH, 'app/assets/javascripts/pages/')];
function generateAutoEntries(path, prefix = '.') { function generateAutoEntries(path, prefix = '.') {
const chunkPath = path.replace(/\/index\.js$/, ''); const chunkPath = path.replace(/\/index\.js$/, '');
...@@ -38,16 +36,16 @@ function generateEntries() { ...@@ -38,16 +36,16 @@ function generateEntries() {
autoEntries[chunkName] = `${prefix}/${path}`; autoEntries[chunkName] = `${prefix}/${path}`;
} }
pageEntries.forEach(( path ) => generateAutoEntries(path)); pageEntries.forEach(path => generateAutoEntries(path));
autoEntriesCount = Object.keys(autoEntries).length; autoEntriesCount = Object.keys(autoEntries).length;
const manualEntries = { const manualEntries = {
common: './commons/index.js', common: './commons/index.js',
main: './main.js', main: './main.js',
raven: './raven/index.js', raven: './raven/index.js',
webpack_runtime: './webpack.js', webpack_runtime: './webpack.js',
ide: './ide/index.js', ide: './ide/index.js',
}; };
return Object.assign(manualEntries, autoEntries); return Object.assign(manualEntries, autoEntries);
...@@ -91,8 +89,8 @@ const config = { ...@@ -91,8 +89,8 @@ const config = {
{ {
loader: 'worker-loader', loader: 'worker-loader',
options: { options: {
inline: true inline: true,
} },
}, },
{ loader: 'babel-loader' }, { loader: 'babel-loader' },
], ],
...@@ -103,7 +101,7 @@ const config = { ...@@ -103,7 +101,7 @@ const config = {
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[hash].[ext]', name: '[name].[hash].[ext]',
} },
}, },
{ {
test: /katex.css$/, test: /katex.css$/,
...@@ -113,8 +111,8 @@ const config = { ...@@ -113,8 +111,8 @@ const config = {
{ {
loader: 'css-loader', loader: 'css-loader',
options: { options: {
name: '[name].[hash].[ext]' name: '[name].[hash].[ext]',
} },
}, },
], ],
}, },
...@@ -124,7 +122,7 @@ const config = { ...@@ -124,7 +122,7 @@ const config = {
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[hash].[ext]', name: '[name].[hash].[ext]',
} },
}, },
{ {
test: /monaco-editor\/\w+\/vs\/loader\.js$/, test: /monaco-editor\/\w+\/vs\/loader\.js$/,
...@@ -132,7 +130,7 @@ const config = { ...@@ -132,7 +130,7 @@ const config = {
{ loader: 'exports-loader', options: 'l.global' }, { loader: 'exports-loader', options: 'l.global' },
{ loader: 'imports-loader', options: 'l=>{},this=>l,AMDLoader=>this,module=>undefined' }, { loader: 'imports-loader', options: 'l=>{},this=>l,AMDLoader=>this,module=>undefined' },
], ],
} },
], ],
noParse: [/monaco-editor\/\w+\/vs\//], noParse: [/monaco-editor\/\w+\/vs\//],
...@@ -150,10 +148,10 @@ const config = { ...@@ -150,10 +148,10 @@ const config = {
source: false, source: false,
chunks: false, chunks: false,
modules: false, modules: false,
assets: true assets: true,
}); });
return JSON.stringify(stats, null, 2); return JSON.stringify(stats, null, 2);
} },
}), }),
// prevent pikaday from including moment.js // prevent pikaday from including moment.js
...@@ -170,7 +168,7 @@ const config = { ...@@ -170,7 +168,7 @@ const config = {
new NameAllModulesPlugin(), new NameAllModulesPlugin(),
// assign deterministic chunk ids // assign deterministic chunk ids
new webpack.NamedChunksPlugin((chunk) => { new webpack.NamedChunksPlugin(chunk => {
if (chunk.name) { if (chunk.name) {
return chunk.name; return chunk.name;
} }
...@@ -187,9 +185,12 @@ const config = { ...@@ -187,9 +185,12 @@ const config = {
const pagesBase = path.join(ROOT_PATH, 'app/assets/javascripts/pages'); const pagesBase = path.join(ROOT_PATH, 'app/assets/javascripts/pages');
if (m.resource.indexOf(pagesBase) === 0) { if (m.resource.indexOf(pagesBase) === 0) {
moduleNames.push(path.relative(pagesBase, m.resource) moduleNames.push(
.replace(/\/index\.[a-z]+$/, '') path
.replace(/\//g, '__')); .relative(pagesBase, m.resource)
.replace(/\/index\.[a-z]+$/, '')
.replace(/\//g, '__')
);
} else { } else {
moduleNames.push(path.relative(m.context, m.resource)); moduleNames.push(path.relative(m.context, m.resource));
} }
...@@ -197,7 +198,8 @@ const config = { ...@@ -197,7 +198,8 @@ const config = {
chunk.forEachModule(collectModuleNames); chunk.forEachModule(collectModuleNames);
const hash = crypto.createHash('sha256') const hash = crypto
.createHash('sha256')
.update(moduleNames.join('_')) .update(moduleNames.join('_'))
.digest('hex'); .digest('hex');
...@@ -212,7 +214,10 @@ const config = { ...@@ -212,7 +214,10 @@ const config = {
// copy pre-compiled vendor libraries verbatim // copy pre-compiled vendor libraries verbatim
new CopyWebpackPlugin([ new CopyWebpackPlugin([
{ {
from: path.join(ROOT_PATH, `node_modules/monaco-editor/${IS_PRODUCTION ? 'min' : 'dev'}/vs`), from: path.join(
ROOT_PATH,
`node_modules/monaco-editor/${IS_PRODUCTION ? 'min' : 'dev'}/vs`
),
to: 'monaco-editor/vs', to: 'monaco-editor/vs',
transform: function(content, path) { transform: function(content, path) {
if (/\.js$/.test(path) && !/worker/i.test(path) && !/typescript/i.test(path)) { if (/\.js$/.test(path) && !/worker/i.test(path) && !/typescript/i.test(path)) {
...@@ -225,23 +230,23 @@ const config = { ...@@ -225,23 +230,23 @@ const config = {
); );
} }
return content; return content;
} },
} },
]), ]),
], ],
resolve: { resolve: {
extensions: ['.js'], extensions: ['.js'],
alias: { alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'), '~': path.join(ROOT_PATH, 'app/assets/javascripts'),
'emojis': path.join(ROOT_PATH, 'fixtures/emojis'), emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
'empty_states': path.join(ROOT_PATH, 'app/views/shared/empty_states'), empty_states: path.join(ROOT_PATH, 'app/views/shared/empty_states'),
'icons': path.join(ROOT_PATH, 'app/views/shared/icons'), icons: path.join(ROOT_PATH, 'app/views/shared/icons'),
'images': path.join(ROOT_PATH, 'app/assets/images'), images: path.join(ROOT_PATH, 'app/assets/images'),
'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'),
'vue$': 'vue/dist/vue.esm.js', vue$: 'vue/dist/vue.esm.js',
'spec': path.join(ROOT_PATH, 'spec/javascripts'), spec: path.join(ROOT_PATH, 'spec/javascripts'),
} },
}, },
// sqljs requires fs // sqljs requires fs
...@@ -256,14 +261,14 @@ if (IS_PRODUCTION) { ...@@ -256,14 +261,14 @@ if (IS_PRODUCTION) {
new webpack.NoEmitOnErrorsPlugin(), new webpack.NoEmitOnErrorsPlugin(),
new webpack.LoaderOptionsPlugin({ new webpack.LoaderOptionsPlugin({
minimize: true, minimize: true,
debug: false debug: false,
}), }),
new webpack.optimize.ModuleConcatenationPlugin(), new webpack.optimize.ModuleConcatenationPlugin(),
new webpack.optimize.UglifyJsPlugin({ new webpack.optimize.UglifyJsPlugin({
sourceMap: true sourceMap: true,
}), }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env': { NODE_ENV: JSON.stringify('production') } 'process.env': { NODE_ENV: JSON.stringify('production') },
}) })
); );
...@@ -282,7 +287,7 @@ if (IS_DEV_SERVER) { ...@@ -282,7 +287,7 @@ if (IS_DEV_SERVER) {
headers: { 'Access-Control-Allow-Origin': '*' }, headers: { 'Access-Control-Allow-Origin': '*' },
stats: 'errors-only', stats: 'errors-only',
hot: DEV_SERVER_LIVERELOAD, hot: DEV_SERVER_LIVERELOAD,
inline: DEV_SERVER_LIVERELOAD inline: DEV_SERVER_LIVERELOAD,
}; };
config.plugins.push( config.plugins.push(
// watch node_modules for changes if we encounter a missing module compile error // watch node_modules for changes if we encounter a missing module compile error
...@@ -298,10 +303,12 @@ if (IS_DEV_SERVER) { ...@@ -298,10 +303,12 @@ if (IS_DEV_SERVER) {
]; ];
// report our auto-generated bundle count // report our auto-generated bundle count
console.log(`${autoEntriesCount} entries from '/pages' automatically added to webpack output.`); console.log(
`${autoEntriesCount} entries from '/pages' automatically added to webpack output.`
);
callback(); callback();
}) });
}, },
} }
); );
......
scripts/frontend/frontend_script_utils.js
...@@ -18,12 +18,7 @@ const execGitCmd = args => ...@@ -18,12 +18,7 @@ const execGitCmd = args =>
module.exports = { module.exports = {
getStagedFiles: fileExtensionFilter => { getStagedFiles: fileExtensionFilter => {
const gitOptions = [ const gitOptions = ['diff', '--name-only', '--cached', '--diff-filter=ACMRTUB'];
'diff',
'--name-only',
'--cached',
'--diff-filter=ACMRTUB',
];
if (fileExtensionFilter) gitOptions.push(...fileExtensionFilter); if (fileExtensionFilter) gitOptions.push(...fileExtensionFilter);
return execGitCmd(gitOptions); return execGitCmd(gitOptions);
}, },
......
scripts/frontend/prettier.js
...@@ -22,9 +22,7 @@ const availableExtensions = Object.keys(config.parsers); ...@@ -22,9 +22,7 @@ const availableExtensions = Object.keys(config.parsers);
console.log(`Loading ${allFiles ? 'All' : 'Staged'} Files ...`); console.log(`Loading ${allFiles ? 'All' : 'Staged'} Files ...`);
const stagedFiles = allFiles const stagedFiles = allFiles ? null : getStagedFiles(availableExtensions.map(ext => `*.${ext}`));
? null
: getStagedFiles(availableExtensions.map(ext => `*.${ext}`));
if (stagedFiles) { if (stagedFiles) {
if (!stagedFiles.length || (stagedFiles.length === 1 && !stagedFiles[0])) { if (!stagedFiles.length || (stagedFiles.length === 1 && !stagedFiles[0])) {
...@@ -41,15 +39,10 @@ let files; ...@@ -41,15 +39,10 @@ let files;
if (allFiles) { if (allFiles) {
const ignore = config.ignore; const ignore = config.ignore;
const patterns = config.patterns; const patterns = config.patterns;
const globPattern = const globPattern = patterns.length > 1 ? `{${patterns.join(',')}}` : `${patterns.join(',')}`;
patterns.length > 1 ? `{${patterns.join(',')}}` : `${patterns.join(',')}`; files = glob.sync(globPattern, { ignore }).filter(f => allFiles || stagedFiles.includes(f));
files = glob
.sync(globPattern, { ignore })
.filter(f => allFiles || stagedFiles.includes(f));
} else { } else {
files = stagedFiles.filter(f => files = stagedFiles.filter(f => availableExtensions.includes(f.split('.').pop()));
availableExtensions.includes(f.split('.').pop()),
);
} }
if (!files.length) { if (!files.length) {
...@@ -81,7 +74,7 @@ prettier ...@@ -81,7 +74,7 @@ prettier
} else if (!prettier.check(input, options)) { } else if (!prettier.check(input, options)) {
if (!didWarn) { if (!didWarn) {
console.log( console.log(
'\n===============================\nGitLab uses Prettier to format all JavaScript code.\nPlease format each file listed below or run "yarn prettier-staged-save"\n===============================\n', '\n===============================\nGitLab uses Prettier to format all JavaScript code.\nPlease format each file listed below or run "yarn prettier-staged-save"\n===============================\n'
); );
didWarn = true; didWarn = true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment