Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the Node.js ESM import support for all packages #637

Merged
merged 10 commits into from
Mar 18, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions .changeset/thin-wombats-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
'@urql/exchange-graphcache': patch
'@urql/exchange-multipart-fetch': patch
'@urql/exchange-populate': patch
'@urql/exchange-retry': patch
'@urql/exchange-suspense': patch
'@urql/core': patch
'next-urql': patch
'@urql/preact': patch
'urql': patch
'@urql/svelte': patch
---

Add support for Node13
18 changes: 9 additions & 9 deletions exchanges/graphcache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
"exchanges"
],
"main": "dist/urql-exchange-graphcache.cjs.js",
"module": "dist/urql-exchange-graphcache.esm.js",
"module": "dist/urql-exchange-graphcache.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "dist/urql-exchange-graphcache.esm.js",
"require": "dist/urql-exchange-graphcache.cjs.js",
"types": "dist/types/index.d.ts",
"source": "src/index.ts"
"import": "./dist/urql-exchange-graphcache.esm.mjs",
"require": "./dist/urql-exchange-graphcache.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
},
"./extras": {
"import": "dist/urql-exchange-graphcache-extras.esm.js",
"require": "dist/urql-exchange-graphcache-extras.cjs.js",
"types": "dist/types/extras/index.d.ts",
"source": "src/extras/index.ts"
"import": "./dist/urql-exchange-graphcache-extras.esm.mjs",
"require": "./dist/urql-exchange-graphcache-extras.cjs.js",
"types": "./dist/types/extras/index.d.ts",
"source": "./src/extras/index.ts"
}
},
"files": [
Expand Down
10 changes: 5 additions & 5 deletions exchanges/multipart-fetch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"exchanges"
],
"main": "dist/urql-exchange-multipart-fetch.cjs.js",
"module": "dist/urql-exchange-multipart-fetch.esm.js",
"module": "dist/urql-exchange-multipart-fetch.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "dist/urql-exchange-multipart-fetch.esm.js",
"require": "dist/urql-exchange-multipart-fetch.cjs.js",
"types": "dist/types/index.d.ts",
"source": "src/index.ts"
"import": "./dist/urql-exchange-multipart-fetch.esm.mjs",
"require": "./dist/urql-exchange-multipart-fetch.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
Expand Down
10 changes: 5 additions & 5 deletions exchanges/populate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"exchanges"
],
"main": "dist/urql-exchange-populate.cjs.js",
"module": "dist/urql-exchange-populate.esm.js",
"module": "dist/urql-exchange-populate.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "dist/urql-exchange-populate.esm.js",
"require": "dist/urql-exchange-populate.cjs.js",
"types": "dist/types/index.d.ts",
"source": "src/index.ts"
"import": "./dist/urql-exchange-populate.esm.mjs",
"require": "./dist/urql-exchange-populate.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
Expand Down
10 changes: 9 additions & 1 deletion exchanges/retry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,17 @@
"retry"
],
"main": "dist/urql-exchange-retry.cjs.js",
"module": "dist/urql-exchange-retry.esm.js",
"module": "dist/urql-exchange-retry.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "./dist/urql-exchange-retry.esm.mjs",
"require": "./dist/urql-exchange-retry.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
"LICENSE",
"CHANGELOG.md",
Expand Down
10 changes: 9 additions & 1 deletion exchanges/suspense/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,17 @@
"suspense"
],
"main": "dist/urql-exchange-suspense.cjs.js",
"module": "dist/urql-exchange-suspense.esm.js",
"module": "dist/urql-exchange-suspense.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "./dist/urql-exchange-suspense.esm.mjs",
"require": "./dist/urql-exchange-suspense.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
"LICENSE",
"CHANGELOG.md",
Expand Down
12 changes: 10 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,17 @@
"exchanges"
],
"main": "dist/urql-core.cjs.js",
"module": "dist/urql-core.esm.js",
"module": "dist/urql-core.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "./dist/urql-core.esm.mjs",
"require": "./dist/urql-core.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
"LICENSE",
"README.md",
Expand All @@ -47,7 +55,7 @@
"graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
},
"dependencies": {
"wonka": "^4.0.7"
"wonka": "^4.0.8"
},
"publishConfig": {
"access": "public"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"graphql-tag": "^2.10.1",
"isomorphic-unfetch": "^3.0.0",
"next": "^9.2.0",
"wonka": "^4.0.7"
"wonka": "^4.0.8"
}
}
10 changes: 9 additions & 1 deletion packages/next-urql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@
"directory": "packages/next-urql"
},
"main": "dist/next-urql.cjs.js",
"module": "dist/next-urql.esm.js",
"module": "dist/next-urql.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "./dist/next-urql.esm.mjs",
"require": "./dist/next-urql.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
"LICENSE",
"CHANGELOG.md",
Expand Down
12 changes: 10 additions & 2 deletions packages/preact-urql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,17 @@
"preact"
],
"main": "dist/urql-preact.cjs.js",
"module": "dist/urql-preact.esm.js",
"module": "dist/urql-preact.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "./dist/urql-preact.esm.mjs",
"require": "./dist/urql-preact.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
"LICENSE",
"CHANGELOG.md",
Expand Down Expand Up @@ -53,7 +61,7 @@
},
"dependencies": {
"@urql/core": "^1.10.2",
"wonka": "^4.0.6"
"wonka": "^4.0.8"
},
"publishConfig": {
"access": "public"
Expand Down
12 changes: 10 additions & 2 deletions packages/react-urql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,17 @@
"react"
],
"main": "dist/urql.cjs.js",
"module": "dist/urql.esm.js",
"module": "dist/urql.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "./dist/urql.esm.mjs",
"require": "./dist/urql.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
"LICENSE",
"CHANGELOG.md",
Expand Down Expand Up @@ -61,6 +69,6 @@
},
"dependencies": {
"@urql/core": "^1.10.2",
"wonka": "^4.0.7"
"wonka": "^4.0.8"
}
}
12 changes: 10 additions & 2 deletions packages/svelte-urql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,17 @@
"svelte"
],
"main": "dist/urql-svelte.cjs.js",
"module": "dist/urql-svelte.esm.js",
"module": "dist/urql-svelte.esm.mjs",
"types": "dist/types/index.d.ts",
"source": "src/index.ts",
"exports": {
".": {
"import": "./dist/urql-svelte.esm.mjs",
"require": "./dist/urql-svelte.cjs.js",
"types": "./dist/types/index.d.ts",
"source": "./src/index.ts"
}
},
"files": [
"LICENSE",
"CHANGELOG.md",
Expand All @@ -47,7 +55,7 @@
},
"dependencies": {
"@urql/core": "^1.10.2",
"wonka": "^4.0.7"
"wonka": "^4.0.8"
},
"devDependencies": {
"graphql": "^14.5.8",
Expand Down
5 changes: 2 additions & 3 deletions scripts/prepare/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ invariant(
);

invariant(
path.normalize(pkg.module) === `dist/${name}.esm.js`,
path.normalize(pkg.module) === `dist/${name}.esm.mjs`,
'package.json:module path must be valid'
);

Expand Down Expand Up @@ -80,7 +80,6 @@ if (pkg.exports) {
const entry = pkg.exports[key];
const entryName = normalize(key);
const bundleName = entryName ? `${name}-${entryName}` : name;

invariant(
fs.existsSync(entry.source),
`package.json:exports["${key}"].source must exist`
Expand All @@ -92,7 +91,7 @@ if (pkg.exports) {
);

invariant(
path.normalize(entry.import) === `dist/${bundleName}.esm.js`,
path.normalize(entry.import) === `dist/${bundleName}.esm.mjs`,
`package.json:exports["${key}"].import must be valid`
);

Expand Down
4 changes: 2 additions & 2 deletions scripts/rollup/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ export default [
plugins,
output: [
output('cjs', '.js'),
output('esm', '.js'),
output('esm', '.mjs'),
],
},
!settings.isCI && {
...config,
plugins: makePlugins({ isProduction: true }),
output: [
output('cjs', '.min.js'),
output('esm', '.min.js'),
output('esm', '.min.mjs'),
],
},
].filter(Boolean);
7 changes: 6 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15033,11 +15033,16 @@ winston@0.8.x:
pkginfo "0.3.x"
stack-trace "0.0.x"

"wonka@^3.2.1 || ^4.0.0", wonka@^4.0.6, wonka@^4.0.7:
"wonka@^3.2.1 || ^4.0.0", wonka@^4.0.7:
version "4.0.7"
resolved "https://registry.yarnpkg.com/wonka/-/wonka-4.0.7.tgz#b4934685bd2449367bd72ce7770bfe3e6cc8a68b"
integrity sha512-Uhyl2cgWCUksYtU0Jt8MSzKUqK4BVUrewWxnn1YlKL3Zco4sDcCUDkbgH0i762HJs1rtsq03cfzsCWxJKaDgVg==

wonka@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/wonka/-/wonka-4.0.8.tgz#edab5fb3bcb060242b7a47d2aaab57a45ef69c35"
integrity sha512-7JHs16U9/OxkkoytluIRfxRLML7erwWuDkE5Qgw+12ctIBjUwq+wIifzTvJXi9NDSO+Hr9I6t/huiLaeWg89vA==

word-wrap@~1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
Expand Down