Skip to content

Commit f88e874

Browse files
rschristianmarvinhagemeister
authored andcommitted
refactor: Breaking changes to outputs & pkg.json (#4652)
* refactor: Switch to `package.json#exports.module`, drop `.min` builds, & use `.mjs` exclusively * chore: Remove leftover CJS shell * test: Fix export for karma * fix: coverage not generated in minify tests --------- Co-authored-by: Marvin Hagemeister <[email protected]>
1 parent 3de95b7 commit f88e874

File tree

10 files changed

+24
-60
lines changed

10 files changed

+24
-60
lines changed

compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"description": "A React compatibility layer for Preact",
77
"main": "dist/compat.js",
8-
"module": "dist/compat.module.js",
8+
"module": "dist/compat.mjs",
99
"umd:main": "dist/compat.umd.js",
1010
"source": "src/index.js",
1111
"types": "src/index.d.ts",
@@ -19,7 +19,7 @@
1919
"exports": {
2020
".": {
2121
"types": "./src/index.d.ts",
22-
"browser": "./dist/compat.module.js",
22+
"module": "./dist/compat.mjs",
2323
"umd": "./dist/compat.umd.js",
2424
"import": "./dist/compat.mjs",
2525
"require": "./dist/compat.js"

config/node-13-exports.js

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

debug/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"description": "Preact extensions for development",
77
"main": "dist/debug.js",
8-
"module": "dist/debug.module.js",
8+
"module": "dist/debug.mjs",
99
"umd:main": "dist/debug.umd.js",
1010
"source": "src/index.js",
1111
"license": "MIT",
@@ -18,7 +18,7 @@
1818
"exports": {
1919
".": {
2020
"types": "./src/index.d.ts",
21-
"browser": "./dist/debug.module.js",
21+
"module": "./dist/debug.mjs",
2222
"umd": "./dist/debug.umd.js",
2323
"import": "./dist/debug.mjs",
2424
"require": "./dist/debug.js"

devtools/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"description": "Preact bridge for Preact devtools",
77
"main": "dist/devtools.js",
8-
"module": "dist/devtools.module.js",
8+
"module": "dist/devtools.mjs",
99
"umd:main": "dist/devtools.umd.js",
1010
"source": "src/index.js",
1111
"license": "MIT",
@@ -16,7 +16,7 @@
1616
"exports": {
1717
".": {
1818
"types": "./src/index.d.ts",
19-
"browser": "./dist/devtools.module.js",
19+
"module": "./dist/devtools.mjs",
2020
"umd": "./dist/devtools.umd.js",
2121
"import": "./dist/devtools.mjs",
2222
"require": "./dist/devtools.js"

hooks/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"description": "Hook addon for Preact",
77
"main": "dist/hooks.js",
8-
"module": "dist/hooks.module.js",
8+
"module": "dist/hooks.mjs",
99
"umd:main": "dist/hooks.umd.js",
1010
"source": "src/index.js",
1111
"license": "MIT",
@@ -26,7 +26,7 @@
2626
"exports": {
2727
".": {
2828
"types": "./src/index.d.ts",
29-
"browser": "./dist/hooks.module.js",
29+
"module": "./dist/hooks.mjs",
3030
"umd": "./dist/hooks.umd.js",
3131
"import": "./dist/hooks.mjs",
3232
"require": "./dist/hooks.js"

jsx-runtime/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"description": "Preact JSX runtime",
77
"main": "dist/jsxRuntime.js",
8-
"module": "dist/jsxRuntime.module.js",
8+
"module": "dist/jsxRuntime.mjs",
99
"umd:main": "dist/jsxRuntime.umd.js",
1010
"source": "src/index.js",
1111
"types": "src/index.d.ts",
@@ -19,7 +19,7 @@
1919
"exports": {
2020
".": {
2121
"types": "./src/index.d.ts",
22-
"browser": "./dist/jsxRuntime.module.js",
22+
"module": "./dist/jsxRuntime.mjs",
2323
"umd": "./dist/jsxRuntime.umd.js",
2424
"import": "./dist/jsxRuntime.mjs",
2525
"require": "./dist/jsxRuntime.js"

karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const subPkgPath = pkgName => {
6262
const stripped = pkgName.replace(/[/\\./]/g, '');
6363
const pkgJson = path.join(__dirname, 'package.json');
6464
const pkgExports = require(pkgJson).exports;
65-
const file = pkgExports[stripped ? `./${stripped}` : '.'].browser;
65+
const file = pkgExports[stripped ? `./${stripped}` : '.'].module;
6666
return path.join(__dirname, file);
6767
};
6868

@@ -181,7 +181,7 @@ function createEsbuildPlugin() {
181181
coverage && [
182182
'istanbul',
183183
{
184-
include: minify ? '**/dist/**/*.js' : '**/src/**/*.js'
184+
include: minify ? '**/dist/**/*.{js,mjs}' : '**/src/**/*.js'
185185
}
186186
]
187187
].filter(Boolean)

package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"description": "Fast 3kb React-compatible Virtual DOM library.",
77
"type": "commonjs",
88
"main": "dist/preact.js",
9-
"module": "dist/preact.module.js",
9+
"module": "dist/preact.mjs",
1010
"umd:main": "dist/preact.umd.js",
1111
"unpkg": "dist/preact.min.js",
1212
"source": "src/index.js",
@@ -21,56 +21,56 @@
2121
"types": "./src/index-5.d.ts"
2222
},
2323
"types": "./src/index.d.ts",
24-
"browser": "./dist/preact.module.js",
24+
"module": "./dist/preact.mjs",
2525
"umd": "./dist/preact.umd.js",
2626
"import": "./dist/preact.mjs",
2727
"require": "./dist/preact.js"
2828
},
2929
"./compat": {
3030
"types": "./compat/src/index.d.ts",
31-
"browser": "./compat/dist/compat.module.js",
31+
"module": "./compat/dist/compat.mjs",
3232
"umd": "./compat/dist/compat.umd.js",
3333
"import": "./compat/dist/compat.mjs",
3434
"require": "./compat/dist/compat.js"
3535
},
3636
"./debug": {
3737
"types": "./debug/src/index.d.ts",
38-
"browser": "./debug/dist/debug.module.js",
38+
"module": "./debug/dist/debug.mjs",
3939
"umd": "./debug/dist/debug.umd.js",
4040
"import": "./debug/dist/debug.mjs",
4141
"require": "./debug/dist/debug.js"
4242
},
4343
"./devtools": {
4444
"types": "./devtools/src/index.d.ts",
45-
"browser": "./devtools/dist/devtools.module.js",
45+
"module": "./devtools/dist/devtools.mjs",
4646
"umd": "./devtools/dist/devtools.umd.js",
4747
"import": "./devtools/dist/devtools.mjs",
4848
"require": "./devtools/dist/devtools.js"
4949
},
5050
"./hooks": {
5151
"types": "./hooks/src/index.d.ts",
52-
"browser": "./hooks/dist/hooks.module.js",
52+
"module": "./hooks/dist/hooks.mjs",
5353
"umd": "./hooks/dist/hooks.umd.js",
5454
"import": "./hooks/dist/hooks.mjs",
5555
"require": "./hooks/dist/hooks.js"
5656
},
5757
"./test-utils": {
5858
"types": "./test-utils/src/index.d.ts",
59-
"browser": "./test-utils/dist/testUtils.module.js",
59+
"module": "./test-utils/dist/testUtils.mjs",
6060
"umd": "./test-utils/dist/testUtils.umd.js",
6161
"import": "./test-utils/dist/testUtils.mjs",
6262
"require": "./test-utils/dist/testUtils.js"
6363
},
6464
"./jsx-runtime": {
6565
"types": "./jsx-runtime/src/index.d.ts",
66-
"browser": "./jsx-runtime/dist/jsxRuntime.module.js",
66+
"module": "./jsx-runtime/dist/jsxRuntime.mjs",
6767
"umd": "./jsx-runtime/dist/jsxRuntime.umd.js",
6868
"import": "./jsx-runtime/dist/jsxRuntime.mjs",
6969
"require": "./jsx-runtime/dist/jsxRuntime.js"
7070
},
7171
"./jsx-dev-runtime": {
7272
"types": "./jsx-runtime/src/index.d.ts",
73-
"browser": "./jsx-runtime/dist/jsxRuntime.module.js",
73+
"module": "./jsx-runtime/dist/jsxRuntime.mjs",
7474
"umd": "./jsx-runtime/dist/jsxRuntime.umd.js",
7575
"import": "./jsx-runtime/dist/jsxRuntime.mjs",
7676
"require": "./jsx-runtime/dist/jsxRuntime.js"
@@ -117,14 +117,13 @@
117117
"prepare": "husky && run-s build && npm-merge-driver-install",
118118
"build": "npm-run-all --parallel build:*",
119119
"build:core": "microbundle build --raw --no-generateTypes -f cjs,esm,umd",
120-
"build:core-min": "microbundle build --raw --no-generateTypes -f cjs,esm,umd,iife src/cjs.js -o dist/preact.min.js",
121120
"build:debug": "microbundle build --raw --no-generateTypes -f cjs,esm,umd --cwd debug",
122121
"build:devtools": "microbundle build --raw --no-generateTypes -f cjs,esm,umd --cwd devtools",
123122
"build:hooks": "microbundle build --raw --no-generateTypes -f cjs,esm,umd --cwd hooks",
124123
"build:test-utils": "microbundle build --raw --no-generateTypes -f cjs,esm,umd --cwd test-utils",
125124
"build:compat": "microbundle build --raw --no-generateTypes -f cjs,esm,umd --cwd compat --globals 'preact/hooks=preactHooks'",
126125
"build:jsx": "microbundle build --raw --no-generateTypes -f cjs,esm,umd --cwd jsx-runtime",
127-
"postbuild": "node ./config/node-13-exports.js && node ./config/compat-entries.js",
126+
"postbuild": "node ./config/compat-entries.js",
128127
"dev": "microbundle watch --raw --no-generateTypes --format cjs",
129128
"dev:hooks": "microbundle watch --raw --no-generateTypes --format cjs --cwd hooks",
130129
"dev:compat": "microbundle watch --raw --no-generateTypes --format cjs --cwd compat --globals 'preact/hooks=preactHooks'",

src/cjs.js

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

test-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"description": "Test-utils for Preact",
77
"main": "dist/testUtils.js",
8-
"module": "dist/testUtils.module.js",
8+
"module": "dist/testUtils.mjs",
99
"umd:main": "dist/testUtils.umd.js",
1010
"source": "src/index.js",
1111
"license": "MIT",
@@ -19,7 +19,7 @@
1919
"exports": {
2020
".": {
2121
"types": "./src/index.d.ts",
22-
"browser": "./dist/testUtils.module.js",
22+
"module": "./dist/testUtils.mjs",
2323
"umd": "./dist/testUtils.umd.js",
2424
"import": "./dist/testUtils.mjs",
2525
"require": "./dist/testUtils.js"

0 commit comments

Comments
 (0)