From a023f1589dde285e17a3240f3dbb382897d937bf Mon Sep 17 00:00:00 2001 From: Zsofia Vagi Date: Sun, 19 Nov 2023 19:16:43 +0100 Subject: [PATCH] Fixing tests --- extension/babel.config.js | 10 ++ extension/babel.config.json | 7 -- extension/package.json | 1 + .../redux-devtools-app/babel.config.esm.js | 13 +++ .../redux-devtools-app/babel.config.esm.json | 8 -- packages/redux-devtools-app/babel.config.js | 13 +++ packages/redux-devtools-app/babel.config.json | 8 -- packages/redux-devtools-app/package.json | 1 + pnpm-lock.yaml | 91 ++++++++++++------- 9 files changed, 96 insertions(+), 56 deletions(-) create mode 100644 extension/babel.config.js delete mode 100644 extension/babel.config.json create mode 100644 packages/redux-devtools-app/babel.config.esm.js delete mode 100644 packages/redux-devtools-app/babel.config.esm.json create mode 100644 packages/redux-devtools-app/babel.config.js delete mode 100644 packages/redux-devtools-app/babel.config.json diff --git a/extension/babel.config.js b/extension/babel.config.js new file mode 100644 index 00000000..9547341b --- /dev/null +++ b/extension/babel.config.js @@ -0,0 +1,10 @@ +const test = process.env.NODE_ENV === 'test'; + +module.exports = { + presets: [ + ['@babel/preset-env', { targets: 'defaults' }], + '@babel/preset-react', + '@babel/preset-typescript', + ], + plugins: [...(test ? ['babel-plugin-transform-import-meta'] : [])], +}; diff --git a/extension/babel.config.json b/extension/babel.config.json deleted file mode 100644 index 47246cb3..00000000 --- a/extension/babel.config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "presets": [ - ["@babel/preset-env", { "targets": "defaults" }], - "@babel/preset-react", - "@babel/preset-typescript" - ] -} diff --git a/extension/package.json b/extension/package.json index c0f25bcb..719214c0 100644 --- a/extension/package.json +++ b/extension/package.json @@ -58,6 +58,7 @@ "@types/react": "^18.2.31", "@types/react-dom": "^18.2.14", "@types/styled-components": "^5.1.29", + "babel-plugin-transform-import-meta": "^2.2.1", "chromedriver": "^118.0.1", "cross-env": "^7.0.3", "electron": "^27.0.2", diff --git a/packages/redux-devtools-app/babel.config.esm.js b/packages/redux-devtools-app/babel.config.esm.js new file mode 100644 index 00000000..72d5df16 --- /dev/null +++ b/packages/redux-devtools-app/babel.config.esm.js @@ -0,0 +1,13 @@ +const test = process.env.NODE_ENV === 'test'; + +module.exports = { + presets: [ + ['@babel/preset-env', { targets: 'defaults', modules: false }], + '@babel/preset-react', + '@babel/preset-typescript', + ], + plugins: [ + '@babel/plugin-transform-runtime', + ...(test ? ['babel-plugin-transform-import-meta'] : []), + ], +}; diff --git a/packages/redux-devtools-app/babel.config.esm.json b/packages/redux-devtools-app/babel.config.esm.json deleted file mode 100644 index d616aff2..00000000 --- a/packages/redux-devtools-app/babel.config.esm.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "presets": [ - ["@babel/preset-env", { "targets": "defaults", "modules": false }], - "@babel/preset-react", - "@babel/preset-typescript" - ], - "plugins": ["@babel/plugin-transform-runtime"] -} diff --git a/packages/redux-devtools-app/babel.config.js b/packages/redux-devtools-app/babel.config.js new file mode 100644 index 00000000..9d8e2b80 --- /dev/null +++ b/packages/redux-devtools-app/babel.config.js @@ -0,0 +1,13 @@ +const test = process.env.NODE_ENV === 'test'; + +module.exports = { + presets: [ + ['@babel/preset-env', { targets: 'defaults' }], + '@babel/preset-react', + '@babel/preset-typescript', + ], + plugins: [ + '@babel/plugin-transform-runtime', + ...(test ? ['babel-plugin-transform-import-meta'] : []), + ], +}; diff --git a/packages/redux-devtools-app/babel.config.json b/packages/redux-devtools-app/babel.config.json deleted file mode 100644 index 814fca2b..00000000 --- a/packages/redux-devtools-app/babel.config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "presets": [ - ["@babel/preset-env", { "targets": "defaults" }], - "@babel/preset-react", - "@babel/preset-typescript" - ], - "plugins": ["@babel/plugin-transform-runtime"] -} diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 8a947ee9..dff2255b 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -90,6 +90,7 @@ "@types/webpack-env": "^1.18.3", "@typescript-eslint/eslint-plugin": "^6.9.0", "@typescript-eslint/parser": "^6.9.0", + "babel-plugin-transform-import-meta": "^2.2.1", "babel-loader": "^9.1.3", "cross-env": "^7.0.3", "css-loader": "^6.8.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4701fbe0..d60c462c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -156,6 +156,9 @@ importers: '@types/styled-components': specifier: ^5.1.29 version: 5.1.29 + babel-plugin-transform-import-meta: + specifier: ^2.2.1 + version: 2.2.1(@babel/core@7.23.2) chromedriver: specifier: ^118.0.1 version: 118.0.1 @@ -1157,6 +1160,9 @@ importers: babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.23.2)(webpack@5.89.0) + babel-plugin-transform-import-meta: + specifier: ^2.2.1 + version: 2.2.1(@babel/core@7.23.2) cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -7579,10 +7585,9 @@ packages: set-cookie-parser: 2.6.0 dev: false - /@mswjs/cookies@1.0.0: - resolution: {integrity: sha512-TdXoBdI+h/EDTsVLCX/34s4+9U0sWi92qFnIGUEikpMCSKLhBeujovyYVSoORNbYgsBH5ga7/tfxyWcEZAxiYA==} - engines: {node: '>=14'} - requiresBuild: true + /@mswjs/cookies@1.1.0: + resolution: {integrity: sha512-0ZcCVQxifZmhwNBoQIrystCb+2sWBY2Zw8lpfJBPCHGCA/HWqehITeCRVIv4VMy8MPlaHo2w2pTHFV2pFfqKPw==} + engines: {node: '>=18'} dev: false optional: true @@ -7603,9 +7608,8 @@ packages: strict-event-emitter: 0.5.1 uuid: 8.3.2 optionalDependencies: - msw: 1.3.2(typescript@5.2.2) + msw: 2.0.8(typescript@5.2.2) transitivePeerDependencies: - - encoding - supports-color - typescript dev: false @@ -7626,10 +7630,9 @@ packages: - supports-color dev: false - /@mswjs/interceptors@0.25.7: - resolution: {integrity: sha512-U7iFYs/qU/5jfz1VDpoYz3xqX9nzhsBXw7q923dv6GiGTy+m2ZLhD33L80R/shHOW/YWjeH6k16GbIHGw+bAng==} + /@mswjs/interceptors@0.25.12: + resolution: {integrity: sha512-a+zyoR01cPQeukSmaDEkE6aMwSjjfcT5ILzsyxmctEeCePnc2DMOd0X8Fn9bytq1IsAfMxJf/lu2aTfdivDbRg==} engines: {node: '>=18'} - requiresBuild: true dependencies: '@open-draft/deferred-promise': 2.2.0 '@open-draft/logger': 0.3.0 @@ -12002,6 +12005,16 @@ packages: transitivePeerDependencies: - '@babel/core' + /babel-plugin-transform-import-meta@2.2.1(@babel/core@7.23.2): + resolution: {integrity: sha512-AxNh27Pcg8Kt112RGa3Vod2QS2YXKKJ6+nSvRtv7qQTJAdx0MZa4UHZ4lnxHUWA2MNbLuZQv5FVab4P1CoLOWw==} + peerDependencies: + '@babel/core': ^7.10.0 + dependencies: + '@babel/core': 7.23.2 + '@babel/template': 7.22.15 + tslib: 2.6.2 + dev: true + /babel-preset-current-node-syntax@1.0.1(@babel/core@7.23.2): resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: @@ -14856,16 +14869,6 @@ packages: combined-stream: 1.0.8 mime-types: 2.1.35 - /formdata-node@4.4.1: - resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==} - engines: {node: '>= 12.20'} - requiresBuild: true - dependencies: - node-domexception: 1.0.0 - web-streams-polyfill: 4.0.0-beta.3 - dev: false - optional: true - /formidable@2.1.2: resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==} dependencies: @@ -17864,6 +17867,42 @@ packages: - supports-color dev: false + /msw@2.0.8(typescript@5.2.2): + resolution: {integrity: sha512-/5nQCotVka62lvubQ3tMfUS3TukyeBwvWyvAthcXvDlXGhkA/85HlEwZyFlJ3ZsPW45Ty+ao0S4oFvuM12R/kA==} + engines: {node: '>=18'} + hasBin: true + requiresBuild: true + peerDependencies: + typescript: '>= 4.7.x <= 5.2.x' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@bundled-es-modules/cookie': 2.0.0 + '@bundled-es-modules/js-levenshtein': 2.0.1 + '@bundled-es-modules/statuses': 1.0.1 + '@mswjs/cookies': 1.1.0 + '@mswjs/interceptors': 0.25.12 + '@open-draft/until': 2.1.0 + '@types/cookie': 0.4.1 + '@types/js-levenshtein': 1.1.2 + '@types/statuses': 2.0.3 + chalk: 4.1.2 + chokidar: 3.5.3 + graphql: 16.8.1 + headers-polyfill: 4.0.2 + inquirer: 8.2.6 + is-node-process: 1.2.0 + js-levenshtein: 1.1.6 + outvariant: 1.4.0 + path-to-regexp: 6.2.1 + strict-event-emitter: 0.5.1 + type-fest: 2.19.0 + typescript: 5.2.2 + yargs: 17.7.2 + dev: false + optional: true + /multicast-dns@7.2.5: resolution: {integrity: sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==} hasBin: true @@ -17939,13 +17978,6 @@ packages: minimatch: 3.1.2 dev: true - /node-domexception@1.0.0: - resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} - engines: {node: '>=10.5.0'} - requiresBuild: true - dev: false - optional: true - /node-fetch-native@1.4.0: resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==} dev: true @@ -21812,13 +21844,6 @@ packages: '@zxing/text-encoding': 0.9.0 dev: false - /web-streams-polyfill@4.0.0-beta.3: - resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==} - engines: {node: '>= 14'} - requiresBuild: true - dev: false - optional: true - /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}