diff --git a/debian/control b/debian/control index d97deaf482..0ec508887e 100644 --- a/debian/control +++ b/debian/control @@ -343,6 +343,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # packaged node modules - all node packages are not packaged yet node-autosize (>= 4.0~), node-axios (>= 0.17.1~), + node-babel7, node-bootstrap, node-brace-expansion (>= 1.1.8~), # node-cache-loader (>= 2.0.1~), diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 955cf213b2..858e8e4f9e 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -2,6 +2,7 @@ Use debian packaged node modules when available - Exclude packaged modules from transpiling - Remove webpack-bundle-analyzer - Resolve .json files + - Add more plugins to babel.config.js --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -75,7 +76,20 @@ Use debian packaged node modules when available }; --- a/package.json +++ b/package.json -@@ -49,62 +49,39 @@ +@@ -32,12 +32,6 @@ + "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js" + }, + "dependencies": { +- "@babel/core": "^7.8.4", +- "@babel/plugin-proposal-class-properties": "^7.8.3", +- "@babel/plugin-proposal-json-strings": "^7.8.3", +- "@babel/plugin-proposal-private-methods": "^7.8.3", +- "@babel/plugin-syntax-import-meta": "^7.8.3", +- "@babel/preset-env": "^7.8.4", + "@gitlab/at.js": "1.5.5", + "@gitlab/svgs": "1.121.0", + "@gitlab/ui": "12.1.0", +@@ -49,62 +43,39 @@ "apollo-link": "^1.2.11", "apollo-link-batch-http": "^1.2.11", "apollo-upload-client": "^10.0.0", @@ -138,7 +152,7 @@ Use debian packaged node modules when available "raphael": "^2.2.7", "raw-loader": "^4.0.0", "sanitize-html": "^1.22.0", -@@ -117,16 +94,11 @@ +@@ -117,16 +88,11 @@ "svg4everybody": "2.1.9", "swagger-ui-dist": "^3.24.3", "three": "^0.84.0", @@ -155,7 +169,7 @@ Use debian packaged node modules when available "visibilityjs": "^1.2.4", "vue": "^2.6.10", "vue-apollo": "^3.0.0-beta.28", -@@ -136,12 +108,7 @@ +@@ -136,12 +102,7 @@ "vue-virtual-scroll-list": "^1.4.4", "vuedraggable": "^2.23.0", "vuex": "^3.1.0", @@ -169,3 +183,18 @@ Use debian packaged node modules when available }, "devDependencies": { }, +--- a/babel.config.js ++++ b/babel.config.js +@@ -19,9 +19,12 @@ + // include stage 3 proposals + const plugins = [ + '@babel/plugin-syntax-import-meta', ++ '@babel/plugin-syntax-dynamic-import', + '@babel/plugin-proposal-class-properties', + '@babel/plugin-proposal-json-strings', + '@babel/plugin-proposal-private-methods', ++ '@babel/plugin-proposal-optional-chaining', ++ '@babel/plugin-proposal-nullish-coalescing-operator', + 'lodash', + ]; + diff --git a/debian/patches/0741-add-graphql-tag.patch b/debian/patches/0741-add-graphql-tag.patch index 392bd3faa3..416d6f88a0 100644 --- a/debian/patches/0741-add-graphql-tag.patch +++ b/debian/patches/0741-add-graphql-tag.patch @@ -2,7 +2,7 @@ yarn fails to install graphql-tag --- a/package.json +++ b/package.json -@@ -70,6 +70,7 @@ +@@ -64,6 +64,7 @@ "fuzzaldrin-plus": "^0.6.0", "glob": "^7.1.6", "graphql": "^14.0.2",