Skip to content

Commit 89cecbd

Browse files
committed
refactor: migrate from CommonJS to ESM by removing CJS builds and updating scripts and package configurations
1 parent 69ad79a commit 89cecbd

38 files changed

+100
-454
lines changed

.changeset/empty-mails-laugh.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'supabase-auth-helpers-qwik': major
3+
'create-qwik': major
4+
'@qwik.dev/router': major
5+
'@qwik.dev/react': major
6+
'@qwik.dev/core': major
7+
---
8+
9+
REAKING: the CJS/UMD builds have been removed; ESM is well-supported everywhere and allows better optimizations.

e2e/qwik-cli-e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ E2E project does the following internally:
1212

1313
0. Vitest is configured to run a setup function once **PRIOR TO ALL** tests. During the setup `@qwik.dev/core`, `@qwik.dev/router` and `eslint-plugin-qwik` packages will be packed with `pnpm pack` Those will be used at a step 2 for every test. Tarballs are located in `temp/tarballs` folder within this repo. It is assumed that packages are built before E2E is executed.
1414

15-
1. Simulates `npm create qwik` locally using direct command `node packages/create-qwik/create-qwik.cjs playground {outputDir}`
15+
1. Simulates `npm create qwik` locally using direct command `node packages/create-qwik/create-qwik.mjs playground {outputDir}`
1616
- By default `outputDir` is an auto-generated one using `tmp` npm package. The application that is created here will be removed after the test is executed
1717
- It is possible to install into custom folder using environment variable `TEMP_E2E_PATH`. Here's how the command would look like in this case:
1818
- with absolute path `TEMP_E2E_PATH=/Users/name/projects/tests pnpm run test.e2e.cli`

e2e/qwik-cli-e2e/utils/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function getTmpDirSync(tmpDirOverride?: string) {
6161
function runCreateQwikCommand(tmpDir: string, type: 'playground' | 'library' | 'empty'): string {
6262
const appDir = 'e2e-app';
6363
execSync(
64-
`node "${workspaceRoot}/packages/create-qwik/create-qwik.cjs" ${type} "${join(tmpDir, appDir)}"`
64+
`node "${workspaceRoot}/packages/create-qwik/create-qwik.mjs" ${type} "${join(tmpDir, appDir)}"`
6565
);
6666
return join(tmpDir, appDir);
6767
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@
196196
"build.wasm": "tsx --require ./scripts/runBefore.ts scripts/index.ts --wasm",
197197
"build.watch": "tsx --require ./scripts/runBefore.ts scripts/index.ts --qwik --qwikrouter --watch --dev --platform-binding",
198198
"change": "changeset",
199-
"cli": "pnpm build.cli && node packages/create-qwik/create-qwik.cjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
200-
"cli.qwik": "pnpm build.cli && node packages/qwik/qwik-cli.cjs",
199+
"cli": "pnpm build.cli && node packages/create-qwik/create-qwik.mjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
200+
"cli.qwik": "pnpm build.cli && node packages/qwik/qwik-cli.mjs",
201201
"cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts",
202202
"deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe",
203203
"docs.dev": "pnpm -C packages/docs build.repl-sw && pnpm -C packages/docs dev",

packages/create-qwik/create-qwik.cjs

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env node
2+
import * as createQwik from './dist/index.mjs';
3+
createQwik.runCli();

packages/create-qwik/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Interactive CLI for create Qwik projects and adding features.",
44
"version": "2.0.0-beta.13",
55
"author": "Qwik Team",
6-
"bin": "./create-qwik.cjs",
6+
"bin": "./create-qwik.mjs",
77
"bugs": "https://github.com/QwikDev/qwik/issues",
88
"devDependencies": {
99
"@clack/prompts": "0.11.0",
@@ -20,7 +20,7 @@
2020
"engines-annotation": "Mostly required by sharp which needs a Node-API v9 compatible runtime",
2121
"files": [
2222
"README.md",
23-
"create-qwik.cjs",
23+
"create-qwik.mjs",
2424
"dist"
2525
],
2626
"homepage": "https://qwik.dev/",
@@ -31,10 +31,11 @@
3131
"template"
3232
],
3333
"license": "MIT",
34-
"main": "./dist/index.cjs",
34+
"main": "./dist/index.mjs",
3535
"repository": {
3636
"type": "git",
3737
"url": "https://github.com/QwikDev/qwik.git",
3838
"directory": "packages/create-qwik"
39-
}
39+
},
40+
"type": "module"
4041
}

packages/qwik-react/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@
1818
"exports": {
1919
".": {
2020
"types": "./lib/types/index.qwik.d.ts",
21-
"import": "./lib/index.qwik.mjs",
22-
"require": "./lib/index.qwik.cjs"
21+
"import": "./lib/index.qwik.mjs"
2322
},
2423
"./vite": {
2524
"types": "./lib/types/vite.d.ts",
26-
"import": "./lib/vite.mjs",
27-
"require": "./lib/vite.cjs"
25+
"import": "./lib/vite.mjs"
2826
}
2927
},
3028
"files": [

packages/qwik-react/vite.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ export default defineConfig(() => {
88
target: 'es2020',
99
lib: {
1010
entry: ['./src/index.qwik.ts', './src/vite.ts'],
11-
formats: ['es', 'cjs'],
12-
fileName: (format, entryName) => `${entryName}.${format === 'es' ? 'mjs' : 'cjs'}`,
11+
formats: ['es'],
12+
fileName: (format, entryName) => `${entryName}.mjs`,
1313
},
1414
rollupOptions: {
1515
external: [

packages/qwik-router/package.json

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -48,63 +48,51 @@
4848
"exports": {
4949
".": {
5050
"types": "./lib/index.d.ts",
51-
"import": "./lib/index.qwik.mjs",
52-
"require": "./lib/index.qwik.cjs"
51+
"import": "./lib/index.qwik.mjs"
5352
},
5453
"./adapters/azure-swa/vite": {
5554
"types": "./lib/adapters/azure-swa/vite/index.d.ts",
56-
"import": "./lib/adapters/azure-swa/vite/index.mjs",
57-
"require": "./lib/adapters/azure-swa/vite/index.cjs"
55+
"import": "./lib/adapters/azure-swa/vite/index.mjs"
5856
},
5957
"./adapters/cloudflare-pages/vite": {
6058
"types": "./lib/adapters/cloudflare-pages/vite/index.d.ts",
61-
"import": "./lib/adapters/cloudflare-pages/vite/index.mjs",
62-
"require": "./lib/adapters/cloudflare-pages/vite/index.cjs"
59+
"import": "./lib/adapters/cloudflare-pages/vite/index.mjs"
6360
},
6461
"./adapters/cloud-run/vite": {
6562
"types": "./lib/adapters/cloud-run/vite/index.d.ts",
66-
"import": "./lib/adapters/cloud-run/vite/index.mjs",
67-
"require": "./lib/adapters/cloud-run/vite/index.cjs"
63+
"import": "./lib/adapters/cloud-run/vite/index.mjs"
6864
},
6965
"./adapters/bun-server/vite": {
7066
"types": "./lib/adapters/bun-server/vite/index.d.ts",
71-
"import": "./lib/adapters/bun-server/vite/index.mjs",
72-
"require": "./lib/adapters/bun-server/vite/index.cjs"
67+
"import": "./lib/adapters/bun-server/vite/index.mjs"
7368
},
7469
"./adapters/deno-server/vite": {
7570
"types": "./lib/adapters/deno-server/vite/index.d.ts",
76-
"import": "./lib/adapters/deno-server/vite/index.mjs",
77-
"require": "./lib/adapters/deno-server/vite/index.cjs"
71+
"import": "./lib/adapters/deno-server/vite/index.mjs"
7872
},
7973
"./adapters/node-server/vite": {
8074
"types": "./lib/adapters/node-server/vite/index.d.ts",
81-
"import": "./lib/adapters/node-server/vite/index.mjs",
82-
"require": "./lib/adapters/node-server/vite/index.cjs"
75+
"import": "./lib/adapters/node-server/vite/index.mjs"
8376
},
8477
"./adapters/netlify-edge/vite": {
8578
"types": "./lib/adapters/netlify-edge/vite/index.d.ts",
86-
"import": "./lib/adapters/netlify-edge/vite/index.mjs",
87-
"require": "./lib/adapters/netlify-edge/vite/index.cjs"
79+
"import": "./lib/adapters/netlify-edge/vite/index.mjs"
8880
},
8981
"./adapters/shared/vite": {
9082
"types": "./lib/adapters/shared/vite/index.d.ts",
91-
"import": "./lib/adapters/shared/vite/index.mjs",
92-
"require": "./lib/adapters/shared/vite/index.cjs"
83+
"import": "./lib/adapters/shared/vite/index.mjs"
9384
},
9485
"./adapters/static/vite": {
9586
"types": "./lib/adapters/ssg/vite/index.d.ts",
96-
"import": "./lib/adapters/ssg/vite/index.mjs",
97-
"require": "./lib/adapters/ssg/vite/index.cjs"
87+
"import": "./lib/adapters/ssg/vite/index.mjs"
9888
},
9989
"./adapters/ssg/vite": {
10090
"types": "./lib/adapters/ssg/vite/index.d.ts",
101-
"import": "./lib/adapters/ssg/vite/index.mjs",
102-
"require": "./lib/adapters/ssg/vite/index.cjs"
91+
"import": "./lib/adapters/ssg/vite/index.mjs"
10392
},
10493
"./adapters/vercel-edge/vite": {
10594
"types": "./lib/adapters/vercel-edge/vite/index.d.ts",
106-
"import": "./lib/adapters/vercel-edge/vite/index.mjs",
107-
"require": "./lib/adapters/vercel-edge/vite/index.cjs"
95+
"import": "./lib/adapters/vercel-edge/vite/index.mjs"
10896
},
10997
"./middleware/azure-swa": {
11098
"types": "./lib/middleware/azure-swa/index.d.ts",
@@ -136,37 +124,31 @@
136124
},
137125
"./middleware/node": {
138126
"types": "./lib/middleware/node/index.d.ts",
139-
"import": "./lib/middleware/node/index.mjs",
140-
"require": "./lib/middleware/node/index.cjs"
127+
"import": "./lib/middleware/node/index.mjs"
141128
},
142129
"./middleware/request-handler": {
143130
"types": "./lib/middleware/request-handler/index.d.ts",
144-
"import": "./lib/middleware/request-handler/index.mjs",
145-
"require": "./lib/middleware/request-handler/index.cjs"
131+
"import": "./lib/middleware/request-handler/index.mjs"
146132
},
147133
"./middleware/vercel-edge": {
148134
"types": "./lib/middleware/vercel-edge/index.d.ts",
149135
"import": "./lib/middleware/vercel-edge/index.mjs"
150136
},
151137
"./static": {
152138
"types": "./lib/ssg/index.d.ts",
153-
"import": "./lib/ssg/index.mjs",
154-
"require": "./lib/ssg/index.cjs"
139+
"import": "./lib/ssg/index.mjs"
155140
},
156141
"./ssg": {
157142
"types": "./lib/ssg/index.d.ts",
158-
"import": "./lib/ssg/index.mjs",
159-
"require": "./lib/ssg/index.cjs"
143+
"import": "./lib/ssg/index.mjs"
160144
},
161145
"./vite": {
162146
"types": "./lib/vite/index.d.ts",
163-
"import": "./lib/vite/index.mjs",
164-
"require": "./lib/vite/index.cjs"
147+
"import": "./lib/vite/index.mjs"
165148
},
166149
"./service-worker": {
167150
"types": "./service-worker.d.ts",
168-
"import": "./lib/service-worker.mjs",
169-
"require": "./lib/service-worker.cjs"
151+
"import": "./lib/service-worker.mjs"
170152
},
171153
"./package.json": "./package.json"
172154
},

0 commit comments

Comments
 (0)