Skip to content

Commit 073a9ca

Browse files
authored
Merge pull request #9742 from asirvadAbrahamVarghese/upgrade-webpack-4-plugins
Upgrade webpack 4 plugins
2 parents e54af7e + beab90e commit 073a9ca

File tree

9 files changed

+210
-206
lines changed

9 files changed

+210
-206
lines changed

app/javascript/components/custom-url-tabs/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const CustomURLTabs = ({
2525
};
2626

2727
const fixTabStyling = () => {
28-
document.getElementsByClassName(activeTabClassName).forEach((element) => {
28+
[...document.getElementsByClassName(activeTabClassName)].forEach((element) => {
2929
element.classList.remove(activeTabClassName);
3030
});
3131
document.getElementsByClassName('selected')[0].classList.add(activeTabClassName);

config/webpack/development.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Note: You must restart bin/webpack-dev-server for changes to take effect
22

3-
const merge = require('webpack-merge')
3+
const { merge } = require('webpack-merge')
44
const sharedConfig = require('./shared.js')
55
const { settings, output } = require('./configuration.js')
66
const { env } = require('process')

config/webpack/loaders.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const merge = require('webpack-merge');
1+
const { merge } = require('webpack-merge');
22

33
const { env, publicPath } = require('./configuration.js');
44
const babelrc = require('../../.babelrc.js');

config/webpack/production.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/* eslint global-require: 0 */
44

5-
const merge = require('webpack-merge');
5+
const { merge } = require('webpack-merge');
66
const CompressionPlugin = require('compression-webpack-plugin');
77
const sharedConfig = require('./shared.js');
88

config/webpack/shared.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
const webpack = require('webpack');
77
const { basename, dirname, join, resolve } = require('path');
88
const { sync } = require('glob');
9-
const ManifestPlugin = require('webpack-manifest-plugin');
9+
const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
1010
const extname = require('path-complete-extname');
1111
const DuplicatePackageCheckerPlugin = require('duplicate-package-checker-webpack-plugin');
1212
const { SplitChunksPlugin } = require('webpack').optimize;
@@ -62,7 +62,7 @@ let plugins = [
6262
'process.env.CYPRESS': JSON.stringify(env.CYPRESS),
6363
}),
6464

65-
new ManifestPlugin({
65+
new WebpackManifestPlugin({
6666
publicPath: output.publicPath,
6767
writeToFileEmit: true,
6868
}),

config/webpack/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Note: You must restart bin/webpack-dev-server for changes to take effect
22

3-
const merge = require('webpack-merge')
3+
const { merge } = require('webpack-merge')
44
const sharedConfig = require('./shared.js')
55

66
module.exports = merge(sharedConfig, {

cypress/support/commands/menu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Cypress.Commands.add('menuItems', () => {
5252
if ($li[0].className === 'bx--side-nav__item') {
5353
const parent = $li.children().children()[0].innerText;
5454
cy.get($li).click().then(() => {
55-
$li.children()[1].children.forEach((child) => {
55+
[...$li.children()[1].children].forEach((child) => {
5656
subChildren.push({ title: child.innerText, href: child.children[0].href });
5757
});
5858
children.push({title: parent, items: subChildren });

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"angular-ui-codemirror": "~0.3.0",
5656
"angular-ui-sortable": "~0.19.0",
5757
"angular.validators": "~4.4.3",
58-
"array-includes": "^3.1.6",
58+
"array-includes": "^3.1.9",
5959
"awesome-debounce-promise": "^2.1.0",
6060
"bootstrap-filestyle": "~1.2.1",
6161
"bootstrap-select": "^1.13.18",
@@ -70,7 +70,7 @@
7070
"d3": "^7.8.2",
7171
"dompurify": "^3.2.4",
7272
"eonasdan-bootstrap-datetimepicker": "~4.17.49",
73-
"es6-shim": "~0.35.3",
73+
"es6-shim": "~0.35.8",
7474
"history": "^4.7.2",
7575
"jquery": "~2.2.4",
7676
"jquery-ui": "~1.13.2",
@@ -107,7 +107,7 @@
107107
"sprintf-js": "~1.1.1",
108108
"table-resolver": "^4.1.1",
109109
"ui-select": "0.19.8",
110-
"whatwg-fetch": "~2.0.4",
110+
"whatwg-fetch": "~3.6.20",
111111
"xml_display": "~0.1.1"
112112
},
113113
"devDependencies": {
@@ -127,7 +127,7 @@
127127
"babel-jest": "~25.5.1",
128128
"babel-loader": "~8.4.0",
129129
"compression-webpack-plugin": "^6.1.1",
130-
"core-js": "~3.6.4",
130+
"core-js": "~3.47.0",
131131
"core-js-compat": "~3.2.1",
132132
"css-loader": "~3.4.2",
133133
"cypress": "~15.7.0",
@@ -160,20 +160,20 @@
160160
"postcss-loader": "~3.0.0",
161161
"precss": "~4.0.0",
162162
"react-test-renderer": "~16.8.0",
163-
"regenerator-runtime": "~0.13.5",
163+
"regenerator-runtime": "~0.14.1",
164164
"resolve-url-loader": "~3.1.5",
165165
"sass": "~1.58.0",
166166
"sass-loader": "~8.0.2",
167167
"style-loader": "~1.1.3",
168168
"stylelint": "~14.5.1",
169169
"stylelint-config-standard": "~20.0.0",
170170
"stylelint-scss": "^4.0.0",
171-
"webpack": "~4.46.0",
172-
"webpack-cli": "~3.3.12",
171+
"webpack": "~4.47.0",
172+
"webpack-cli": "~4.10.0",
173173
"webpack-dev-server": "~5.2.0",
174-
"webpack-manifest-plugin": "~2.2.0",
175-
"webpack-merge": "~4.2.2",
176-
"webpack-stats-plugin": "^0.3.2"
174+
"webpack-manifest-plugin": "~4.1.1",
175+
"webpack-merge": "~6.0.1",
176+
"webpack-stats-plugin": "^1.1.3"
177177
},
178178
"engines": {
179179
"node": "^20.19.5",

0 commit comments

Comments
 (0)