diff --git a/extension/jest.config.js b/extension/jest.config.js index ff0d3db5..47710492 100644 --- a/extension/jest.config.js +++ b/extension/jest.config.js @@ -5,6 +5,7 @@ module.exports = { moduleNameMapper: { '\\.css$': '/test/__mocks__/styleMock.ts', }, - transformIgnorePatterns: ['/node_modules/(?!(d3)/)'], - resolver: '/jestResolver.js', + transformIgnorePatterns: [ + 'node_modules/(?!.pnpm|d3(w|d)*|dateformat|delaunator|nanoid|robust-predicates|uuid)', + ], }; diff --git a/extension/jestResolver.js b/extension/jestResolver.js deleted file mode 100644 index 8e066aa4..00000000 --- a/extension/jestResolver.js +++ /dev/null @@ -1,15 +0,0 @@ -module.exports = (path, options) => { - return options.defaultResolver(path, { - ...options, - packageFilter: (pkg) => { - if (pkg.name === 'nanoid') { - pkg.exports['.'].browser = pkg.exports['.'].require; - } - if (pkg.name === 'uuid' && pkg.version.startsWith('8.')) { - delete pkg.exports; - delete pkg.module; - } - return pkg; - }, - }); -}; diff --git a/packages/redux-devtools-app/jest.config.js b/packages/redux-devtools-app/jest.config.js index b7bc0a5e..e27641a5 100644 --- a/packages/redux-devtools-app/jest.config.js +++ b/packages/redux-devtools-app/jest.config.js @@ -9,6 +9,7 @@ module.exports = { '^.+\\.jsx?$': 'babel-jest', '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.test.json' }], }, - transformIgnorePatterns: ['/node_modules/(?!(d3)/)'], - resolver: '/jestResolver.js', + transformIgnorePatterns: [ + 'node_modules/(?!.pnpm|d3(w|d)*|dateformat|delaunator|nanoid|robust-predicates|uuid)', + ], }; diff --git a/packages/redux-devtools-app/jestResolver.js b/packages/redux-devtools-app/jestResolver.js deleted file mode 100644 index 8e066aa4..00000000 --- a/packages/redux-devtools-app/jestResolver.js +++ /dev/null @@ -1,15 +0,0 @@ -module.exports = (path, options) => { - return options.defaultResolver(path, { - ...options, - packageFilter: (pkg) => { - if (pkg.name === 'nanoid') { - pkg.exports['.'].browser = pkg.exports['.'].require; - } - if (pkg.name === 'uuid' && pkg.version.startsWith('8.')) { - delete pkg.exports; - delete pkg.module; - } - return pkg; - }, - }); -}; diff --git a/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js b/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js index 3244f843..b5063992 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js +++ b/packages/redux-devtools-inspector-monitor-test-tab/jest.config.js @@ -5,7 +5,8 @@ module.exports = { '\\.css$': '/test/__mocks__/styleMock.ts', }, transform: { + '^.+\\.jsx?$': 'babel-jest', '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.test.json' }], }, - resolver: '/jestResolver.js', + transformIgnorePatterns: ['node_modules/(?!.pnpm|nanoid)'], }; diff --git a/packages/redux-devtools-inspector-monitor-test-tab/jestResolver.js b/packages/redux-devtools-inspector-monitor-test-tab/jestResolver.js deleted file mode 100644 index 385b2568..00000000 --- a/packages/redux-devtools-inspector-monitor-test-tab/jestResolver.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = (path, options) => { - return options.defaultResolver(path, { - ...options, - packageFilter: (pkg) => { - if (pkg.name === 'nanoid') { - pkg.exports['.'].browser = pkg.exports['.'].require; - } - return pkg; - }, - }); -}; diff --git a/packages/redux-devtools-rtk-query-monitor/jest.config.js b/packages/redux-devtools-rtk-query-monitor/jest.config.js index 3244f843..b5063992 100644 --- a/packages/redux-devtools-rtk-query-monitor/jest.config.js +++ b/packages/redux-devtools-rtk-query-monitor/jest.config.js @@ -5,7 +5,8 @@ module.exports = { '\\.css$': '/test/__mocks__/styleMock.ts', }, transform: { + '^.+\\.jsx?$': 'babel-jest', '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.test.json' }], }, - resolver: '/jestResolver.js', + transformIgnorePatterns: ['node_modules/(?!.pnpm|nanoid)'], }; diff --git a/packages/redux-devtools-rtk-query-monitor/jestResolver.js b/packages/redux-devtools-rtk-query-monitor/jestResolver.js deleted file mode 100644 index 385b2568..00000000 --- a/packages/redux-devtools-rtk-query-monitor/jestResolver.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = (path, options) => { - return options.defaultResolver(path, { - ...options, - packageFilter: (pkg) => { - if (pkg.name === 'nanoid') { - pkg.exports['.'].browser = pkg.exports['.'].require; - } - return pkg; - }, - }); -}; diff --git a/packages/redux-devtools-ui/.babelrc.json b/packages/redux-devtools-ui/babel.config.json similarity index 100% rename from packages/redux-devtools-ui/.babelrc.json rename to packages/redux-devtools-ui/babel.config.json diff --git a/packages/redux-devtools-ui/jest.config.js b/packages/redux-devtools-ui/jest.config.js index 3244f843..b5063992 100644 --- a/packages/redux-devtools-ui/jest.config.js +++ b/packages/redux-devtools-ui/jest.config.js @@ -5,7 +5,8 @@ module.exports = { '\\.css$': '/test/__mocks__/styleMock.ts', }, transform: { + '^.+\\.jsx?$': 'babel-jest', '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.test.json' }], }, - resolver: '/jestResolver.js', + transformIgnorePatterns: ['node_modules/(?!.pnpm|nanoid)'], }; diff --git a/packages/redux-devtools-ui/jestResolver.js b/packages/redux-devtools-ui/jestResolver.js deleted file mode 100644 index 385b2568..00000000 --- a/packages/redux-devtools-ui/jestResolver.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = (path, options) => { - return options.defaultResolver(path, { - ...options, - packageFilter: (pkg) => { - if (pkg.name === 'nanoid') { - pkg.exports['.'].browser = pkg.exports['.'].require; - } - return pkg; - }, - }); -}; diff --git a/packages/redux-devtools-ui/package.json b/packages/redux-devtools-ui/package.json index 317c4cd4..52a073ed 100644 --- a/packages/redux-devtools-ui/package.json +++ b/packages/redux-devtools-ui/package.json @@ -30,7 +30,7 @@ "build": "pnpm run build:lib && pnpm run build:storybook", "build:lib": "pnpm run build:cjs && pnpm run build:esm && pnpm run build:types && pnpm run build:css", "build:cjs": "babel src --extensions \".ts,.tsx\" --out-dir lib/cjs", - "build:esm": "babel src --config-file ./babel.config.esm.json --no-babelrc --extensions \".ts,.tsx\" --out-dir lib/esm", + "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts,.tsx\" --out-dir lib/esm", "build:types": "tsc --emitDeclarationOnly", "build:css": "ncp fonts lib/fonts", "clean": "rimraf lib storybook-static",