feat: Add explicit package.json type field (#5505)

lachlancollins · web-flow · commit e73690549770 · 2023-06-01T17:03:09.000+10:00
diff --git a/babel.config.cjs b/babel.config.cjs
diff --git a/nx.json b/nx.json
@@ -28,7 +28,7 @@
   "namedInputs": {
     "globalBuildAffectingConfig": [
       "{workspaceRoot}/.browserslistrc",
-      "{workspaceRoot}/babel.config.js",
+      "{workspaceRoot}/babel.config.cjs",
       "{workspaceRoot}/package.json",
       "{workspaceRoot}/scripts/getRollupConfig.mjs",
       "{workspaceRoot}/tsconfig.json"
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "query",
   "repository": "https://github.com/tanstack/query.git",
   "packageManager": "pnpm@8.5.1",
+  "type": "module",
   "scripts": {
     "clean": "pnpm --filter \"./packages/**\" run clean",
     "preinstall": "node -e \"if(process.env.CI == 'true') {console.log('Skipping preinstall...'); process.exit(1)}\" || npx -y only-allow pnpm",
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "exports": {
     "./package.json": "./package.json"
   },
diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "main": "build/lib/index.js",
   "exports": {
     ".": {
diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/query-core/package.json b/packages/query-core/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/types/index.d.ts",
   "main": "build/umd/index.js",
   "module": "build/esm/index.mjs",
diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/react-query/package.json b/packages/react-query/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
@@ -10,6 +10,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/types/index.d.ts",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json
@@ -13,10 +13,12 @@
   "type": "module",
   "types": "build/lib/index.d.ts",
   "module": "build/lib/index.js",
+  "svelte": "./build/lib/index.js",
   "exports": {
     ".": {
       "types": "./build/lib/index.d.ts",
       "import": "./build/lib/index.js",
+      "svelte": "./build/lib/index.js",
       "default": "./build/lib/index.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json
@@ -13,10 +13,12 @@
   "type": "module",
   "types": "build/lib/index.d.ts",
   "module": "build/lib/index.js",
+  "svelte": "./build/lib/index.js",
   "exports": {
     ".": {
       "types": "./build/lib/index.d.ts",
       "import": "./build/lib/index.js",
+      "svelte": "./build/lib/index.js",
       "default": "./build/lib/index.js"
     },
     "./package.json": "./package.json"
diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json
@@ -14,6 +14,7 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
+  "type": "commonjs",
   "types": "build/lib/index.d.ts",
   "main": "build/lib/index.js",
   "module": "build/lib/index.esm.js",
diff --git a/scripts/config.mjs b/scripts/config.mjs
@@ -61,12 +61,12 @@ export const packages = [
   {
     name: '@tanstack/svelte-query',
     packageDir: 'packages/svelte-query',
-    entries: ['module', 'types'],
+    entries: ['module', 'svelte', 'types'],
   },
   {
     name: '@tanstack/svelte-query-devtools',
     packageDir: 'packages/svelte-query-devtools',
-    entries: ['module', 'types'],
+    entries: ['module', 'svelte', 'types'],
   },
   {
     name: '@tanstack/vue-query',
diff --git a/scripts/getRollupConfig.mjs b/scripts/getRollupConfig.mjs
@@ -23,7 +23,7 @@ const forceEnvPlugin = (type) =>
 /** @param {'legacy' | 'modern'} type */
 const babelPlugin = (type) =>
   babel({
-    configFile: resolve(rootDir, 'babel.config.js'),
+    configFile: resolve(rootDir, 'babel.config.cjs'),
     browserslistConfigFile: type === 'modern' ? true : false,
     targets:
       type === 'modern'
diff --git a/scripts/types.d.ts b/scripts/types.d.ts
@@ -39,7 +39,7 @@ export type Parsed = {
 export type Package = {
   name: string
   packageDir: string
-  entries: Array<'main' | 'module' | 'types'>
+  entries: Array<'main' | 'module' | 'svelte' | 'types'>
 }
 
 export type BranchConfig = {
