From 27ea4123d548d67891d3a2c1f811b41ea86398d4 Mon Sep 17 00:00:00 2001 From: Lachlan Campbell Date: Thu, 15 Sep 2022 16:35:32 -0400 Subject: [PATCH 1/7] Upgrade to Jest 29 --- .npmrc | 1 + jest.config.js | 24 +- package.json | 32 +- .../test/__snapshots__/index.tsx.snap | 2 +- packages/color-modes/test/index.tsx | 6 +- packages/core/test/index.tsx | 4 +- .../test/__snapshots__/test.mjs.snap | 12 +- packages/match-media/test/ssr.tsx | 27 +- packages/mdx/test/defaultMdxComponents.tsx | 2 +- .../prism/test/__snapshots__/index.tsx.snap | 12 +- packages/prism/test/index.tsx | 5 +- .../sidenav/test/__snapshots__/index.tsx.snap | 4 +- .../tailwind/test/__snapshots__/test.ts.snap | 96 +- .../test/__snapshots__/to-theme.ts.snap | 3348 ++++++++--------- packages/typography/test/styles.ts | 58 +- pnpm-lock.yaml | 1336 +++---- 16 files changed, 2495 insertions(+), 2474 deletions(-) diff --git a/.npmrc b/.npmrc index 3248f381c..3471062b7 100644 --- a/.npmrc +++ b/.npmrc @@ -2,3 +2,4 @@ auto-install-peers=true public-hoist-pattern[]='*eslint*' public-hoist-pattern[]='*prettier*' public-hoist-pattern[]='@emotion/react' +strict-peer-dependencies=false diff --git a/jest.config.js b/jest.config.js index 8f7a1fa12..646387a29 100644 --- a/jest.config.js +++ b/jest.config.js @@ -4,14 +4,21 @@ /** @type {import('@jest/types').Config.InitialOptions} */ const config = { preset: 'ts-jest/presets/js-with-ts', - globals: { - 'ts-jest': { - tsconfig: './tsconfig.test.json', - useESM: true, - diagnostics: { - exclude: ['**'], + transform: { + '^.+.tsx?$': [ + 'ts-jest', + { + isolatedModules: true, + tsconfig: { + tsconfig: './tsconfig.test.json', + useESM: true, + diagnostics: { + exclude: ['**'], + }, + }, }, - }, + ], + '^.+\\.m?jsx?$': '/jest-preprocess.js', }, testMatch: ['**/packages/**/test/*.{js,ts,tsx,mjs}'], testPathIgnorePatterns: [ @@ -47,9 +54,6 @@ const config = { modulePathIgnorePatterns: ['packages/.*/dist'], snapshotSerializers: ['@emotion/jest/serializer'], setupFiles: ['jest-canvas-mock'], - transform: { - '^.+\\.m?jsx?$': '/jest-preprocess.js', - }, moduleNameMapper: { '@theme-ui/css/dist/types': '@theme-ui/css/src/types', }, diff --git a/package.json b/package.json index 640298cb0..f56d5dbe3 100644 --- a/package.json +++ b/package.json @@ -40,14 +40,14 @@ "node": ">=16.0.0" }, "devDependencies": { - "@auto-it/all-contributors": "^10.32.3", - "@auto-it/conventional-commits": "^10.32.3", - "@auto-it/core": "^10.37.4", - "@auto-it/first-time-contributor": "^10.32.3", - "@auto-it/magic-zero": "^10.32.3", - "@auto-it/npm": "^10.37.4", - "@auto-it/omit-commits": "^10.32.3", - "@auto-it/released": "^10.32.3", + "@auto-it/all-contributors": "^10.37.6", + "@auto-it/conventional-commits": "^10.37.6", + "@auto-it/core": "^10.37.6", + "@auto-it/first-time-contributor": "^10.37.6", + "@auto-it/magic-zero": "^10.37.6", + "@auto-it/npm": "^10.37.6", + "@auto-it/omit-commits": "^10.37.6", + "@auto-it/released": "^10.37.6", "@babel/cli": "^7.13.14", "@babel/core": "^7.15.8", "@babel/helper-string-parser": "^7.18.10", @@ -59,34 +59,34 @@ "@babel/runtime": "^7.16.3", "@codechecks/build-size-watcher": "^0.1.0", "@codechecks/client": "0.1.10-beta", - "@emotion/jest": "^11.6.0", - "@jest/types": "^28", + "@emotion/jest": "^11.10.0", + "@jest/types": "^29", "@preconstruct/cli": "^2.1.5", - "@testing-library/react": "^13.0.0", + "@testing-library/react": "^13.4.0", "@types/eslint": "8.4.6", - "@types/jest": "^28.1.6", + "@types/jest": "^29.0.2", "@types/node": "^18.6.4", "@types/react-dom": "^18.0.6", "@types/react-test-renderer": "^18.0.0", "@typescript-eslint/eslint-plugin": "^5.32.0", "@typescript-eslint/parser": "^5.32.0", "auto": "^10.32.3", - "babel-jest": "^28.0.3", + "babel-jest": "^29.0.3", "babel-preset-gatsby": "^2.2.0", "cross-env": "^7.0.3", "egzek": "^1.2.0", "eslint": "^8", "eslint-config-react-app": "^7.0.1", - "jest": "^28.0.3", + "jest": "^29.0.3", "jest-canvas-mock": "^2.4.0", "jest-environment-jsdom": "^29.0.3", "jest-mock-console": "^2.0.0", "jest-ts-webcompat-resolver": "^1.0.0", "postinstall-postinstall": "^2.1.0", "prettier": "^2.2.1", - "react-test-renderer": "^18.0.0", + "react-test-renderer": "^18.2.0", "rimraf": "^3.0.2", - "ts-jest": "^28.0.7", + "ts-jest": "^29.0.1", "ts-toolbelt": "^9.6.0", "typecov": "^0.2.3", "typescript": "^4" diff --git a/packages/color-modes/test/__snapshots__/index.tsx.snap b/packages/color-modes/test/__snapshots__/index.tsx.snap index 1d282505a..63cf18078 100644 --- a/packages/color-modes/test/__snapshots__/index.tsx.snap +++ b/packages/color-modes/test/__snapshots__/index.tsx.snap @@ -3,7 +3,7 @@ exports[`InitializeColorMode renders 1`] = `