Skip to content

Commit dcb3dbb

Browse files
authored
Merge branch 'main' into fix/rspack-provide-external-runtime
2 parents d05b804 + 941eabb commit dcb3dbb

File tree

62 files changed

+2053
-3446
lines changed

Some content is hidden

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

62 files changed

+2053
-3446
lines changed

.verdaccio/config.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.verdaccio/htpasswd

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/shared-tree-shaking/no-server/host/project.json

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,14 @@
2929
}
3030
},
3131
"e2e": {
32-
"executor": "@nx/cypress:cypress",
32+
"executor": "nx:run-commands",
3333
"options": {
34-
"cypressConfig": "apps/shared-tree-shaking/no-server/host/cypress.config.ts",
35-
"testingType": "e2e",
36-
"baseUrl": "http://localhost:3001",
37-
"browser": "chrome"
34+
"command": "pnpm exec cypress run --config-file apps/shared-tree-shaking/no-server/host/cypress.config.ts --browser chrome --config baseUrl=http://localhost:3001",
35+
"forwardAllArgs": false
3836
},
3937
"configurations": {
4038
"development": {
41-
"runnerUi": true,
42-
"browser": "chrome",
43-
"exit": false,
44-
"watch": true
39+
"command": "pnpm exec cypress open --config-file apps/shared-tree-shaking/no-server/host/cypress.config.ts --browser chrome --config baseUrl=http://localhost:3001"
4540
}
4641
}
4742
},

apps/shared-tree-shaking/with-server/host/project.json

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,14 @@
7575
}
7676
},
7777
"e2e": {
78-
"executor": "@nx/cypress:cypress",
78+
"executor": "nx:run-commands",
7979
"options": {
80-
"cypressConfig": "apps/shared-tree-shaking/with-server/host/cypress.config.ts",
81-
"testingType": "e2e",
82-
"baseUrl": "http://localhost:3001",
83-
"browser": "chrome"
80+
"command": "pnpm exec cypress run --config-file apps/shared-tree-shaking/with-server/host/cypress.config.ts --browser chrome --config baseUrl=http://localhost:3001",
81+
"forwardAllArgs": false
8482
},
8583
"configurations": {
8684
"development": {
87-
"runnerUi": true,
88-
"browser": "chrome",
89-
"exit": false,
90-
"watch": true
85+
"command": "pnpm exec cypress open --config-file apps/shared-tree-shaking/with-server/host/cypress.config.ts --browser chrome --config baseUrl=http://localhost:3001"
9186
}
9287
}
9388
},

package.json

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@
133133
"overrides": {
134134
"@changesets/assemble-release-plan": "workspace:*",
135135
"ajv": "8.18.0",
136-
"schema-utils@3.3.0>ajv": "6.12.6"
136+
"eslint>ajv": "6.14.0",
137+
"@eslint/eslintrc>ajv": "6.14.0",
138+
"schema-utils@3.3.0>ajv": "6.14.0"
137139
},
138140
"onlyBuiltDependencies": [
139141
"@parcel/watcher",
@@ -212,11 +214,6 @@
212214
"@rspack/core": "1.3.9",
213215
"@rspack/dev-server": "1.1.1",
214216
"@rstest/core": "^0.8.0",
215-
"@semantic-release/changelog": "^6.0.3",
216-
"@semantic-release/exec": "^6.0.3",
217-
"@semantic-release/git": "^10.0.1",
218-
"@semantic-release/github": "^11.0.1",
219-
"@semantic-release/npm": "^11.0.0",
220217
"@storybook/addon-docs": "9.0.17",
221218
"@storybook/nextjs": "9.0.9",
222219
"@svgr/webpack": "8.1.0",
@@ -230,7 +227,7 @@
230227
"@types/adm-zip": "0.5.5",
231228
"@types/chrome": "0.0.277",
232229
"@types/download": "8.0.5",
233-
"@types/eslint": "~8.37.0",
230+
"@types/eslint": "~9.6.1",
234231
"@types/express": "4.17.21",
235232
"@types/fs-extra": "9.0.13",
236233
"@types/jest": "29.5.13",
@@ -241,8 +238,8 @@
241238
"@types/node-fetch": "2.6.11",
242239
"@types/pidusage": "2.0.5",
243240
"@types/webpack-sources": "3.2.3",
244-
"@typescript-eslint/eslint-plugin": "7.18.0",
245-
"@typescript-eslint/parser": "7.18.0",
241+
"@typescript-eslint/eslint-plugin": "8.56.1",
242+
"@typescript-eslint/parser": "8.56.1",
246243
"@vitest/coverage-istanbul": "1.6.0",
247244
"@vitest/coverage-v8": "1.6.0",
248245
"@vitest/ui": "1.6.0",
@@ -257,7 +254,7 @@
257254
"cypress": "14.3.3",
258255
"directory-tree": "3.5.2",
259256
"esbuild": "0.25.0",
260-
"eslint": "9.26.0",
257+
"eslint": "9.39.3",
261258
"eslint-config-prettier": "10.1.5",
262259
"eslint-plugin-cypress": "^2.13.4",
263260
"eslint-plugin-import": "2.31.0",
@@ -308,7 +305,6 @@
308305
"tsup": "7.3.0",
309306
"typescript": "5.8.2",
310307
"url-loader": "4.1.1",
311-
"verdaccio": "6.1.2",
312308
"vite": "5.4.21",
313309
"vite-tsconfig-paths": "4.2.3",
314310
"vitest": "1.6.0",

packages/bridge/bridge-react/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
}
1313
},
1414
"test": {
15-
"executor": "@nx/jest:jest",
15+
"executor": "nx:run-commands",
1616
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
1717
"options": {
18-
"jestConfig": "packages/bridge/bridge-react/jest.config.ts",
19-
"passWithNoTests": true
18+
"command": "pnpm exec jest --config packages/bridge/bridge-react/jest.config.ts --passWithNoTests",
19+
"forwardAllArgs": false
2020
}
2121
}
2222
}

packages/core/project.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
"tags": ["type:pkg"],
77
"targets": {
88
"build": {
9-
"executor": "@nx/js:tsc",
10-
"outputs": ["{options.outputPath}"],
9+
"executor": "nx:run-commands",
10+
"outputs": ["{workspaceRoot}/packages/core/dist"],
1111
"options": {
12-
"outputPath": "packages/core/dist",
13-
"main": "packages/core/src/index.ts",
14-
"tsConfig": "packages/core/tsconfig.lib.json",
15-
"assets": ["packages/core/*.md"]
12+
"parallel": false,
13+
"commands": [
14+
"node -e \"require('fs').rmSync('packages/core/dist',{recursive:true,force:true})\"",
15+
"pnpm -C packages/core exec tsdown --config tsdown.config.ts",
16+
"node -e \"const fs=require('fs');const path=require('path');const src='packages/core';const dst='packages/core/dist';for(const f of fs.readdirSync(src)){if(f.endsWith('.md'))fs.cpSync(path.join(src,f),path.join(dst,f));}\""
17+
]
1618
}
1719
},
1820
"lint": {
@@ -23,11 +25,11 @@
2325
}
2426
},
2527
"test": {
26-
"executor": "@nx/jest:jest",
28+
"executor": "nx:run-commands",
2729
"outputs": ["{workspaceRoot}/coverage/packages/core"],
2830
"options": {
29-
"jestConfig": "packages/core/jest.config.ts",
30-
"passWithNoTests": true
31+
"command": "pnpm exec jest --config packages/core/jest.config.ts --passWithNoTests",
32+
"forwardAllArgs": false
3133
}
3234
},
3335
"pre-release": {

packages/core/tsdown.config.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { defineConfig } from 'tsdown';
2+
3+
export default defineConfig([
4+
{
5+
name: 'core-build',
6+
cwd: import.meta.dirname,
7+
entry: {
8+
index: 'src/index.ts',
9+
},
10+
tsconfig: 'tsconfig.lib.json',
11+
outDir: 'dist/src',
12+
format: ['cjs'],
13+
external: [/^[^./]/],
14+
sourcemap: true,
15+
clean: true,
16+
dts: {
17+
resolver: 'tsc',
18+
},
19+
inlineOnly: false,
20+
skipNodeModulesBundle: true,
21+
unbundle: true,
22+
outExtensions: () => ({
23+
js: '.js',
24+
dts: '.d.ts',
25+
}),
26+
},
27+
]);

packages/data-prefetch/project.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@
2020
]
2121
},
2222
"test": {
23-
"executor": "@nx/jest:jest",
23+
"executor": "nx:run-commands",
2424
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
2525
"options": {
26-
"jestConfig": "packages/data-prefetch/jest.config.cjs",
27-
"passWithNoTests": true
26+
"command": "pnpm exec jest --config packages/data-prefetch/jest.config.cjs --passWithNoTests",
27+
"forwardAllArgs": false
2828
},
2929
"configurations": {
3030
"ci": {
31-
"ci": true,
32-
"codeCoverage": true
31+
"command": "pnpm exec jest --config packages/data-prefetch/jest.config.cjs --passWithNoTests --ci --coverage"
3332
}
3433
}
3534
},

packages/dts-plugin/project.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@
3232
}
3333
},
3434
"test-impl": {
35-
"executor": "@nx/vite:test",
36-
"outputs": ["{workspaceRoot}/coverage/packages/dts-plugin"]
35+
"executor": "nx:run-commands",
36+
"outputs": ["{workspaceRoot}/coverage/packages/dts-plugin"],
37+
"options": {
38+
"command": "pnpm exec vitest run --passWithNoTests --config packages/dts-plugin/vite.config.mts",
39+
"forwardAllArgs": false
40+
}
3741
},
3842
"lint": {
3943
"executor": "@nx/eslint:lint",

0 commit comments

Comments
 (0)