Skip to content

Commit 0341f5f

Browse files
zettcazettca
committed
build: change packages to ESM-only (#4815)
1 parent c178d93 commit 0341f5f

File tree

15 files changed

+82
-118
lines changed

15 files changed

+82
-118
lines changed

‎.config/vite.config.ts

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,16 @@ const external = [
2020
const esmOutput: OutputOptions = {
2121
format: "esm",
2222
preserveModules: true,
23-
dir: "dist/esm",
24-
// keep react-based packages as `.js` for backwards compatibility
25-
entryFileNames:
26-
pkg.name.includes("react") || pkg.name.includes("app-shell")
27-
? "[name].js"
28-
: "[name].mjs",
29-
exports: "named",
30-
interop: "auto",
31-
};
32-
33-
const cjsOutput: OutputOptions = {
34-
format: "cjs",
35-
preserveModules: true,
36-
dir: "dist/cjs",
37-
entryFileNames: "[name].cjs",
23+
dir: "dist",
24+
entryFileNames: "[name].js",
3825
exports: "named",
3926
interop: "auto",
4027
};
4128

4229
export default defineConfig({
4330
plugins: [
4431
dts({
45-
outDir: "dist/types",
32+
outDir: "dist",
4633
rollupTypes: true,
4734
tsconfigPath: resolve(__dirname, "../tsconfig.build.json"),
4835
}),
@@ -57,10 +44,7 @@ export default defineConfig({
5744
entry: resolve(process.cwd(), "src/index.ts"),
5845
},
5946
rollupOptions: {
60-
// TODO: align with AppShell's ESM-only approach
61-
output: pkg.name.includes("/app-shell")
62-
? [esmOutput]
63-
: [esmOutput, cjsOutput],
47+
output: [esmOutput],
6448
external,
6549
},
6650
},

‎packages/app-shell-events/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
"publishConfig": {
3434
"access": "public",
3535
"directory": "package",
36-
"module": "dist/esm/index.js",
37-
"types": "./dist/types/index.d.ts",
36+
"module": "dist/index.js",
37+
"types": "./dist/index.d.ts",
3838
"exports": {
3939
".": {
40-
"types": "./dist/types/index.d.ts",
41-
"import": "./dist/esm/index.js",
42-
"default": "./dist/esm/index.js"
40+
"types": "./dist/index.d.ts",
41+
"import": "./dist/index.js",
42+
"default": "./dist/index.js"
4343
},
4444
"./package.json": "./package.json"
4545
}

‎packages/app-shell-navigation/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
"publishConfig": {
4646
"access": "public",
4747
"directory": "package",
48-
"module": "dist/esm/index.js",
49-
"types": "./dist/types/index.d.ts",
48+
"module": "dist/index.js",
49+
"types": "./dist/index.d.ts",
5050
"exports": {
5151
".": {
52-
"types": "./dist/types/index.d.ts",
53-
"import": "./dist/esm/index.js",
54-
"default": "./dist/esm/index.js"
52+
"types": "./dist/index.d.ts",
53+
"import": "./dist/index.js",
54+
"default": "./dist/index.js"
5555
},
5656
"./package.json": "./package.json"
5757
}

‎packages/app-shell-shared/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
"publishConfig": {
4646
"access": "public",
4747
"directory": "package",
48-
"module": "dist/esm/index.js",
48+
"module": "dist/index.js",
4949
"types": "./dist/types/index.d.ts",
5050
"exports": {
5151
".": {
52-
"types": "./dist/types/index.d.ts",
53-
"import": "./dist/esm/index.js",
54-
"default": "./dist/esm/index.js"
52+
"types": "./dist/index.d.ts",
53+
"import": "./dist/index.js",
54+
"default": "./dist/index.js"
5555
},
5656
"./package.json": "./package.json",
5757
"./bundles/*": "./dist/bundles/*"

‎packages/app-shell-ui/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@
5757
"publishConfig": {
5858
"access": "public",
5959
"directory": "package",
60-
"module": "dist/esm/index.js",
60+
"module": "dist/index.js",
6161
"types": "./dist/types/index.d.ts",
6262
"exports": {
6363
".": {
64-
"types": "./dist/types/index.d.ts",
65-
"import": "./dist/esm/index.js",
66-
"default": "./dist/esm/index.js"
64+
"types": "./dist/index.d.ts",
65+
"import": "./dist/index.js",
66+
"default": "./dist/index.js"
6767
},
6868
"./package.json": "./package.json"
6969
}

‎packages/code-editor/package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,21 @@
6060
"publishConfig": {
6161
"access": "public",
6262
"directory": "package",
63-
"main": "dist/cjs/index.cjs",
64-
"module": "dist/esm/index.js",
65-
"types": "dist/types/index.d.ts",
63+
"main": "dist/index.js",
64+
"module": "dist/index.js",
65+
"types": "dist/index.d.ts",
6666
"exports": {
6767
".": {
68-
"types": "./dist/types/index.d.ts",
69-
"require": "./dist/cjs/index.cjs",
70-
"import": "./dist/esm/index.js"
68+
"types": "./dist/index.d.ts",
69+
"import": "./dist/index.js"
7170
}
7271
}
7372
},
7473
"clean-publish": {
7574
"withoutPublish": true,
7675
"tempDir": "package",
7776
"fields": [
78-
"main",
79-
"type"
77+
"main"
8078
],
8179
"files": [
8280
"tsconfig.json"

‎packages/core/package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,21 @@
7979
"publishConfig": {
8080
"access": "public",
8181
"directory": "package",
82-
"main": "dist/cjs/index.cjs",
83-
"module": "dist/esm/index.js",
84-
"types": "dist/types/index.d.ts",
82+
"main": "dist/index.js",
83+
"module": "dist/index.js",
84+
"types": "dist/index.d.ts",
8585
"exports": {
8686
".": {
87-
"types": "./dist/types/index.d.ts",
88-
"require": "./dist/cjs/index.cjs",
89-
"import": "./dist/esm/index.js"
87+
"types": "./dist/index.d.ts",
88+
"import": "./dist/index.js"
9089
}
9190
}
9291
},
9392
"clean-publish": {
9493
"withoutPublish": true,
9594
"tempDir": "package",
9695
"fields": [
97-
"main",
98-
"type"
96+
"main"
9997
],
10098
"files": [
10199
"tsconfig.json"

‎packages/icons/package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,21 @@
6161
"publishConfig": {
6262
"access": "public",
6363
"directory": "package",
64-
"main": "dist/cjs/index.cjs",
65-
"module": "dist/esm/index.js",
66-
"types": "dist/types/index.d.ts",
64+
"main": "dist/index.js",
65+
"module": "dist/index.js",
66+
"types": "dist/index.d.ts",
6767
"exports": {
6868
".": {
69-
"types": "./dist/types/index.d.ts",
70-
"require": "./dist/cjs/index.cjs",
71-
"import": "./dist/esm/index.js"
69+
"types": "./dist/index.d.ts",
70+
"import": "./dist/index.js"
7271
}
7372
}
7473
},
7574
"clean-publish": {
7675
"withoutPublish": true,
7776
"tempDir": "package",
7877
"fields": [
79-
"main",
80-
"type"
78+
"main"
8179
],
8280
"files": [
8381
"tsconfig.json"

‎packages/lab/package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,21 @@
6868
"publishConfig": {
6969
"access": "public",
7070
"directory": "package",
71-
"main": "dist/cjs/index.cjs",
72-
"module": "dist/esm/index.js",
73-
"types": "dist/types/index.d.ts",
71+
"main": "dist/index.js",
72+
"module": "dist/index.js",
73+
"types": "dist/index.d.ts",
7474
"exports": {
7575
".": {
76-
"types": "./dist/types/index.d.ts",
77-
"require": "./dist/cjs/index.cjs",
78-
"import": "./dist/esm/index.js"
76+
"types": "./dist/index.d.ts",
77+
"import": "./dist/index.js"
7978
}
8079
}
8180
},
8281
"clean-publish": {
8382
"withoutPublish": true,
8483
"tempDir": "package",
8584
"fields": [
86-
"main",
87-
"type"
85+
"main"
8886
],
8987
"files": [
9088
"tsconfig.json"

‎packages/pentaho/package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,21 @@
5959
"publishConfig": {
6060
"access": "public",
6161
"directory": "package",
62-
"main": "dist/cjs/index.cjs",
63-
"module": "dist/esm/index.js",
64-
"types": "dist/types/index.d.ts",
62+
"main": "dist/index.js",
63+
"module": "dist/index.js",
64+
"types": "dist/index.d.ts",
6565
"exports": {
6666
".": {
67-
"types": "./dist/types/index.d.ts",
68-
"require": "./dist/cjs/index.cjs",
69-
"import": "./dist/esm/index.js"
67+
"types": "./dist/index.d.ts",
68+
"import": "./dist/index.js"
7069
}
7170
}
7271
},
7372
"clean-publish": {
7473
"withoutPublish": true,
7574
"tempDir": "package",
7675
"fields": [
77-
"main",
78-
"type"
76+
"main"
7977
],
8078
"files": [
8179
"tsconfig.json"

0 commit comments

Comments
 (0)