Skip to content

Commit 327db99

Browse files
committed
Merge branch 'next' into corel
* next: feat(codegen): fix literal function arguments and add default values feat(codegen): add support for export all test(internal/cli): migrate internal cli tests to vitest and remove jest (#7745) fix(core): explicitly pass `randomKey(12)` as the PTE `keyGenerator` (#7759)
2 parents b5fc349 + c518591 commit 327db99

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+285
-1939
lines changed

.github/workflows/jest.yml

-77
This file was deleted.

jest.config.mjs

-17
This file was deleted.

package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@
8585
"release:rc": "pnpm build && lerna publish --force-publish --dist-tag=dev-preview --preid=rc --exact",
8686
"release:tag": "RELEASE_TAG=\"${RELEASE_TAG:-canary}\"; pnpm build && lerna publish --canary --force-publish --no-git-tag-version --dist-tag=$RELEASE_TAG --preid=$RELEASE_TAG --exact",
8787
"start": "run-s dev",
88-
"test": "run-s test:vitest test:jest",
89-
"test:jest": "jest --forceExit",
88+
"test": "run-s test:vitest",
9089
"test:vitest": "vitest --run",
9190
"test:vitest:watch": "vitest --watch",
9291
"test:e2e": "playwright test",
@@ -153,7 +152,6 @@
153152
"glob": "^7.2.0",
154153
"globby": "^10.0.0",
155154
"husky": "^9.0.11",
156-
"jest": "^29.7.0",
157155
"js-yaml": "^4.1.0",
158156
"lerna": "^8.1.9",
159157
"lint-staged": "^12.1.2",

packages/@repo/test-config/jest/createJestConfig.mjs

-153
This file was deleted.

packages/@repo/test-config/jest/index.mjs

-3
This file was deleted.

packages/@repo/test-config/jest/jsdom.jest.env.ts

-12
This file was deleted.

packages/@repo/test-config/jest/readPackageName.mjs

-8
This file was deleted.

packages/@repo/test-config/jest/resolveDirName.mjs

-5
This file was deleted.

packages/@repo/test-config/jest/resolver.cjs

-29
This file was deleted.

packages/@repo/test-config/jest/setup.ts

-35
This file was deleted.

packages/@repo/test-config/package.json

-9
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,10 @@
55
"description": "Test (as in unit test) config shared across packages in the sanity monorepo",
66
"type": "module",
77
"exports": {
8-
"./jest": "./jest/index.mjs",
98
"./vitest": "./vitest/index.mjs"
109
},
1110
"devDependencies": {
12-
"@babel/preset-env": "^7.26.0",
13-
"@babel/preset-react": "^7.25.9",
14-
"@babel/preset-typescript": "^7.26.0",
15-
"@jest/globals": "^29.7.0",
1611
"@repo/dev-aliases": "workspace:*",
17-
"babel-plugin-transform-vite-meta-hot": "^1.0.0",
18-
"dotenv": "^16.4.5",
19-
"jest-environment-jsdom": "^29.7.0",
20-
"lodash-es": "^4.17.21",
2112
"vitest": "^2.1.1"
2213
}
2314
}

0 commit comments

Comments
 (0)