2019-06-11 21:13:48 +05:30
|
|
|
--- a/package.json
|
|
|
|
+++ b/package.json
|
2019-09-30 22:13:22 +05:30
|
|
|
@@ -121,28 +121,17 @@
|
2019-10-12 22:33:52 +05:30
|
|
|
"style-loader": "^0.23.1",
|
2019-06-15 00:17:17 +05:30
|
|
|
"svg4everybody": "2.1.9",
|
|
|
|
"three": "^0.84.0",
|
|
|
|
- "three-orbit-controls": "^82.1.0",
|
|
|
|
- "three-stl-loader": "^1.0.4",
|
|
|
|
- "timeago.js": "^3.0.2",
|
|
|
|
"tiptap": "^1.8.0",
|
|
|
|
"tiptap-commands": "^1.4.0",
|
|
|
|
"tiptap-extensions": "^1.8.0",
|
|
|
|
- "underscore": "^1.9.0",
|
2019-08-08 21:14:53 +05:30
|
|
|
- "url-loader": "^1.1.2",
|
2019-06-15 00:17:17 +05:30
|
|
|
"visibilityjs": "^1.2.4",
|
|
|
|
"vue": "^2.6.10",
|
2019-06-16 21:26:04 +05:30
|
|
|
"vue-apollo": "^3.0.0-beta.28",
|
|
|
|
"vue-loader": "^15.7.0",
|
|
|
|
- "vue-resource": "^1.5.1",
|
|
|
|
"vue-router": "^3.0.2",
|
|
|
|
"vue-template-compiler": "^2.6.10",
|
|
|
|
"vue-virtual-scroll-list": "^1.3.1",
|
2019-08-08 15:17:34 +05:30
|
|
|
"vuex": "^3.1.0",
|
|
|
|
- "webpack": "^4.29.0",
|
2019-10-01 00:19:20 +05:30
|
|
|
- "webpack-bundle-analyzer": "^3.3.2",
|
2019-08-08 15:17:34 +05:30
|
|
|
- "webpack-cli": "^3.2.1",
|
2019-06-15 16:08:11 +05:30
|
|
|
- "webpack-stats-plugin": "^0.2.1",
|
2019-08-08 16:05:04 +05:30
|
|
|
- "worker-loader": "^2.0.0",
|
2019-06-15 16:08:11 +05:30
|
|
|
"xterm": "^3.5.0"
|
|
|
|
},
|
2019-08-08 16:05:04 +05:30
|
|
|
"devDependencies": {
|
2019-08-08 15:17:34 +05:30
|
|
|
--- a/config/webpack.config.js
|
|
|
|
+++ b/config/webpack.config.js
|
|
|
|
@@ -5,7 +5,6 @@
|
|
|
|
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
|
|
|
|
const CompressionPlugin = require('compression-webpack-plugin');
|
|
|
|
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
|
|
|
|
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
|
2019-10-12 22:33:52 +05:30
|
|
|
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
2019-08-08 15:17:34 +05:30
|
|
|
|
|
|
|
const ROOT_PATH = '/usr/share/gitlab';
|
2019-10-12 22:33:52 +05:30
|
|
|
@@ -126,12 +125,12 @@
|
2019-08-08 15:17:34 +05:30
|
|
|
|
|
|
|
resolve: {
|
|
|
|
extensions: ['.js', '.gql', '.graphql'],
|
|
|
|
- modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'],
|
2019-09-25 14:42:20 +05:30
|
|
|
+ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/vendor/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs', '/usr/share/nodejs'],
|
2019-08-08 15:17:34 +05:30
|
|
|
alias,
|
|
|
|
},
|
|
|
|
|
|
|
|
resolveLoader: {
|
|
|
|
- modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
|
|
|
|
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs','/usr/share/nodejs'],
|
|
|
|
},
|
|
|
|
|
|
|
|
module: {
|
2019-10-12 22:33:52 +05:30
|
|
|
@@ -338,16 +337,6 @@
|
2019-08-08 15:17:34 +05:30
|
|
|
// enable HMR only in webpack-dev-server
|
|
|
|
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
|
|
|
|
|
|
|
|
- // optionally generate webpack bundle analysis
|
|
|
|
- WEBPACK_REPORT &&
|
|
|
|
- new BundleAnalyzerPlugin({
|
|
|
|
- analyzerMode: 'static',
|
|
|
|
- generateStatsFile: true,
|
|
|
|
- openAnalyzer: false,
|
|
|
|
- reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
|
|
|
|
- statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
|
|
|
|
- }),
|
|
|
|
-
|
|
|
|
new webpack.DefinePlugin({
|
2019-09-30 22:13:22 +05:30
|
|
|
// This one is used to define window.gon.ee and other things properly in tests:
|
2019-08-08 15:17:34 +05:30
|
|
|
'process.env.IS_GITLAB_EE': JSON.stringify(IS_EE),
|
2019-10-12 22:33:52 +05:30
|
|
|
@@ -373,6 +362,7 @@
|
2019-08-08 15:17:34 +05:30
|
|
|
|
2019-09-30 22:13:22 +05:30
|
|
|
node: {
|
|
|
|
fs: 'empty', // sqljs requires fs
|
|
|
|
+ Buffer: 'mock',
|
|
|
|
setImmediate: false,
|
|
|
|
},
|
2019-08-08 15:17:34 +05:30
|
|
|
};
|