Skip to content

Commit 89d7c94

Browse files
weareoutmanweareoutman
authored
Merge pull request #1570 from easyops-cn/steve/jsx
fix(): fix jsx types exports
2 parents 21e2809 + 1b38a6a commit 89d7c94

File tree

9 files changed

+103
-99
lines changed

9 files changed

+103
-99
lines changed

‎bricks/basic/package.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,24 @@
1515
"dist-types",
1616
"docs"
1717
],
18+
"types": "dist-types/jsx.d.ts",
1819
"exports": {
1920
"./package.json": "./package.json",
2021
"./dist/bricks.json": "./dist/bricks.json",
2122
"./dist/manifest.json": "./dist/manifest.json",
2223
"./data-providers/*": {
2324
"types": "./dist-types/data-providers/*.d.ts"
2425
},
26+
".": "./dist-types/jsx.d.ts",
2527
"./*": {
2628
"types": "./dist-types/*/index.d.ts"
27-
},
28-
"./jsx.d.ts": "./dist-types/jsx.d.ts"
29+
}
2930
},
3031
"scripts": {
3132
"start": "cross-env NODE_ENV=development build-next-bricks --watch",
3233
"build": "npm run build:main && npm run build:types",
3334
"build:main": "cross-env NODE_ENV=production build-next-bricks",
34-
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && cp src/jsx.d.ts dist-types/jsx.d.ts",
35+
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && copy-jsx-d-ts",
3536
"build:manifest": "cross-env NODE_ENV=production build-next-bricks --manifest-only",
3637
"test": "cross-env NODE_ENV='test' test-next",
3738
"test:ci": "cross-env NODE_ENV='test' CI=true test-next",
@@ -41,15 +42,15 @@
4142
"dependencies": {
4243
"@next-api-sdk/micro-app-standalone-sdk": "^1.1.1",
4344
"@next-api-sdk/user-service-sdk": "^1.3.0",
44-
"@next-core/easyops-runtime": "^0.15.18",
45+
"@next-core/easyops-runtime": "^0.15.23",
4546
"@next-core/element": "^1.2.19",
4647
"@next-core/http": "^1.2.14",
47-
"@next-core/i18n": "^1.0.85",
48+
"@next-core/i18n": "^1.0.87",
4849
"@next-core/react-element": "^1.0.38",
49-
"@next-core/react-runtime": "^1.7.38",
50-
"@next-core/runtime": "^1.70.0",
50+
"@next-core/react-runtime": "^1.7.43",
51+
"@next-core/runtime": "^1.71.4",
5152
"@next-core/theme": "^1.6.1",
52-
"@next-core/types": "^1.17.0",
53+
"@next-core/types": "^1.18.1",
5354
"@next-shared/general": "^0.10.11",
5455
"@next-shared/story": "^0.0.6",
5556
"broadcast-channel": "^7.0.0",
@@ -59,7 +60,7 @@
5960
"react": "0.0.0-experimental-ee8509801-20230117"
6061
},
6162
"devDependencies": {
62-
"@next-core/build-next-bricks": "^1.24.0",
63+
"@next-core/build-next-bricks": "^1.25.0",
6364
"@next-core/test-next": "^2.0.1"
6465
},
6566
"peerDependencies": {

‎bricks/containers/package.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
"dist-types",
1616
"docs"
1717
],
18+
"types": "dist-types/jsx.d.ts",
1819
"exports": {
1920
"./package.json": "./package.json",
2021
"./dist/bricks.json": "./dist/bricks.json",
2122
"./dist/manifest.json": "./dist/manifest.json",
23+
".": "./dist-types/jsx.d.ts",
2224
"./*": {
2325
"types": "./dist-types/*/index.d.ts"
24-
},
25-
"./jsx.d.ts": "./dist-types/jsx.d.ts"
26+
}
2627
},
2728
"scripts": {
2829
"start": "cross-env NODE_ENV=development build-next-bricks --watch",
2930
"build": "npm run build:main && npm run build:types",
3031
"build:main": "cross-env NODE_ENV=production build-next-bricks",
31-
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && cp src/jsx.d.ts dist-types/jsx.d.ts",
32+
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && copy-jsx-d-ts",
3233
"build:manifest": "cross-env NODE_ENV=production build-next-bricks --manifest-only",
3334
"test": "cross-env NODE_ENV='test' test-next",
3435
"test:ci": "cross-env NODE_ENV='test' CI=true test-next",
@@ -37,19 +38,19 @@
3738
},
3839
"dependencies": {
3940
"@next-core/element": "^1.2.19",
40-
"@next-core/i18n": "^1.0.85",
41+
"@next-core/i18n": "^1.0.87",
4142
"@next-core/react-element": "^1.0.38",
42-
"@next-core/runtime": "^1.70.0",
43-
"@next-core/types": "^1.17.0",
44-
"@next-core/utils": "^1.8.6",
43+
"@next-core/runtime": "^1.71.4",
44+
"@next-core/types": "^1.18.1",
45+
"@next-core/utils": "^1.8.8",
4546
"@next-shared/general": "^0.10.11",
4647
"@next-shared/story": "^0.0.6",
4748
"classnames": "^2.3.2",
4849
"react": "0.0.0-experimental-ee8509801-20230117",
4950
"react-rnd": "^10.4.1"
5051
},
5152
"devDependencies": {
52-
"@next-core/build-next-bricks": "^1.24.0",
53+
"@next-core/build-next-bricks": "^1.25.0",
5354
"@next-core/test-next": "^2.0.1"
5455
},
5556
"peerDependencies": {

‎bricks/icons/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,18 @@
4747
}
4848
}
4949
},
50+
"types": "dist-types/jsx.d.ts",
5051
"exports": {
5152
"./package.json": "./package.json",
5253
"./dist/bricks.json": "./dist/bricks.json",
5354
"./dist/manifest.json": "./dist/manifest.json",
5455
"./data-providers/*": {
5556
"types": "./dist-types/data-providers/*.d.ts"
5657
},
58+
".": "./dist-types/jsx.d.ts",
5759
"./*": {
5860
"types": "./dist-types/*/index.d.ts"
59-
},
60-
"./jsx.d.ts": "./dist-types/jsx.d.ts"
61+
}
6162
},
6263
"scripts": {
6364
"prestart": "node ./scripts/pre-build.js",
@@ -66,7 +67,7 @@
6667
"prebuild:types": "node ./scripts/pre-build.js",
6768
"build": "npm run build:main && npm run build:types",
6869
"build:main": "cross-env NODE_ENV=production build-next-bricks",
69-
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && cp src/jsx.d.ts dist-types/jsx.d.ts",
70+
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && copy-jsx-d-ts",
7071
"build:manifest": "cross-env NODE_ENV=production build-next-bricks --manifest-only",
7172
"test": "cross-env NODE_ENV='test' test-next",
7273
"test:ci": "cross-env NODE_ENV='test' CI=true test-next",
@@ -80,15 +81,15 @@
8081
"@fortawesome/free-solid-svg-icons": "^6.6.0",
8182
"@next-core/element": "^1.2.19",
8283
"@next-core/react-element": "^1.0.38",
83-
"@next-core/runtime": "^1.70.0",
84-
"@next-core/utils": "^1.8.6",
84+
"@next-core/runtime": "^1.71.4",
85+
"@next-core/utils": "^1.8.8",
8586
"lodash": "^4.17.21",
8687
"lucide-static": "0.539.0",
8788
"react": "0.0.0-experimental-ee8509801-20230117"
8889
},
8990
"devDependencies": {
9091
"@fortawesome/fontawesome-svg-core": "^6.6.0",
91-
"@next-core/build-next-bricks": "^1.24.0",
92+
"@next-core/build-next-bricks": "^1.25.0",
9293
"@next-core/test-next": "^2.0.1",
9394
"@next-shared/icons": "^0.23.1",
9495
"copy-webpack-plugin": "^11.0.0"

‎bricks/illustrations/package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
"dist-types",
1616
"docs"
1717
],
18+
"types": "dist-types/jsx.d.ts",
1819
"exports": {
1920
"./package.json": "./package.json",
2021
"./dist/bricks.json": "./dist/bricks.json",
2122
"./dist/manifest.json": "./dist/manifest.json",
2223
"./data-providers/*": {
2324
"types": "./dist-types/data-providers/*.d.ts"
2425
},
26+
".": "./dist-types/jsx.d.ts",
2527
"./*": {
2628
"types": "./dist-types/*/index.d.ts"
27-
},
28-
"./jsx.d.ts": "./dist-types/jsx.d.ts"
29+
}
2930
},
3031
"nx": {
3132
"targets": {
@@ -53,7 +54,7 @@
5354
"prebuild:types": "node ./scripts/pre-build.js",
5455
"build": "npm run build:main && npm run build:types",
5556
"build:main": "cross-env NODE_ENV=production build-next-bricks",
56-
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && cp src/jsx.d.ts dist-types/jsx.d.ts",
57+
"build:types": "tsc --emitDeclarationOnly --declaration --declarationDir dist-types --project tsconfig.json && copy-jsx-d-ts",
5758
"build:manifest": "cross-env NODE_ENV=production build-next-bricks --manifest-only",
5859
"test": "cross-env NODE_ENV='test' test-next",
5960
"test:ci": "cross-env NODE_ENV='test' CI=true test-next",
@@ -64,14 +65,14 @@
6465
"@next-core/element": "^1.2.19",
6566
"@next-core/illustrations": "^0.11.34",
6667
"@next-core/react-element": "^1.0.38",
67-
"@next-core/react-runtime": "^1.7.38",
68-
"@next-core/types": "^1.17.0",
69-
"@next-core/utils": "^1.8.6",
68+
"@next-core/react-runtime": "^1.7.43",
69+
"@next-core/types": "^1.18.1",
70+
"@next-core/utils": "^1.8.8",
7071
"lodash": "^4.17.21",
7172
"react": "0.0.0-experimental-ee8509801-20230117"
7273
},
7374
"devDependencies": {
74-
"@next-core/build-next-bricks": "^1.24.0",
75+
"@next-core/build-next-bricks": "^1.25.0",
7576
"@next-core/test-next": "^2.0.1"
7677
},
7778
"peerDependencies": {

‎bricks/shoelace/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@shoelace-style/shoelace": "~2.20.1"
5151
},
5252
"devDependencies": {
53-
"@next-core/build-next-bricks": "^1.24.0",
53+
"@next-core/build-next-bricks": "^1.25.0",
5454
"copy-webpack-plugin": "^11.0.0"
5555
}
5656
}

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
"@cypress/browserify-preprocessor": "^3.0.2",
4949
"@next-bricks/form": "^1.15.3",
5050
"@next-core/babel-preset-next": "^1.0.26",
51-
"@next-core/brick-container": "^3.23.0",
52-
"@next-core/brick-playground": "^1.16.29",
51+
"@next-core/brick-container": "^3.23.6",
52+
"@next-core/brick-playground": "^1.16.35",
5353
"@next-core/browserslist-config-next": "^1.1.2",
5454
"@next-core/eslint-config-next": "^3.0.1",
55-
"@next-core/preview": "^0.8.20",
55+
"@next-core/preview": "^0.8.26",
5656
"@next-core/test-next": "^2.0.1",
57-
"@next-core/yo": "^1.6.0",
57+
"@next-core/yo": "^1.6.3",
5858
"@types/d3-force": "^3.0.9",
5959
"@types/d3-geo": "^3.1.0",
6060
"@types/d3-hierarchy": "^3.1.2",

‎shared/general/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
"dependencies": {
6161
"@babel/types": "^7.22.5",
6262
"@next-core/cook": "^2.5.12",
63-
"@next-core/runtime": "^1.70.0",
64-
"@next-core/utils": "^1.8.6",
63+
"@next-core/runtime": "^1.71.4",
64+
"@next-core/utils": "^1.8.8",
6565
"history": "^4.7.11"
6666
},
6767
"devDependencies": {

‎shared/story/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"./package.json": "./package.json"
2121
},
2222
"dependencies": {
23-
"@next-core/types": "^1.17.0"
23+
"@next-core/types": "^1.18.1"
2424
}
2525
}

0 commit comments

Comments
 (0)