Use more packaged node modules
This commit is contained in:
parent
8aceb46208
commit
6b7be3dca5
3 changed files with 36 additions and 24 deletions
14
debian/control
vendored
14
debian/control
vendored
|
@ -334,7 +334,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
# Vendored js files
|
# Vendored js files
|
||||||
# Keeping this to ease backporting as it is in contrib anyway
|
# Keeping this to ease backporting as it is in contrib anyway
|
||||||
libjs-pdf,
|
libjs-pdf,
|
||||||
# libjs-xterm,
|
|
||||||
# libjs-jquery-nicescroll,
|
# libjs-jquery-nicescroll,
|
||||||
# libjs-graphael,
|
# libjs-graphael,
|
||||||
# packaged node modules - all node packages are not packaged yet
|
# packaged node modules - all node packages are not packaged yet
|
||||||
|
@ -344,7 +343,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
node-bootstrap,
|
node-bootstrap,
|
||||||
node-cache-loader (>= 2.0.1~),
|
node-cache-loader (>= 2.0.1~),
|
||||||
node-chart.js (>= 2.7.2~),
|
node-chart.js (>= 2.7.2~),
|
||||||
# need transition (embedded)
|
node-clipboard,
|
||||||
node-core-js (>= 3.2.1~),
|
node-core-js (>= 3.2.1~),
|
||||||
node-css-loader,
|
node-css-loader,
|
||||||
node-d3 (>= 5.12~),
|
node-d3 (>= 5.12~),
|
||||||
|
@ -372,13 +371,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
node-js-cookie,
|
node-js-cookie,
|
||||||
node-jszip,
|
node-jszip,
|
||||||
node-jszip-utils,
|
node-jszip-utils,
|
||||||
|
node-lodash (>= 4.17.15~),
|
||||||
node-marked (>= 0.3~),
|
node-marked (>= 0.3~),
|
||||||
node-mousetrap,
|
node-mousetrap,
|
||||||
# Include node-pikaday only after @gitlab/ui is accepted
|
# Include node-pikaday only after @gitlab/ui is accepted
|
||||||
# node-pikaday,
|
# node-pikaday,
|
||||||
node-popper.js,
|
node-popper.js,
|
||||||
# node-prismjs depends on node-clipboard still in new
|
node-prismjs (>= 1.6~),
|
||||||
# node-prismjs (>= 1.6~),
|
node-prosemirror-model,
|
||||||
node-raven-js,
|
node-raven-js,
|
||||||
node-raw-loader (>= 1.0~),
|
node-raw-loader (>= 1.0~),
|
||||||
node-three-orbit-controls (>= 82.1~),
|
node-three-orbit-controls (>= 82.1~),
|
||||||
|
@ -387,10 +387,14 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
node-underscore (>= 1.9~),
|
node-underscore (>= 1.9~),
|
||||||
node-url-loader (>= 1.1.2~),
|
node-url-loader (>= 1.1.2~),
|
||||||
node-vue-resource (>= 1.5.1~),
|
node-vue-resource (>= 1.5.1~),
|
||||||
|
# Blocked by #927254
|
||||||
|
# node-vue-router,
|
||||||
webpack (>= 4~),
|
webpack (>= 4~),
|
||||||
node-webpack-stats-plugin,
|
node-webpack-stats-plugin,
|
||||||
node-worker-loader (>= 2.0~),
|
node-worker-loader (>= 2.0~),
|
||||||
# using npm for remaining as it is in contrib
|
# node-xterm is missing xterm/lib/addons
|
||||||
|
# node-xterm,
|
||||||
|
# using yarn install for remaining node modules as it is in contrib
|
||||||
# node-babel-core,
|
# node-babel-core,
|
||||||
# node-babel-eslint,
|
# node-babel-eslint,
|
||||||
# node-babel-loader,
|
# node-babel-loader,
|
||||||
|
|
28
debian/patches/0740-use-packaged-modules.patch
vendored
28
debian/patches/0740-use-packaged-modules.patch
vendored
|
@ -1,6 +1,6 @@
|
||||||
--- a/config/webpack.config.js
|
--- a/config/webpack.config.js
|
||||||
+++ b/config/webpack.config.js
|
+++ b/config/webpack.config.js
|
||||||
@@ -6,7 +6,6 @@ const VueLoaderPlugin = require('vue-loa
|
@@ -6,7 +6,6 @@
|
||||||
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
|
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
|
||||||
const CompressionPlugin = require('compression-webpack-plugin');
|
const CompressionPlugin = require('compression-webpack-plugin');
|
||||||
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
|
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
||||||
const vendorDllHash = require('./helpers/vendor_dll_hash');
|
const vendorDllHash = require('./helpers/vendor_dll_hash');
|
||||||
|
|
||||||
@@ -151,12 +150,12 @@ module.exports = {
|
@@ -151,12 +150,12 @@
|
||||||
|
|
||||||
resolve: {
|
resolve: {
|
||||||
extensions: ['.js', '.gql', '.graphql'],
|
extensions: ['.js', '.gql', '.graphql'],
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
module: {
|
module: {
|
||||||
@@ -431,19 +430,6 @@ module.exports = {
|
@@ -431,19 +430,6 @@
|
||||||
// enable HMR only in webpack-dev-server
|
// enable HMR only in webpack-dev-server
|
||||||
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
|
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
new webpack.DefinePlugin({
|
new webpack.DefinePlugin({
|
||||||
// This one is used to define window.gon.ee and other things properly in tests:
|
// This one is used to define window.gon.ee and other things properly in tests:
|
||||||
'process.env.IS_EE': JSON.stringify(IS_EE),
|
'process.env.IS_EE': JSON.stringify(IS_EE),
|
||||||
@@ -469,6 +455,7 @@ module.exports = {
|
@@ -469,6 +455,7 @@
|
||||||
|
|
||||||
node: {
|
node: {
|
||||||
fs: 'empty', // sqljs requires fs
|
fs: 'empty', // sqljs requires fs
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
};
|
};
|
||||||
--- a/package.json
|
--- a/package.json
|
||||||
+++ b/package.json
|
+++ b/package.json
|
||||||
@@ -50,59 +50,34 @@
|
@@ -50,62 +50,33 @@
|
||||||
"apollo-link-batch-http": "^1.2.11",
|
"apollo-link-batch-http": "^1.2.11",
|
||||||
"apollo-upload-client": "^10.0.0",
|
"apollo-upload-client": "^10.0.0",
|
||||||
"at.js": "^1.5.4",
|
"at.js": "^1.5.4",
|
||||||
|
@ -66,7 +66,7 @@
|
||||||
"cache-loader": "^4.1.0",
|
"cache-loader": "^4.1.0",
|
||||||
- "chart.js": "2.7.2",
|
- "chart.js": "2.7.2",
|
||||||
"classlist-polyfill": "^1.2.0",
|
"classlist-polyfill": "^1.2.0",
|
||||||
"clipboard": "^1.7.1",
|
- "clipboard": "^1.7.1",
|
||||||
"codesandbox-api": "^0.0.20",
|
"codesandbox-api": "^0.0.20",
|
||||||
"compression-webpack-plugin": "^3.0.0",
|
"compression-webpack-plugin": "^3.0.0",
|
||||||
"copy-webpack-plugin": "^5.0.4",
|
"copy-webpack-plugin": "^5.0.4",
|
||||||
|
@ -101,7 +101,7 @@
|
||||||
- "jszip": "^3.1.3",
|
- "jszip": "^3.1.3",
|
||||||
- "jszip-utils": "^0.0.2",
|
- "jszip-utils": "^0.0.2",
|
||||||
"katex": "^0.10.0",
|
"katex": "^0.10.0",
|
||||||
"lodash": "^4.17.15",
|
- "lodash": "^4.17.15",
|
||||||
- "marked": "^0.3.12",
|
- "marked": "^0.3.12",
|
||||||
"mermaid": "^8.4.2",
|
"mermaid": "^8.4.2",
|
||||||
"monaco-editor": "^0.15.6",
|
"monaco-editor": "^0.15.6",
|
||||||
|
@ -110,10 +110,13 @@
|
||||||
"pdfjs-dist": "^2.0.943",
|
"pdfjs-dist": "^2.0.943",
|
||||||
"pikaday": "^1.8.0",
|
"pikaday": "^1.8.0",
|
||||||
- "popper.js": "^1.14.7",
|
- "popper.js": "^1.14.7",
|
||||||
"prismjs": "^1.6.0",
|
- "prismjs": "^1.6.0",
|
||||||
"prosemirror-markdown": "^1.3.0",
|
"prosemirror-markdown": "^1.3.0",
|
||||||
"prosemirror-model": "^1.6.4",
|
- "prosemirror-model": "^1.6.4",
|
||||||
@@ -119,13 +94,9 @@
|
"raphael": "^2.2.7",
|
||||||
|
"raw-loader": "^3.1.0",
|
||||||
|
"sanitize-html": "^1.20.0",
|
||||||
|
@@ -119,13 +90,9 @@
|
||||||
"svg4everybody": "2.1.9",
|
"svg4everybody": "2.1.9",
|
||||||
"swagger-ui-dist": "^3.24.3",
|
"swagger-ui-dist": "^3.24.3",
|
||||||
"three": "^0.84.0",
|
"three": "^0.84.0",
|
||||||
|
@ -127,7 +130,7 @@
|
||||||
"url-loader": "^2.1.0",
|
"url-loader": "^2.1.0",
|
||||||
"visibilityjs": "^1.2.4",
|
"visibilityjs": "^1.2.4",
|
||||||
"vue": "^2.6.10",
|
"vue": "^2.6.10",
|
||||||
@@ -136,10 +107,6 @@
|
@@ -136,11 +103,6 @@
|
||||||
"vue-virtual-scroll-list": "^1.3.1",
|
"vue-virtual-scroll-list": "^1.3.1",
|
||||||
"vuedraggable": "^2.23.0",
|
"vuedraggable": "^2.23.0",
|
||||||
"vuex": "^3.1.0",
|
"vuex": "^3.1.0",
|
||||||
|
@ -135,6 +138,7 @@
|
||||||
- "webpack-bundle-analyzer": "^3.5.1",
|
- "webpack-bundle-analyzer": "^3.5.1",
|
||||||
- "webpack-cli": "^3.3.9",
|
- "webpack-cli": "^3.3.9",
|
||||||
- "webpack-stats-plugin": "^0.3.0",
|
- "webpack-stats-plugin": "^0.3.0",
|
||||||
"worker-loader": "^2.0.0",
|
- "worker-loader": "^2.0.0",
|
||||||
"xterm": "^3.5.0"
|
"xterm": "^3.5.0"
|
||||||
},
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
|
18
debian/patches/0770-bump-node-d3.patch
vendored
18
debian/patches/0770-bump-node-d3.patch
vendored
|
@ -8,9 +8,11 @@ Subject: [PATCH 1/2] Update d3 node module 4.13 -> 5.12
|
||||||
yarn.lock | 130 +++++++++++++++------------------------------------
|
yarn.lock | 130 +++++++++++++++------------------------------------
|
||||||
2 files changed, 38 insertions(+), 94 deletions(-)
|
2 files changed, 38 insertions(+), 94 deletions(-)
|
||||||
|
|
||||||
--- a/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
Index: gitlab/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
||||||
+++ b/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
===================================================================
|
||||||
@@ -124,9 +124,7 @@
|
--- gitlab.orig/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
||||||
|
+++ gitlab/app/assets/javascripts/vue_shared/components/bar_chart.vue
|
||||||
|
@@ -124,9 +124,7 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -21,7 +23,7 @@ Subject: [PATCH 1/2] Update d3 node module 4.13 -> 5.12
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
draw() {
|
draw() {
|
||||||
@@ -153,7 +151,7 @@
|
@@ -153,7 +151,7 @@ export default {
|
||||||
this.yScale = d3.scaleLinear().rangeRound([this.vbHeight, 0]);
|
this.yScale = d3.scaleLinear().rangeRound([this.vbHeight, 0]);
|
||||||
|
|
||||||
this.xScale.domain(this.graphData.map(d => d.name));
|
this.xScale.domain(this.graphData.map(d => d.name));
|
||||||
|
@ -30,9 +32,11 @@ Subject: [PATCH 1/2] Update d3 node module 4.13 -> 5.12
|
||||||
|
|
||||||
// Zoom/Panning Function
|
// Zoom/Panning Function
|
||||||
this.zoom = d3
|
this.zoom = d3
|
||||||
--- a/package.json
|
Index: gitlab/package.json
|
||||||
+++ b/package.json
|
===================================================================
|
||||||
@@ -59,7 +59,7 @@
|
--- gitlab.orig/package.json
|
||||||
|
+++ gitlab/package.json
|
||||||
|
@@ -58,7 +58,7 @@
|
||||||
"compression-webpack-plugin": "^3.0.0",
|
"compression-webpack-plugin": "^3.0.0",
|
||||||
"copy-webpack-plugin": "^5.0.4",
|
"copy-webpack-plugin": "^5.0.4",
|
||||||
"cropper": "^2.3.0",
|
"cropper": "^2.3.0",
|
||||||
|
|
Loading…
Reference in a new issue