Skip to content

Commit 54964ec

jamesopstad jamesopstad

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 54964ecCopy full SHA for 54964ec

File tree

7 files changed

+15

-10

lines changed

packages
- pg-bundler-test
- pg-cloudflare
  - README.md
  - package.json
- pg-esm-test
  - package.json

7 files changed

+15

-10

lines changed

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ await esbuild.build({`
`4`	`4`	`entryPoints: ['./src/index.mjs'],`
`5`	`5`	`bundle: true,`
`6`	`6`	`outfile: './dist/esbuild-cloudflare.js',`
`7`		`- conditions: ['import', 'cloudflare'],`
	`7`	`+ conditions: ['import', 'workerd'],`
`8`	`8`	`})`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ export default defineConfig({`
`8`	`8`	`file: 'dist/rollup-cloudflare.js',`
`9`	`9`	`format: 'es',`
`10`	`10`	`},`
`11`		`- plugins: [nodeResolve({ exportConditions: ['import', 'cloudflare'], preferBuiltins: true }), commonjs()],`
	`11`	`+ plugins: [nodeResolve({ exportConditions: ['import', 'workerd'], preferBuiltins: true }), commonjs()],`
`12`	`12`	`external: ['cloudflare:sockets'],`
`13`	`13`	`})`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export default defineConfig({`
`14`	`14`	`},`
`15`	`15`	`},`
`16`	`16`	`resolve: {`
`17`		`- conditions: ['import', 'cloudflare'],`
	`17`	`+ conditions: ['import', 'workerd'],`
`18`	`18`	`},`
`19`	`19`	`plugins: [commonjs()],`
`20`	`20`	`})`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export default {`
`6`	`6`	`output: {`
`7`	`7`	`filename: 'webpack-cloudflare.js',`
`8`	`8`	`},`
`9`		`- resolve: { conditionNames: ['import', 'cloudflare'] },`
	`9`	`+ resolve: { conditionNames: ['import', 'workerd'] },`
`10`	`10`	`plugins: [`
`11`	`11`	`// ignore cloudflare:sockets imports`
`12`	`12`	`new webpack.IgnorePlugin({`

`‎packages/pg-cloudflare/README.md`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ config. For example:`
`19`	`19`	```js
`20`	`20`	`export default {`
`21`	`21`	`...,`
`22`		`- resolve: { conditionNames: [..., "cloudflare"] },`
	`22`	`+ resolve: { conditionNames: [..., "workerd"] },`
`23`	`23`	`plugins: [`
`24`	`24`	`// ignore cloudflare:sockets imports`
`25`	`25`	`new webpack.IgnorePlugin({`
`@@ -29,11 +29,15 @@ config. For example:`
`29`	`29`	`}`
`30`	`30`	```
`31`	`31`	- `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`	`+`
`32`	`36`	```js
`33`	`37`	`export default defineConfig({`
`34`	`38`	`...,`
`35`	`39`	`resolve: {`
`36`		`- conditions: [..., "cloudflare"],`
	`40`	`+ conditions: [..., "workerd"],`
`37`	`41`	`},`
`38`	`42`	`build: {`
`39`	`43`	`...,`
`@@ -44,11 +48,12 @@ config. For example:`
`44`	`48`	`},`
`45`	`49`	`})`
`46`	`50`	```
	`51`	`+`
`47`	`52`	- `rollup.config.js`
`48`	`53`	```js
`49`	`54`	`export default defineConfig({`
`50`	`55`	`...,`
`51`		`- plugins: [..., nodeResolve({ exportConditions: [..., 'cloudflare'] })],`
	`56`	`+ plugins: [..., nodeResolve({ exportConditions: [..., 'workerd'] })],`
`52`	`57`	`// don't try to bundle cloudflare:sockets`
`53`	`58`	`external: [..., 'cloudflare:sockets'],`
`54`	`59`	`})`
`@@ -57,7 +62,7 @@ config. For example:`
`57`	`62`	```js
`58`	`63`	`await esbuild.build({`
`59`	`64`	`...,`
`60`		`- conditions: [..., 'cloudflare'],`
	`65`	`+ conditions: [..., 'workerd'],`
`61`	`66`	`})`
`62`	`67`	```
`63`	`68`

`‎packages/pg-cloudflare/package.json`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`},`
`12`	`12`	`"exports": {`
`13`	`13`	`".": {`
`14`		`- "cloudflare": {`
	`14`	`+ "workerd": {`
`15`	`15`	`"import": "./esm/index.mjs",`
`16`	`16`	`"require": "./dist/index.js"`
`17`	`17`	`},`

`‎packages/pg-esm-test/package.json`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"type": "module",`
`7`	`7`	`"scripts": {`
`8`		`- "test": "node --test --conditions=cloudflare"`
	`8`	`+ "test": "node --test --conditions=workerd"`
`9`	`9`	`},`
`10`	`10`	`"keywords": [`
`11`	`11`	`"postgres",`

0 commit comments

Comments

(0)