Chore: Fix vulnerabilities in webpack loader-utils (#57533)

* chore: remove unused webpack loaders from core and toolkit

* chore: refresh yarn.lock file

* chore(yarn): refresh lock file for loader-utils update to 2.0.3

* chore: force ngtemplate-loader to use loader-utils@2.0.3

* chore(e2e): bump ts-loader@8.4.0 for loader-utils@2.0.3

* chore(yarn): remove unused packageExtensions

* chore(storybook): force unused webpack deps to v5. force plugins and loaders for loader-utils@2.0.3

* chore(storybook): update config for type changes from webpack v4 to v5
pull/55728/head
Jack Westbrook 3 years ago committed by GitHub
parent 8f75ec4007
commit 588e64d9f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      .yarnrc.yml
  2. 11
      package.json
  3. 2
      packages/grafana-e2e/package.json
  4. 2
      packages/grafana-toolkit/package.json
  5. 4
      packages/grafana-ui/.storybook/main.ts
  6. 1
      packages/grafana-ui/package.json
  7. 4106
      yarn.lock

@ -47,9 +47,6 @@ packageExtensions:
react-compat-css-styled@1.0.8: react-compat-css-styled@1.0.8:
dependencies: dependencies:
react-simple-compat: 1.2.2 react-simple-compat: 1.2.2
react-docgen-typescript-loader@3.7.2:
peerDependencies:
webpack: 4.41.5
react-icons@2.2.7: react-icons@2.2.7:
peerDependencies: peerDependencies:
prop-types: '*' prop-types: '*'

@ -189,7 +189,6 @@
"eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-hooks": "4.6.0",
"eslint-webpack-plugin": "3.2.0", "eslint-webpack-plugin": "3.2.0",
"expose-loader": "4.0.0", "expose-loader": "4.0.0",
"file-loader": "6.2.0",
"fork-ts-checker-webpack-plugin": "7.2.13", "fork-ts-checker-webpack-plugin": "7.2.13",
"fs-extra": "10.1.0", "fs-extra": "10.1.0",
"glob": "8.0.3", "glob": "8.0.3",
@ -217,7 +216,6 @@
"postcss-reporter": "7.0.5", "postcss-reporter": "7.0.5",
"postcss-scss": "4.0.4", "postcss-scss": "4.0.4",
"prettier": "2.7.1", "prettier": "2.7.1",
"raw-loader": "4.0.2",
"react-refresh": "0.14.0", "react-refresh": "0.14.0",
"react-select-event": "5.5.0", "react-select-event": "5.5.0",
"react-simple-compat": "1.2.3", "react-simple-compat": "1.2.3",
@ -413,8 +411,17 @@
"@rushstack/node-core-library": "3.53.0", "@rushstack/node-core-library": "3.53.0",
"@rushstack/rig-package": "0.3.13", "@rushstack/rig-package": "0.3.13",
"@rushstack/ts-command-line": "4.12.1", "@rushstack/ts-command-line": "4.12.1",
"@storybook/builder-webpack4/css-loader": "6.7.1",
"@storybook/builder-webpack4/html-webpack-plugin": "5.5.0",
"@storybook/builder-webpack4/webpack": "5.74.0",
"@storybook/core-common/webpack": "5.74.0",
"@storybook/core-server/webpack": "5.74.0",
"@storybook/manager-webpack4/css-loader": "6.7.1",
"@storybook/manager-webpack4/html-webpack-plugin": "5.5.0",
"@storybook/manager-webpack4/webpack": "5.74.0",
"@storybook/builder-webpack5/webpack": "5.74.0", "@storybook/builder-webpack5/webpack": "5.74.0",
"@storybook/manager-webpack5/webpack": "5.74.0", "@storybook/manager-webpack5/webpack": "5.74.0",
"ngtemplate-loader/loader-utils": "^2.0.0",
"node-fetch": "2.6.7", "node-fetch": "2.6.7",
"slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch", "slate-dev-environment@^0.2.2": "patch:slate-dev-environment@npm:0.2.5#.yarn/patches/slate-dev-environment-npm-0.2.5-9aeb7da7b5.patch",
"storybook-dark-mode@1.1.2": "patch:storybook-dark-mode@npm%3A1.1.2#./.yarn/patches/storybook-dark-mode-npm-1.1.2-ecc4605688.patch" "storybook-dark-mode@1.1.2": "patch:storybook-dark-mode@npm%3A1.1.2#./.yarn/patches/storybook-dark-mode-npm-1.1.2-ecc4605688.patch"

@ -77,7 +77,7 @@
"resolve-as-bin": "2.1.0", "resolve-as-bin": "2.1.0",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"tracelib": "1.0.1", "tracelib": "1.0.1",
"ts-loader": "6.2.2", "ts-loader": "8.4.0",
"tslib": "2.4.0", "tslib": "2.4.0",
"typescript": "4.8.2", "typescript": "4.8.2",
"uuid": "8.3.2", "uuid": "8.3.2",

@ -85,7 +85,6 @@
"eslint-plugin-react": "7.29.4", "eslint-plugin-react": "7.29.4",
"eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-hooks": "4.6.0",
"execa": "^5.1.1", "execa": "^5.1.1",
"file-loader": "^6.2.0",
"fork-ts-checker-webpack-plugin": "^7.2.1", "fork-ts-checker-webpack-plugin": "^7.2.1",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"globby": "^11.0.4", "globby": "^11.0.4",
@ -122,7 +121,6 @@
"ts-node": "^9.1.0", "ts-node": "^9.1.0",
"tslib": "2.4.0", "tslib": "2.4.0",
"typescript": "4.8.2", "typescript": "4.8.2",
"url-loader": "^4.1.1",
"webpack": "^5.72.0" "webpack": "^5.72.0"
} }
} }

@ -102,7 +102,7 @@ const mainConfig: StorybookConfig = {
}, },
webpackFinal: async (config) => { webpackFinal: async (config) => {
// expose jquery as a global so jquery plugins don't break at runtime. // expose jquery as a global so jquery plugins don't break at runtime.
config.module.rules.push({ config.module?.rules?.push({
test: require.resolve('jquery'), test: require.resolve('jquery'),
loader: 'expose-loader', loader: 'expose-loader',
options: { options: {
@ -111,7 +111,7 @@ const mainConfig: StorybookConfig = {
}); });
// use the asset module for SVGS for compatibility with grafana/ui Icon component. // use the asset module for SVGS for compatibility with grafana/ui Icon component.
config.module.rules.push({ config.module?.rules?.push({
test: /(unicons|mono|custom)[\\/].*\.svg$/, test: /(unicons|mono|custom)[\\/].*\.svg$/,
type: 'asset/source', type: 'asset/source',
}); });

@ -178,7 +178,6 @@
"mock-raf": "1.0.1", "mock-raf": "1.0.1",
"process": "^0.11.10", "process": "^0.11.10",
"react": "17.0.2", "react": "17.0.2",
"react-docgen-typescript-loader": "3.7.2",
"react-dom": "17.0.2", "react-dom": "17.0.2",
"react-test-renderer": "17.0.2", "react-test-renderer": "17.0.2",
"rimraf": "3.0.2", "rimraf": "3.0.2",

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save