Skip to content

Commit 54964ec

Browse files
authored
Replace cloudflare export condition in pg-cloudflare with workerd (#3498)
* Replace cloudflare export condition with workerd * Add note about Cloudflare Vite plugin
1 parent 1a25d12 commit 54964ec

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

packages/pg-bundler-test/esbuild-cloudflare.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ await esbuild.build({
44
entryPoints: ['./src/index.mjs'],
55
bundle: true,
66
outfile: './dist/esbuild-cloudflare.js',
7-
conditions: ['import', 'cloudflare'],
7+
conditions: ['import', 'workerd'],
88
})

packages/pg-bundler-test/rollup-cloudflare.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export default defineConfig({
88
file: 'dist/rollup-cloudflare.js',
99
format: 'es',
1010
},
11-
plugins: [nodeResolve({ exportConditions: ['import', 'cloudflare'], preferBuiltins: true }), commonjs()],
11+
plugins: [nodeResolve({ exportConditions: ['import', 'workerd'], preferBuiltins: true }), commonjs()],
1212
external: ['cloudflare:sockets'],
1313
})

packages/pg-bundler-test/vite-cloudflare.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default defineConfig({
1414
},
1515
},
1616
resolve: {
17-
conditions: ['import', 'cloudflare'],
17+
conditions: ['import', 'workerd'],
1818
},
1919
plugins: [commonjs()],
2020
})

packages/pg-bundler-test/webpack-cloudflare.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default {
66
output: {
77
filename: 'webpack-cloudflare.js',
88
},
9-
resolve: { conditionNames: ['import', 'cloudflare'] },
9+
resolve: { conditionNames: ['import', 'workerd'] },
1010
plugins: [
1111
// ignore cloudflare:sockets imports
1212
new webpack.IgnorePlugin({

packages/pg-cloudflare/README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ config. For example:
1919
```js
2020
export default {
2121
...,
22-
resolve: { conditionNames: [..., "cloudflare"] },
22+
resolve: { conditionNames: [..., "workerd"] },
2323
plugins: [
2424
// ignore cloudflare:sockets imports
2525
new webpack.IgnorePlugin({
@@ -29,11 +29,15 @@ config. For example:
2929
}
3030
```
3131
- `vite.config.js`
32+
33+
> [!NOTE]
34+
> If you are using the [Cloudflare Vite plugin](https://www.npmjs.com/package/@cloudflare/vite-plugin) then the following configuration is not necessary.
35+
3236
```js
3337
export default defineConfig({
3438
...,
3539
resolve: {
36-
conditions: [..., "cloudflare"],
40+
conditions: [..., "workerd"],
3741
},
3842
build: {
3943
...,
@@ -44,11 +48,12 @@ config. For example:
4448
},
4549
})
4650
```
51+
4752
- `rollup.config.js`
4853
```js
4954
export default defineConfig({
5055
...,
51-
plugins: [..., nodeResolve({ exportConditions: [..., 'cloudflare'] })],
56+
plugins: [..., nodeResolve({ exportConditions: [..., 'workerd'] })],
5257
// don't try to bundle cloudflare:sockets
5358
external: [..., 'cloudflare:sockets'],
5459
})
@@ -57,7 +62,7 @@ config. For example:
5762
```js
5863
await esbuild.build({
5964
...,
60-
conditions: [..., 'cloudflare'],
65+
conditions: [..., 'workerd'],
6166
})
6267
```
6368

packages/pg-cloudflare/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"exports": {
1313
".": {
14-
"cloudflare": {
14+
"workerd": {
1515
"import": "./esm/index.mjs",
1616
"require": "./dist/index.js"
1717
},

packages/pg-esm-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"type": "module",
77
"scripts": {
8-
"test": "node --test --conditions=cloudflare"
8+
"test": "node --test --conditions=workerd"
99
},
1010
"keywords": [
1111
"postgres",

0 commit comments

Comments
 (0)