chore: upgrade deps

gregberge · Jun 20, 2022 · 5e4f613 · 5e4f613
1 parent a0637d4
commit 5e4f613
Show file tree

Hide file tree

Showing 22 changed files with 8,607 additions and 7,962 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,10 +1,6 @@
-module.exports = (api) => {
-  api.cache(true)
-
-  return {
-    presets: [
-      ['@babel/preset-env', { targets: { node: '12' }, loose: true }],
-      '@babel/preset-typescript',
-    ],
-  }
+module.exports = {
+  presets: [
+    ['@babel/preset-env', { targets: { node: '12' }, loose: true }],
+    '@babel/preset-typescript',
+  ],
 }
diff --git a/examples/mocha-esm/package.json b/examples/mocha-esm/package.json
@@ -6,6 +6,6 @@
     "test": "mocha --loader=./mock-loader.js example.test.js"
   },
   "devDependencies": {
-    "mocha": "^9.1.3"
+    "mocha": "^10.0.0"
   }
 }
diff --git a/examples/webpack/package.json b/examples/webpack/package.json
@@ -5,10 +5,10 @@
     "start": "webpack serve"
   },
   "devDependencies": {
-    "@svgr/webpack": "^6.0.0-alpha.2",
+    "@svgr/webpack": "^6.2.1",
     "html-webpack-plugin": "^5.5.0",
     "webpack": "^5.64.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.4.0"
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.9.2"
   }
 }
diff --git a/jest.config.js b/jest.config.js
@@ -2,6 +2,6 @@ module.exports = {
   watchPathIgnorePatterns: ['__fixtures__', '__fixtures__build__'],
   rootDir: 'packages',
   transform: {
-    '^.+\\.(j|t)sx?$': 'babel-jest',
+    '^.+\\.(j|t)sx?$': ['babel-jest', { root: __dirname }],
   },
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,32 +7,32 @@
   "scripts": {
     "build": "build/build.sh",
     "dev": "lerna run build --parallel -- --watch",
-    "format": "prettier --write \"**/*.{js,json,md}\"",
-    "lint": "eslint .",
+    "format": "prettier --write .",
+    "lint": "eslint . && prettier --check .",
     "release": "lerna publish --conventional-commits && conventional-github-releaser --preset angular",
     "test": "jest --runInBand"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@babel/preset-typescript": "^7.16.0",
+    "@babel/core": "^7.18.5",
+    "@babel/preset-env": "^7.18.2",
+    "@babel/preset-typescript": "^7.17.12",
     "@rollup/plugin-json": "^4.1.0",
-    "@types/jest": "^27.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.3.1",
-    "@typescript-eslint/parser": "^5.3.1",
-    "babel-jest": "^27.3.1",
+    "@types/jest": "^28.1.2",
+    "@typescript-eslint/eslint-plugin": "^5.28.0",
+    "@typescript-eslint/parser": "^5.28.0",
+    "babel-jest": "^28.1.1",
     "codecov": "^3.8.3",
     "conventional-github-releaser": "^3.1.5",
-    "esbuild": "^0.13.13",
-    "eslint": "^8.2.0",
-    "eslint-plugin-react": "^7.27.0",
-    "eslint-plugin-react-hooks": "^4.3.0",
-    "jest": "^27.3.1",
-    "lerna": "^4.0.0",
-    "react": "^17.0.2",
-    "rollup": "^2.60.0",
-    "rollup-plugin-dts": "^4.0.1",
-    "rollup-plugin-esbuild": "^4.6.0",
-    "typescript": "^4.4.4"
+    "esbuild": "^0.14.46",
+    "eslint": "^8.18.0",
+    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "jest": "^28.1.1",
+    "lerna": "^5.1.4",
+    "react": "^18.2.0",
+    "rollup": "^2.75.6",
+    "rollup-plugin-dts": "^4.2.2",
+    "rollup-plugin-esbuild": "^4.9.1",
+    "typescript": "^4.7.4"
   }
 }
diff --git a/packages/babel-plugin-svg-dynamic-title/src/index.test.ts b/packages/babel-plugin-svg-dynamic-title/src/index.test.ts
@@ -1,7 +1,7 @@
 import { transform } from '@babel/core'
 import plugin, { Options } from '.'
 
-const testPlugin = (code: string, options: Options = {tag: 'title'}) => {
+const testPlugin = (code: string, options: Options = { tag: 'title' }) => {
   const result = transform(code, {
     plugins: ['@babel/plugin-syntax-jsx', [plugin, options]],
     configFile: false,
@@ -19,9 +19,7 @@ describe('title plugin', () => {
 
   it('should add title element and fallback to existing title', () => {
     // testing when the existing title contains a simple string
-    expect(
-      testPlugin(`<svg><title>Hello</title></svg>`),
-    ).toMatchInlineSnapshot(
+    expect(testPlugin(`<svg><title>Hello</title></svg>`)).toMatchInlineSnapshot(
       `"<svg>{title === undefined ? <title id={titleId}>Hello</title> : title ? <title id={titleId}>{title}</title> : null}</svg>;"`,
     )
     // testing when the existing title contains an JSXExpression
@@ -40,24 +38,18 @@ describe('title plugin', () => {
     )
   })
   it('should support empty title', () => {
-    expect(
-      testPlugin('<svg><title></title></svg>'),
-    ).toMatchInlineSnapshot(
+    expect(testPlugin('<svg><title></title></svg>')).toMatchInlineSnapshot(
       `"<svg>{title ? <title id={titleId}>{title}</title> : null}</svg>;"`,
     )
   })
   it('should support self closing title', () => {
-    expect(
-      testPlugin('<svg><title /></svg>'),
-    ).toMatchInlineSnapshot(
+    expect(testPlugin('<svg><title /></svg>')).toMatchInlineSnapshot(
       `"<svg>{title ? <title id={titleId}>{title}</title> : null}</svg>;"`,
     )
   })
 
   it('should work if an attribute is already present', () => {
-    expect(
-      testPlugin('<svg><foo /></svg>'),
-    ).toMatchInlineSnapshot(
+    expect(testPlugin('<svg><foo /></svg>')).toMatchInlineSnapshot(
       `"<svg>{title ? <title id={titleId}>{title}</title> : null}<foo /></svg>;"`,
     )
   })

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -37,12 +37,12 @@
     "@svgr/plugin-svgo": "^6.2.0",
     "camelcase": "^6.2.0",
     "chalk": "^4.1.2",
-    "commander": "^8.2.0",
+    "commander": "^9.3.0",
     "dashify": "^2.0.0",
-    "glob": "^7.1.7"
+    "glob": "^8.0.3"
   },
   "devDependencies": {
     "@types/glob": "^7.2.0",
-    "del": "^6.0.0"
+    "del": "^6.1.1"
   }
 }
diff --git a/packages/cli/src/__snapshots__/index.test.ts.snap b/packages/cli/src/__snapshots__/index.test.ts.snap
@@ -608,10 +608,10 @@ exports[`cli should suppress output when transforming a directory with a --silen
 
 exports[`cli should transform a whole directory and output relative destination paths 1`] = `
 "
-__fixtures__/cased/pascalcase.svg -> __fixtures_build__/whole/cased/pascalcase.js
 __fixtures__/cased/camelcase.svg -> __fixtures_build__/whole/cased/camelcase.js
 __fixtures__/cased/kebab-case.svg -> __fixtures_build__/whole/cased/kebabcase.js
 __fixtures__/cased/multiple---dashes.svg -> __fixtures_build__/whole/cased/multipledashes.js
+__fixtures__/cased/pascalcase.svg -> __fixtures_build__/whole/cased/pascalcase.js
 __fixtures__/complex/skype.svg -> __fixtures_build__/whole/complex/skype.js
 __fixtures__/complex/telegram.svg -> __fixtures_build__/whole/complex/telegram.js
 __fixtures__/nesting/a/c/three.svg -> __fixtures_build__/whole/nesting/a/c/three.js
@@ -627,10 +627,10 @@ __fixtures__/withsvgrrc/file.svg -> __fixtures_build__/whole/withsvgrrc/file.js"
 
 exports[`cli should transform a whole directory with --typescript 1`] = `
 "
-__fixtures__/cased/pascalcase.svg -> __fixtures_build__/whole/cased/pascalcase.tsx
 __fixtures__/cased/camelcase.svg -> __fixtures_build__/whole/cased/camelcase.tsx
 __fixtures__/cased/kebab-case.svg -> __fixtures_build__/whole/cased/kebabcase.tsx
 __fixtures__/cased/multiple---dashes.svg -> __fixtures_build__/whole/cased/multipledashes.tsx
+__fixtures__/cased/pascalcase.svg -> __fixtures_build__/whole/cased/pascalcase.tsx
 __fixtures__/complex/skype.svg -> __fixtures_build__/whole/complex/skype.tsx
 __fixtures__/complex/telegram.svg -> __fixtures_build__/whole/complex/telegram.tsx
 __fixtures__/nesting/a/c/three.svg -> __fixtures_build__/whole/nesting/a/c/three.tsx

diff --git a/packages/cli/src/dirCommand.ts b/packages/cli/src/dirCommand.ts
@@ -146,7 +146,7 @@ export const dirCommand: SvgrCommand = async (
     }
 
     const dest = path.resolve(outDir as string, path.relative(root, filename))
-    return write(filename, dest).catch(err => {
+    return write(filename, dest).catch((err) => {
       console.error('Failed to handle file: ', filename)
       throw err
     })

diff --git a/packages/cli/src/index.test.ts b/packages/cli/src/index.test.ts
@@ -9,6 +9,14 @@ const exec = promisify(execCb)
 
 const svgr = path.join(__dirname, '../bin/svgr')
 
+const sortCliResult = (result: string) => {
+  return result
+    .split(/\n/)
+    .sort((a, b) => a.localeCompare(b))
+    .map((x) => x.toLowerCase())
+    .join('\n')
+}
+
 describe('cli', () => {
   const cli = async (args: string) => {
     const { stdout } = await exec(`${svgr} ${args}`)
@@ -56,32 +64,21 @@ describe('cli', () => {
 
   it('should transform a whole directory and output relative destination paths', async () => {
     const result = await cli('--out-dir __fixtures_build__/whole __fixtures__')
-    const sorted = result
-      .split(/\n/)
-      .sort()
-      .map((x) => x.toLowerCase())
-      .join('\n')
-    expect(sorted).toMatchSnapshot()
+    expect(sortCliResult(result)).toMatchSnapshot()
   })
 
   it('should transform a whole directory with --typescript', async () => {
     const result = await cli(
       '--typescript --out-dir __fixtures_build__/whole __fixtures__',
     )
-    const sorted = result
-      .split(/\n/)
-      .sort()
-      .map((x) => x.toLowerCase())
-      .join('\n')
-    expect(sorted).toMatchSnapshot()
+    expect(sortCliResult(result)).toMatchSnapshot()
   })
 
   it('should suppress output when transforming a directory with a --silent option', async () => {
     const result = await cli(
       '--silent --out-dir __fixtures_build__/whole __fixtures__',
     )
-    const sorted = result.split(/\n/).sort().join('\n')
-    expect(sorted).toMatchSnapshot()
+    expect(sortCliResult(result)).toMatchSnapshot()
   })
 
   it('should support --prettier-config as json', async () => {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -38,6 +38,6 @@
     "cosmiconfig": "^7.0.1"
   },
   "devDependencies": {
-    "@types/svgo": "^2.6.0"
+    "@types/svgo": "^2.6.3"
   }
 }
diff --git a/packages/hast-util-to-babel-ast/package.json b/packages/hast-util-to-babel-ast/package.json
@@ -28,8 +28,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@babel/types": "^7.15.6",
-    "entities": "^3.0.1"
+    "@babel/types": "^7.18.4",
+    "entities": "^4.3.0"
   },
   "scripts": {
     "reset": "rm -rf dist",

diff --git a/packages/plugin-jsx/package.json b/packages/plugin-jsx/package.json
@@ -31,9 +31,9 @@
     "@svgr/core": "^6.0.0"
   },
   "dependencies": {
-    "@babel/core": "^7.15.5",
+    "@babel/core": "^7.18.5",
     "@svgr/babel-preset": "^6.2.0",
     "@svgr/hast-util-to-babel-ast": "^6.2.1",
-    "svg-parser": "^2.0.2"
+    "svg-parser": "^2.0.4"
   }
 }
diff --git a/packages/plugin-prettier/package.json b/packages/plugin-prettier/package.json
@@ -32,6 +32,6 @@
   },
   "dependencies": {
     "deepmerge": "^4.2.2",
-    "prettier": "^2.4.0"
+    "prettier": "^2.7.1"
   }
 }
diff --git a/packages/plugin-svgo/package.json b/packages/plugin-svgo/package.json
@@ -33,6 +33,6 @@
   "dependencies": {
     "cosmiconfig": "^7.0.1",
     "deepmerge": "^4.2.2",
-    "svgo": "^2.5.0"
+    "svgo": "^2.8.0"
   }
 }
diff --git a/packages/rollup/package.json b/packages/rollup/package.json
@@ -32,18 +32,18 @@
     "prepublishOnly": "npm run reset && npm run build"
   },
   "dependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/plugin-transform-react-constant-elements": "^7.14.5",
-    "@babel/preset-env": "^7.15.6",
-    "@babel/preset-react": "^7.14.5",
-    "@babel/preset-typescript": "^7.16.0",
-    "@rollup/pluginutils": "^4.1.2",
+    "@babel/core": "^7.18.5",
+    "@babel/plugin-transform-react-constant-elements": "^7.17.12",
+    "@babel/preset-env": "^7.18.2",
+    "@babel/preset-react": "^7.17.12",
+    "@babel/preset-typescript": "^7.17.12",
+    "@rollup/pluginutils": "^4.2.1",
     "@svgr/core": "^6.2.1",
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0"
   },
   "devDependencies": {
-    "rollup": "^2.56.3",
+    "rollup": "^2.75.6",
     "rollup-plugin-image": "^1.0.2",
     "rollup-plugin-url": "^3.0.1"
   }

diff --git a/packages/rollup/src/__snapshots__/index.test.ts.snap b/packages/rollup/src/__snapshots__/index.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`rollup loader should convert file 1`] = `
 "var _path;
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import * as React from \\"react\\";
 

diff --git a/packages/rollup/src/index.ts b/packages/rollup/src/index.ts
@@ -84,7 +84,7 @@ const plugin: PluginImpl<Options> = (options = {}) => {
           body: [],
         },
         code: jsCode,
-        map: null
+        map: null,
       }
     },
   }

diff --git a/packages/webpack/README.md b/packages/webpack/README.md
@@ -109,7 +109,7 @@ By default, `@svgr/webpack` includes a `babel-loader` with [an optimized configu
 It is possible to detect the module that requires your SVG using [`Rule.issuer`](https://webpack.js.org/configuration/module/#ruleissuer) in Webpack 5. Using it you can specify two different configurations for JavaScript and the rest of your files.
 
 ```js
-[
+;[
   {
     test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
     issuer: /\.[jt]sx?$/,

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -32,19 +32,19 @@
     "prepublishOnly": "npm run reset && npm run build"
   },
   "dependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/plugin-transform-react-constant-elements": "^7.14.5",
-    "@babel/preset-env": "^7.15.6",
-    "@babel/preset-react": "^7.14.5",
-    "@babel/preset-typescript": "^7.15.0",
+    "@babel/core": "^7.18.5",
+    "@babel/plugin-transform-react-constant-elements": "^7.17.12",
+    "@babel/preset-env": "^7.18.2",
+    "@babel/preset-react": "^7.17.12",
+    "@babel/preset-typescript": "^7.17.12",
     "@svgr/core": "^6.2.1",
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0"
   },
   "devDependencies": {
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.5",
     "memory-fs": "^0.5.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.52.1"
+    "webpack": "^5.73.0"
   }
 }
diff --git a/packages/webpack/src/__snapshots__/index.test.ts.snap b/packages/webpack/src/__snapshots__/index.test.ts.snap
@@ -48,7 +48,7 @@ export default SvgIcon;"
 exports[`webpack loader transforms file (typescript: true) 1`] = `
 "var _g;
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 import * as React from \\"react\\";