diff --git a/babel.config.cjs b/babel.config.cjs index 26141cec6f..85c9a6c2bf 100644 --- a/babel.config.cjs +++ b/babel.config.cjs @@ -34,16 +34,15 @@ module.exports = { ].filter(Boolean), overrides: [ { - exclude: [ - './packages/solid-query/**', - './packages/query-devtools/**', - './packages/svelte-query/**', - './packages/vue-query/**', + include: [ + './packages/react-query/**', + './packages/react-query-devtools/**', + './packages/react-query-persist-client/**', ], presets: ['@babel/react'], }, { - include: ['./packages/solid-query/**', './packages/query-devtools/**'], + include: ['./packages/query-devtools/**', './packages/solid-query/**'], presets: ['babel-preset-solid'], }, ], diff --git a/nx.json b/nx.json index 669df58257..0f11e04ef1 100644 --- a/nx.json +++ b/nx.json @@ -33,7 +33,7 @@ "{workspaceRoot}/.browserslistrc", "{workspaceRoot}/babel.config.cjs", "{workspaceRoot}/package.json", - "{workspaceRoot}/scripts/getRollupConfig.mjs", + "{workspaceRoot}/scripts/getRollupConfig.js", "{workspaceRoot}/tsconfig.json" ], "globalNonBuildAffectingConfig": ["{workspaceRoot}/.eslintrc.cjs"], diff --git a/package.json b/package.json index 48584e3e4f..c258f192da 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,10 @@ "build": "nx run-many --target=build --projects=root", "watch": "concurrently --kill-others \"pnpm -r build:rollup -w\" \"pnpm -r build:types --watch\"", "dev": "pnpm run watch", - "prettier": "prettier --plugin-search-dir . \"{packages,examples,scripts}/**/*.{md,js,jsx,cjs,mjs,ts,tsx,json,vue,svelte}\"", + "prettier": "prettier --plugin-search-dir . \"{packages,examples,scripts}/**/*.{md,js,jsx,cjs,ts,tsx,json,vue,svelte}\"", "prettier:write": "pnpm run prettier --write", - "cipublish": "node scripts/publish.mjs", - "validatePackages": "node scripts/validate-packages.mjs" + "cipublish": "node scripts/publish.js", + "validatePackages": "node scripts/validatePackages.js" }, "nx": { "includedScripts": [ @@ -84,7 +84,6 @@ "rollup-plugin-node-externals": "^6.1.0", "rollup-plugin-preserve-directives": "^0.2.0", "rollup-plugin-visualizer": "^5.9.0", - "rollup-preset-solid": "^2.0.1", "semver": "^7.5.1", "solid-js": "^1.6.13", "stream-to-array": "^2.3.0", diff --git a/packages/codemods/tsconfig.json b/packages/codemods/tsconfig.json index 51ae19fce8..c8d996a92c 100644 --- a/packages/codemods/tsconfig.json +++ b/packages/codemods/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", - "rootDir": "./src" + "outDir": "./build/lib" }, "include": ["src"] } diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index 45950346d2..c4f4cebc0a 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -10,12 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", - "main": "build/lib/index.js", + "type": "module", + "types": "build/lib/index.d.ts", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { - "require": "./build/lib/index.js", - "default": "./build/lib/index.js" + "types": "./build/lib/index.d.ts", + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -26,7 +30,7 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "build": "tsup --minify" + "build": "tsup --minify --dts" }, "files": [ "build" @@ -38,6 +42,10 @@ "external": [ "eslint" ], + "format": [ + "cjs", + "esm" + ], "clean": true, "bundle": true, "outDir": "build/lib" diff --git a/packages/eslint-plugin-query/tsconfig.json b/packages/eslint-plugin-query/tsconfig.json index bd42af09e7..1777264462 100644 --- a/packages/eslint-plugin-query/tsconfig.json +++ b/packages/eslint-plugin-query/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json index fd5f05e1a2..ecdf080a60 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -10,15 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -34,7 +35,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly" }, "dependencies": { diff --git a/packages/query-async-storage-persister/rollup.config.mjs b/packages/query-async-storage-persister/rollup.config.js similarity index 66% rename from packages/query-async-storage-persister/rollup.config.mjs rename to packages/query-async-storage-persister/rollup.config.js index 4521373031..24461ef8e4 100644 --- a/packages/query-async-storage-persister/rollup.config.mjs +++ b/packages/query-async-storage-persister/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'query-async-storage-persister', - jsName: 'QueryAsyncStoragePersister', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/query-async-storage-persister/tsconfig.eslint.json b/packages/query-async-storage-persister/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/query-async-storage-persister/tsconfig.eslint.json +++ b/packages/query-async-storage-persister/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/query-async-storage-persister/tsconfig.json b/packages/query-async-storage-persister/tsconfig.json index bd42af09e7..1777264462 100644 --- a/packages/query-async-storage-persister/tsconfig.json +++ b/packages/query-async-storage-persister/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json index f9234859d1..aad3b64dfa 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -10,15 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -32,7 +33,7 @@ "test:eslint": "eslint --ext .ts,.tsx ./src", "test:types": "tsc --noEmit", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly" }, "dependencies": { diff --git a/packages/query-broadcast-client-experimental/rollup.config.mjs b/packages/query-broadcast-client-experimental/rollup.config.js similarity index 67% rename from packages/query-broadcast-client-experimental/rollup.config.mjs rename to packages/query-broadcast-client-experimental/rollup.config.js index 0383ce1e44..e84e03845a 100644 --- a/packages/query-broadcast-client-experimental/rollup.config.mjs +++ b/packages/query-broadcast-client-experimental/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'query-broadcast-client-experimental', - jsName: 'QueryBroadcastClient', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/query-broadcast-client-experimental/tsconfig.eslint.json b/packages/query-broadcast-client-experimental/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/query-broadcast-client-experimental/tsconfig.eslint.json +++ b/packages/query-broadcast-client-experimental/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/query-broadcast-client-experimental/tsconfig.json b/packages/query-broadcast-client-experimental/tsconfig.json index 51ae19fce8..c8d996a92c 100644 --- a/packages/query-broadcast-client-experimental/tsconfig.json +++ b/packages/query-broadcast-client-experimental/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./build/lib", - "rootDir": "./src" + "outDir": "./build/lib" }, "include": ["src"] } diff --git a/packages/query-core/package.json b/packages/query-core/package.json index 9fbe38e69d..c4aee0d3b7 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -10,15 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -34,7 +35,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly" } } diff --git a/packages/query-core/rollup.config.mjs b/packages/query-core/rollup.config.js similarity index 67% rename from packages/query-core/rollup.config.mjs rename to packages/query-core/rollup.config.js index 12a2a5a1ff..ad1bb1839a 100644 --- a/packages/query-core/rollup.config.mjs +++ b/packages/query-core/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'query-core', - jsName: 'QueryCore', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/query-core/tsconfig.eslint.json b/packages/query-core/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/query-core/tsconfig.eslint.json +++ b/packages/query-core/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/query-core/tsconfig.json b/packages/query-core/tsconfig.json index bd42af09e7..1777264462 100644 --- a/packages/query-core/tsconfig.json +++ b/packages/query-core/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index c8826a6b88..893c7fa692 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -10,16 +10,17 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/types/index.d.ts", - "main": "build/cjs/index.js", - "module": "build/esm/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/types/index.d.ts", - "import": "./build/esm/index.mjs", - "require": "./build/cjs/index.js", - "default": "./build/cjs/index.js" + "solid": "./build/source/index.jsx", + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -30,7 +31,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc" }, "files": [ diff --git a/packages/query-devtools/rollup.config.js b/packages/query-devtools/rollup.config.js new file mode 100644 index 0000000000..c8c12a90e6 --- /dev/null +++ b/packages/query-devtools/rollup.config.js @@ -0,0 +1,14 @@ +// @ts-check + +import { defineConfig } from 'rollup' +import { buildConfigs } from '../../scripts/getRollupConfig.js' + +export default defineConfig( + buildConfigs({ + name: 'query-devtools', + outputFile: 'index', + entryFile: './src/index.tsx', + forceBundle: true, + bundleDeps: true, + }), +) diff --git a/packages/query-devtools/rollup.config.mjs b/packages/query-devtools/rollup.config.mjs deleted file mode 100644 index facc4e6802..0000000000 --- a/packages/query-devtools/rollup.config.mjs +++ /dev/null @@ -1,6 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { createTanstackQueryDevtoolsConfig } from '../../scripts/getRollupConfig.mjs' - -export default defineConfig(createTanstackQueryDevtoolsConfig()) diff --git a/packages/query-devtools/tsconfig.eslint.json b/packages/query-devtools/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/query-devtools/tsconfig.eslint.json +++ b/packages/query-devtools/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/query-devtools/tsconfig.json b/packages/query-devtools/tsconfig.json index 0647f54fa1..d8a3287d07 100644 --- a/packages/query-devtools/tsconfig.json +++ b/packages/query-devtools/tsconfig.json @@ -5,7 +5,6 @@ "jsx": "preserve", "jsxImportSource": "solid-js", "outDir": "./build/source", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json index 92792562a2..5c8a71f057 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -10,15 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -34,7 +35,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly" }, "dependencies": { diff --git a/packages/query-persist-client-core/rollup.config.mjs b/packages/query-persist-client-core/rollup.config.js similarity index 66% rename from packages/query-persist-client-core/rollup.config.mjs rename to packages/query-persist-client-core/rollup.config.js index 2a7fdabaf5..327a727cca 100644 --- a/packages/query-persist-client-core/rollup.config.mjs +++ b/packages/query-persist-client-core/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'query-persist-client-core', - jsName: 'QueryPersistClientCore', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/query-persist-client-core/tsconfig.eslint.json b/packages/query-persist-client-core/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/query-persist-client-core/tsconfig.eslint.json +++ b/packages/query-persist-client-core/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/query-persist-client-core/tsconfig.json b/packages/query-persist-client-core/tsconfig.json index bd42af09e7..1777264462 100644 --- a/packages/query-persist-client-core/tsconfig.json +++ b/packages/query-persist-client-core/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json index 2b6bc8e672..2e49561083 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -10,15 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -34,7 +35,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly" }, "dependencies": { diff --git a/packages/query-sync-storage-persister/rollup.config.mjs b/packages/query-sync-storage-persister/rollup.config.js similarity index 66% rename from packages/query-sync-storage-persister/rollup.config.mjs rename to packages/query-sync-storage-persister/rollup.config.js index 620b7c3db3..25e69335f4 100644 --- a/packages/query-sync-storage-persister/rollup.config.mjs +++ b/packages/query-sync-storage-persister/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'query-sync-storage-persister', - jsName: 'QuerySyncStoragePersister', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/query-sync-storage-persister/tsconfig.eslint.json b/packages/query-sync-storage-persister/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/query-sync-storage-persister/tsconfig.eslint.json +++ b/packages/query-sync-storage-persister/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/query-sync-storage-persister/tsconfig.json b/packages/query-sync-storage-persister/tsconfig.json index bd42af09e7..1777264462 100644 --- a/packages/query-sync-storage-persister/tsconfig.json +++ b/packages/query-sync-storage-persister/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index e12e7331be..5414f27603 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -10,25 +10,22 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./production": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.prod.mjs", - "default": "./build/lib/index.prod.js" - }, - "./build/lib/index.prod.js": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.prod.mjs", - "default": "./build/lib/index.prod.js" + "import": "./build/lib/index.prod.js", + "require": "./build/lib/index.prod.cjs", + "default": "./build/lib/index.prod.cjs" }, "./package.json": "./package.json" }, @@ -44,7 +41,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly && cpy index.d.ts index.prod.d.ts --cwd=build/lib" }, "dependencies": { diff --git a/packages/react-query-devtools/rollup.config.mjs b/packages/react-query-devtools/rollup.config.js similarity index 73% rename from packages/react-query-devtools/rollup.config.mjs rename to packages/react-query-devtools/rollup.config.js index 8e95c44705..094aa3d0f9 100644 --- a/packages/react-query-devtools/rollup.config.mjs +++ b/packages/react-query-devtools/rollup.config.js @@ -1,18 +1,16 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig([ buildConfigs({ name: 'react-query-devtools', - jsName: 'ReactQueryDevtools', outputFile: 'index', entryFile: './src/index.ts', }), buildConfigs({ name: 'react-query-devtools-prod', - jsName: 'ReactQueryDevtools', outputFile: 'index.prod', entryFile: './src/index.ts', forceDevEnv: true, diff --git a/packages/react-query-devtools/tsconfig.eslint.json b/packages/react-query-devtools/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/react-query-devtools/tsconfig.eslint.json +++ b/packages/react-query-devtools/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/react-query-devtools/tsconfig.json b/packages/react-query-devtools/tsconfig.json index 6d40a82a85..355947674b 100644 --- a/packages/react-query-devtools/tsconfig.json +++ b/packages/react-query-devtools/tsconfig.json @@ -3,7 +3,6 @@ "compilerOptions": { "jsx": "react", "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index 6c45661d8d..d6ecb2f12b 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -10,15 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -34,7 +35,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly" }, "dependencies": { diff --git a/packages/react-query-persist-client/rollup.config.mjs b/packages/react-query-persist-client/rollup.config.js similarity index 66% rename from packages/react-query-persist-client/rollup.config.mjs rename to packages/react-query-persist-client/rollup.config.js index 9bbf5696e2..cce90b9211 100644 --- a/packages/react-query-persist-client/rollup.config.mjs +++ b/packages/react-query-persist-client/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'react-query-persist-client', - jsName: 'ReactQueryPersistClient', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/react-query-persist-client/tsconfig.eslint.json b/packages/react-query-persist-client/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/react-query-persist-client/tsconfig.eslint.json +++ b/packages/react-query-persist-client/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/react-query-persist-client/tsconfig.json b/packages/react-query-persist-client/tsconfig.json index 6d40a82a85..355947674b 100644 --- a/packages/react-query-persist-client/tsconfig.json +++ b/packages/react-query-persist-client/tsconfig.json @@ -3,7 +3,6 @@ "compilerOptions": { "jsx": "react", "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 31a2cf69e1..82e893f9e5 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -10,15 +10,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -30,7 +31,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:codemods && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:codemods": "cpy ../codemods/src/**/* ./build/codemods", "build:types": "tsc --emitDeclarationOnly" }, diff --git a/packages/react-query/rollup.config.mjs b/packages/react-query/rollup.config.js similarity index 67% rename from packages/react-query/rollup.config.mjs rename to packages/react-query/rollup.config.js index 0a6b7d623b..817ee15c00 100644 --- a/packages/react-query/rollup.config.mjs +++ b/packages/react-query/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'react-query', - jsName: 'ReactQuery', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/react-query/tsconfig.eslint.json b/packages/react-query/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/react-query/tsconfig.eslint.json +++ b/packages/react-query/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/react-query/tsconfig.json b/packages/react-query/tsconfig.json index 6d40a82a85..355947674b 100644 --- a/packages/react-query/tsconfig.json +++ b/packages/react-query/tsconfig.json @@ -3,7 +3,6 @@ "compilerOptions": { "jsx": "react", "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index ddaf66e178..670eaa78c4 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -10,22 +10,22 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/types/index.d.ts", - "main": "build/cjs/index.js", - "module": "build/esm/index.js", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/types/index.d.ts", "solid": "./build/source/index.js", - "import": "./build/esm/index.js", + "import": "./build/lib/index.js", "browser": { - "import": "./build/esm/index.js", - "require": "./build/cjs/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs" }, - "require": "./build/cjs/index.js", - "node": "./build/cjs/index.js", - "default": "./build/cjs/index.js" + "require": "./build/lib/index.cjs", + "node": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -39,7 +39,7 @@ "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc" }, "files": [ diff --git a/packages/solid-query/rollup.config.js b/packages/solid-query/rollup.config.js new file mode 100644 index 0000000000..cffa084c69 --- /dev/null +++ b/packages/solid-query/rollup.config.js @@ -0,0 +1,12 @@ +// @ts-check + +import { defineConfig } from 'rollup' +import { buildConfigs } from '../../scripts/getRollupConfig.js' + +export default defineConfig( + buildConfigs({ + name: 'solid-query', + outputFile: 'index', + entryFile: './src/index.ts', + }), +) diff --git a/packages/solid-query/rollup.config.mjs b/packages/solid-query/rollup.config.mjs deleted file mode 100644 index a2ea35366e..0000000000 --- a/packages/solid-query/rollup.config.mjs +++ /dev/null @@ -1,6 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { createSolidQueryConfig } from '../../scripts/getRollupConfig.mjs' - -export default defineConfig(createSolidQueryConfig()) diff --git a/packages/solid-query/tsconfig.eslint.json b/packages/solid-query/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/solid-query/tsconfig.eslint.json +++ b/packages/solid-query/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/solid-query/tsconfig.json b/packages/solid-query/tsconfig.json index 0f95676e15..d8a3287d07 100644 --- a/packages/solid-query/tsconfig.json +++ b/packages/solid-query/tsconfig.json @@ -5,8 +5,7 @@ "jsx": "preserve", "jsxImportSource": "solid-js", "outDir": "./build/source", - "rootDir": "./src", "types": ["vitest/globals"] }, - "include": ["src", "createInfiniteQuery.test.tsx", "suspense.test.tsx"] + "include": ["src"] } diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index 9d016c7de3..0ad56e140d 100644 --- a/packages/svelte-query-devtools/package.json +++ b/packages/svelte-query-devtools/package.json @@ -17,8 +17,8 @@ "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", "svelte": "./build/lib/index.js", + "import": "./build/lib/index.js", "default": "./build/lib/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query-devtools/tsconfig.json b/packages/svelte-query-devtools/tsconfig.json index 93a8d08ed7..8e1f095104 100644 --- a/packages/svelte-query-devtools/tsconfig.json +++ b/packages/svelte-query-devtools/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "isolatedModules": true, "noEmit": true }, "include": [ diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index a40871be73..2831f873e6 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -17,8 +17,8 @@ "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", "svelte": "./build/lib/index.js", + "import": "./build/lib/index.js", "default": "./build/lib/index.js" }, "./package.json": "./package.json" diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json index e11a19e4d4..e5f7d215b9 100644 --- a/packages/svelte-query/tsconfig.json +++ b/packages/svelte-query/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "isolatedModules": true, "noEmit": true, "types": ["vitest/globals", "@testing-library/jest-dom"] }, diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index ce4bab4cab..ec2b78a5d5 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -14,15 +14,16 @@ "type": "github", "url": "https://github.com/sponsors/tannerlinsley" }, - "type": "commonjs", + "type": "module", "types": "build/lib/index.d.ts", - "main": "build/lib/index.js", - "module": "build/lib/index.mjs", + "main": "build/lib/index.cjs", + "module": "build/lib/index.js", "exports": { ".": { "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.mjs", - "default": "./build/lib/index.js" + "import": "./build/lib/index.js", + "require": "./build/lib/index.cjs", + "default": "./build/lib/index.cjs" }, "./package.json": "./package.json" }, @@ -37,7 +38,7 @@ "test:3": "vue-demi-switch 3 && vitest", "test:lib:dev": "pnpm run test:lib --watch", "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.mjs", + "build:rollup": "rollup --config rollup.config.js", "build:types": "tsc --emitDeclarationOnly" }, "files": [ diff --git a/packages/vue-query/rollup.config.mjs b/packages/vue-query/rollup.config.js similarity index 67% rename from packages/vue-query/rollup.config.mjs rename to packages/vue-query/rollup.config.js index 234a1218c7..b1d16f9995 100644 --- a/packages/vue-query/rollup.config.mjs +++ b/packages/vue-query/rollup.config.js @@ -1,12 +1,11 @@ // @ts-check import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.mjs' +import { buildConfigs } from '../../scripts/getRollupConfig.js' export default defineConfig( buildConfigs({ name: 'vue-query', - jsName: 'VueQuery', outputFile: 'index', entryFile: './src/index.ts', }), diff --git a/packages/vue-query/tsconfig.eslint.json b/packages/vue-query/tsconfig.eslint.json index a97dcbe5c8..b15f4d23ab 100644 --- a/packages/vue-query/tsconfig.eslint.json +++ b/packages/vue-query/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] } diff --git a/packages/vue-query/tsconfig.json b/packages/vue-query/tsconfig.json index bd42af09e7..1777264462 100644 --- a/packages/vue-query/tsconfig.json +++ b/packages/vue-query/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./build/lib", - "rootDir": "./src", "types": ["vitest/globals"] }, "include": ["src"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a52857ec8f..963090449b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -168,9 +168,6 @@ importers: rollup-plugin-visualizer: specifier: ^5.9.0 version: 5.9.0(rollup@3.23.0) - rollup-preset-solid: - specifier: ^2.0.1 - version: 2.0.1 semver: specifier: ^7.5.1 version: 7.5.1 @@ -3247,15 +3244,6 @@ packages: requiresBuild: true optional: true - /@esbuild/android-arm@0.15.18: - resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm@0.17.14: resolution: {integrity: sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==} engines: {node: '>=12'} @@ -3336,15 +3324,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-loong64@0.15.18: - resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64@0.17.14: resolution: {integrity: sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==} engines: {node: '>=12'} @@ -5013,19 +4992,6 @@ packages: rollup: 3.23.0 dev: true - /@rollup/plugin-terser@0.1.0(rollup@3.23.0): - resolution: {integrity: sha512-N2KK+qUfHX2hBzVzM41UWGLrEmcjVC37spC8R3c9mt3oEDFKh3N2e12/lLp9aVSt86veR0TQiCNQXrm8C6aiUQ==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.x || ^3.x - peerDependenciesMeta: - rollup: - optional: true - dependencies: - rollup: 3.23.0 - terser: 5.17.6 - dev: true - /@rollup/pluginutils@3.1.0(rollup@2.79.1): resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} @@ -7190,10 +7156,6 @@ packages: resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} dev: false - /colorette@2.0.20: - resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} - dev: true - /colors@1.4.0: resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} engines: {node: '>=0.1.90'} @@ -8033,15 +7995,6 @@ packages: requiresBuild: true optional: true - /esbuild-android-64@0.15.18: - resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - /esbuild-android-arm64@0.14.54: resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==} engines: {node: '>=12'} @@ -8050,15 +8003,6 @@ packages: requiresBuild: true optional: true - /esbuild-android-arm64@0.15.18: - resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /esbuild-darwin-64@0.14.54: resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==} engines: {node: '>=12'} @@ -8067,15 +8011,6 @@ packages: requiresBuild: true optional: true - /esbuild-darwin-64@0.15.18: - resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /esbuild-darwin-arm64@0.14.54: resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==} engines: {node: '>=12'} @@ -8084,15 +8019,6 @@ packages: requiresBuild: true optional: true - /esbuild-darwin-arm64@0.15.18: - resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /esbuild-freebsd-64@0.14.54: resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==} engines: {node: '>=12'} @@ -8101,15 +8027,6 @@ packages: requiresBuild: true optional: true - /esbuild-freebsd-64@0.15.18: - resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /esbuild-freebsd-arm64@0.14.54: resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==} engines: {node: '>=12'} @@ -8118,15 +8035,6 @@ packages: requiresBuild: true optional: true - /esbuild-freebsd-arm64@0.15.18: - resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-32@0.14.54: resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==} engines: {node: '>=12'} @@ -8135,15 +8043,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-32@0.15.18: - resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-64@0.14.54: resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==} engines: {node: '>=12'} @@ -8152,15 +8051,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-64@0.15.18: - resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-arm64@0.14.54: resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==} engines: {node: '>=12'} @@ -8169,15 +8059,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-arm64@0.15.18: - resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-arm@0.14.54: resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==} engines: {node: '>=12'} @@ -8186,15 +8067,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-arm@0.15.18: - resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-mips64le@0.14.54: resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==} engines: {node: '>=12'} @@ -8203,15 +8075,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-mips64le@0.15.18: - resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-ppc64le@0.14.54: resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==} engines: {node: '>=12'} @@ -8220,15 +8083,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-ppc64le@0.15.18: - resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-riscv64@0.14.54: resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==} engines: {node: '>=12'} @@ -8237,15 +8091,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-riscv64@0.15.18: - resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-s390x@0.14.54: resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==} engines: {node: '>=12'} @@ -8254,15 +8099,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-s390x@0.15.18: - resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-netbsd-64@0.14.54: resolution: {integrity: sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==} engines: {node: '>=12'} @@ -8271,15 +8107,6 @@ packages: requiresBuild: true optional: true - /esbuild-netbsd-64@0.15.18: - resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - /esbuild-openbsd-64@0.14.54: resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==} engines: {node: '>=12'} @@ -8288,15 +8115,6 @@ packages: requiresBuild: true optional: true - /esbuild-openbsd-64@0.15.18: - resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - /esbuild-plugin-solid@0.4.2(esbuild@0.14.54)(solid-js@1.6.16): resolution: {integrity: sha512-T5GphLoud3RumjeNYO3K9WVjWDzVKG5evlS7hUEUI0n9tiCL+CnbvJh3SSwFi3xeeXpZRrnZc1gd6FWQsVobTg==} peerDependencies: @@ -8319,15 +8137,6 @@ packages: requiresBuild: true optional: true - /esbuild-sunos-64@0.15.18: - resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-32@0.14.54: resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==} engines: {node: '>=12'} @@ -8336,15 +8145,6 @@ packages: requiresBuild: true optional: true - /esbuild-windows-32@0.15.18: - resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-64@0.14.54: resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==} engines: {node: '>=12'} @@ -8353,15 +8153,6 @@ packages: requiresBuild: true optional: true - /esbuild-windows-64@0.15.18: - resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-arm64@0.14.54: resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==} engines: {node: '>=12'} @@ -8370,15 +8161,6 @@ packages: requiresBuild: true optional: true - /esbuild-windows-arm64@0.15.18: - resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild@0.14.54: resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==} engines: {node: '>=12'} @@ -8407,36 +8189,6 @@ packages: esbuild-windows-64: 0.14.54 esbuild-windows-arm64: 0.14.54 - /esbuild@0.15.18: - resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.15.18 - '@esbuild/linux-loong64': 0.15.18 - esbuild-android-64: 0.15.18 - esbuild-android-arm64: 0.15.18 - esbuild-darwin-64: 0.15.18 - esbuild-darwin-arm64: 0.15.18 - esbuild-freebsd-64: 0.15.18 - esbuild-freebsd-arm64: 0.15.18 - esbuild-linux-32: 0.15.18 - esbuild-linux-64: 0.15.18 - esbuild-linux-arm: 0.15.18 - esbuild-linux-arm64: 0.15.18 - esbuild-linux-mips64le: 0.15.18 - esbuild-linux-ppc64le: 0.15.18 - esbuild-linux-riscv64: 0.15.18 - esbuild-linux-s390x: 0.15.18 - esbuild-netbsd-64: 0.15.18 - esbuild-openbsd-64: 0.15.18 - esbuild-sunos-64: 0.15.18 - esbuild-windows-32: 0.15.18 - esbuild-windows-64: 0.15.18 - esbuild-windows-arm64: 0.15.18 - dev: true - /esbuild@0.17.14: resolution: {integrity: sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==} engines: {node: '>=12'} @@ -14324,26 +14076,6 @@ packages: source-map: 0.7.4 yargs: 17.7.1 - /rollup-preset-solid@2.0.1: - resolution: {integrity: sha512-CPJn3SqADlIxhAW3jwZuAFRyZcz7HPeUAz4f+6BzulxHnK4v6tgoTbMvk8vEsfsvHwiTmX93KHIKdf79aTdVSA==} - dependencies: - '@babel/core': 7.21.8 - '@babel/preset-env': 7.21.5(@babel/core@7.21.8) - '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) - '@rollup/plugin-babel': 6.0.3(@babel/core@7.21.8)(rollup@3.23.0) - '@rollup/plugin-node-resolve': 15.0.2(rollup@3.23.0) - '@rollup/plugin-terser': 0.1.0(rollup@3.23.0) - babel-preset-solid: 1.6.10(@babel/core@7.21.8) - colorette: 2.0.20 - esbuild: 0.15.18 - merge-anything: 5.1.4 - rollup: 3.23.0 - typescript: 4.9.5 - transitivePeerDependencies: - - '@types/babel__core' - - supports-color - dev: true - /rollup-route-manifest@1.0.0(rollup@3.23.0): resolution: {integrity: sha512-3CmcMmCLAzJDUXiO3z6386/Pt8/k9xTZv8gIHyXI8hYGoAInnYdOsFXiGGzQRMy6TXR1jUZme2qbdwjH2nFMjg==} engines: {node: '>=8'} @@ -15938,12 +15670,6 @@ packages: is-typed-array: 1.1.10 dev: true - /typescript@4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} - engines: {node: '>=4.2.0'} - hasBin: true - dev: true - /typescript@5.0.4: resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} engines: {node: '>=12.20'} diff --git a/project.json b/project.json index 49460ae889..bd1297b411 100644 --- a/project.json +++ b/project.json @@ -20,6 +20,7 @@ "@tanstack/query-async-storage-persister", "@tanstack/query-broadcast-client-experimental", "@tanstack/query-core", + "@tanstack/query-devtools", "@tanstack/query-persist-client-core", "@tanstack/query-sync-storage-persister", "@tanstack/react-query", @@ -28,7 +29,6 @@ "@tanstack/solid-query", "@tanstack/svelte-query", "@tanstack/svelte-query-devtools", - "@tanstack/vue-query", - "@tanstack/query-devtools" + "@tanstack/vue-query" ] } diff --git a/scripts/config.mjs b/scripts/config.js similarity index 98% rename from scripts/config.mjs rename to scripts/config.js index 6c66aaac7c..a2595ec57e 100644 --- a/scripts/config.mjs +++ b/scripts/config.js @@ -9,13 +9,8 @@ import { fileURLToPath } from 'node:url' */ export const packages = [ { - name: '@tanstack/query-core', - packageDir: 'packages/query-core', - entries: ['main', 'module', 'types'], - }, - { - name: '@tanstack/query-persist-client-core', - packageDir: 'packages/query-persist-client-core', + name: '@tanstack/eslint-plugin-query', + packageDir: 'packages/eslint-plugin-query', entries: ['main', 'module', 'types'], }, { @@ -28,6 +23,21 @@ export const packages = [ packageDir: 'packages/query-broadcast-client-experimental', entries: ['main', 'module', 'types'], }, + { + name: '@tanstack/query-core', + packageDir: 'packages/query-core', + entries: ['main', 'module', 'types'], + }, + { + name: '@tanstack/query-devtools', + packageDir: 'packages/query-devtools', + entries: ['main', 'module', 'types'], + }, + { + name: '@tanstack/query-persist-client-core', + packageDir: 'packages/query-persist-client-core', + entries: ['main', 'module', 'types'], + }, { name: '@tanstack/query-sync-storage-persister', packageDir: 'packages/query-sync-storage-persister', @@ -38,11 +48,6 @@ export const packages = [ packageDir: 'packages/react-query', entries: ['main', 'module', 'types'], }, - { - name: '@tanstack/query-devtools', - packageDir: 'packages/query-devtools', - entries: ['main', 'module', 'types'], - }, { name: '@tanstack/react-query-devtools', packageDir: 'packages/react-query-devtools', @@ -73,11 +78,6 @@ export const packages = [ packageDir: 'packages/vue-query', entries: ['main', 'module', 'types'], }, - { - name: '@tanstack/eslint-plugin-query', - packageDir: 'packages/eslint-plugin-query', - entries: ['main'], - }, ] export const latestBranch = 'main' diff --git a/scripts/getRollupConfig.mjs b/scripts/getRollupConfig.js similarity index 53% rename from scripts/getRollupConfig.mjs rename to scripts/getRollupConfig.js index c78cd812c0..b5d195f6e6 100644 --- a/scripts/getRollupConfig.mjs +++ b/scripts/getRollupConfig.js @@ -7,9 +7,8 @@ import replace from '@rollup/plugin-replace' import { nodeResolve } from '@rollup/plugin-node-resolve' import commonJS from '@rollup/plugin-commonjs' import externals from 'rollup-plugin-node-externals' -import withSolid from 'rollup-preset-solid' import preserveDirectives from 'rollup-plugin-preserve-directives' -import { rootDir } from './config.mjs' +import { rootDir } from './config.js' /** @param {'development' | 'production'} type */ const forceEnvPlugin = (type) => @@ -31,9 +30,9 @@ const babelPlugin = () => /** * @param {Object} opts - Options for building configurations. * @param {string} opts.name - The name. - * @param {string} opts.jsName - The JavaScript name. * @param {string} opts.outputFile - The output file. * @param {string} opts.entryFile - The entry file. + * @param {boolean} [opts.bundleDeps] - Flag indicating whether to make all deps external. * @param {boolean} [opts.forceDevEnv] - Flag indicating whether to force development environment. * @param {boolean} [opts.forceBundle] - Flag indicating whether to force bundling. * @returns {import('rollup').RollupOptions} @@ -42,17 +41,18 @@ export function buildConfigs(opts) { const input = [opts.entryFile] const forceDevEnv = opts.forceDevEnv || false const forceBundle = opts.forceBundle || false + const bundleDeps = opts.bundleDeps || false /** @type {import('rollup').OutputOptions[]} */ const bundleOutput = [ { format: 'esm', - file: `./build/lib/${opts.outputFile}.mjs`, + file: `./build/lib/${opts.outputFile}.js`, sourcemap: true, }, { format: 'cjs', - file: `./build/lib/${opts.outputFile}.js`, + file: `./build/lib/${opts.outputFile}.cjs`, sourcemap: true, exports: 'named', }, @@ -65,7 +65,7 @@ export function buildConfigs(opts) { dir: `./build/lib`, sourcemap: true, preserveModules: true, - entryFileNames: '[name].mjs', + entryFileNames: '[name].js', }, { format: 'cjs', @@ -73,7 +73,7 @@ export function buildConfigs(opts) { sourcemap: true, exports: 'named', preserveModules: true, - entryFileNames: '[name].js', + entryFileNames: '[name].cjs', }, ] @@ -85,12 +85,14 @@ export function buildConfigs(opts) { babelPlugin(), nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }), forceDevEnv ? forceEnvPlugin('development') : undefined, - externals({ - packagePath: './package.json', - deps: true, - devDeps: true, - peerDeps: true, - }), + bundleDeps + ? undefined + : externals({ + packagePath: './package.json', + deps: true, + devDeps: true, + peerDeps: true, + }), preserveDirectives(), visualizer({ filename: `./build/stats-html.html`, @@ -105,72 +107,3 @@ export function buildConfigs(opts) { ], } } - -export function createSolidQueryConfig() { - const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ ( - withSolid({ - input: `./src/index.ts`, - targets: ['esm', 'cjs'], - external: ['@tanstack/query-core'], - }) - ) - - const outputs = !solidRollupOptions.output - ? [] - : Array.isArray(solidRollupOptions.output) - ? solidRollupOptions.output - : [solidRollupOptions.output] - - outputs.forEach((output) => { - const format = output.format - output.dir = `./build/${format}` - }) - - const plugins = /** @type {import('rollup').Plugin[]} */ ( - solidRollupOptions.plugins - ) - // Prevent types generation since it doesn't resolve the directory correctly - // Instead build:types will generate those types anyway - const filtered = plugins.filter((plugin) => plugin.name !== 'ts') - - solidRollupOptions.plugins = filtered - - return solidRollupOptions -} - -export function createTanstackQueryDevtoolsConfig() { - const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ ( - withSolid({ - input: `./src/index.tsx`, - targets: ['esm', 'cjs'], - }) - ) - - const outputs = !solidRollupOptions.output - ? [] - : Array.isArray(solidRollupOptions.output) - ? solidRollupOptions.output - : [solidRollupOptions.output] - - outputs.forEach((output) => { - const format = output.format - output.dir = `./build/${format}` - if (output.format === 'esm') { - output.dir = undefined - output.file = `./build/${format}/index.mjs` - } - }) - - solidRollupOptions.external = [] - - const plugins = /** @type {import('rollup').Plugin[]} */ ( - solidRollupOptions.plugins - ) - // Prevent types generation since it doesn't resolve the directory correctly - // Instead build:types will generate those types anyway - const filtered = plugins.filter((plugin) => plugin.name !== 'ts') - - solidRollupOptions.plugins = filtered - - return solidRollupOptions -} diff --git a/scripts/publish.mjs b/scripts/publish.js similarity index 98% rename from scripts/publish.mjs rename to scripts/publish.js index 34de3f5e00..5186ad1cbc 100644 --- a/scripts/publish.mjs +++ b/scripts/publish.js @@ -12,7 +12,7 @@ import log from 'git-log-parser' import streamToArray from 'stream-to-array' import axios from 'axios' import { DateTime } from 'luxon' -import { branchConfigs, latestBranch, packages, rootDir } from './config.mjs' +import { branchConfigs, latestBranch, packages, rootDir } from './config.js' /** @param {string} version */ const releaseCommitMsg = (version) => `release: v${version}` @@ -22,7 +22,7 @@ async function run() { process.env.BRANCH ?? currentGitBranch() ) - /** @type {import('./types').BranchConfig | undefined} */ + /** @type {import('./types.js').BranchConfig | undefined} */ const branchConfig = branchConfigs[branchName] if (!branchConfig) { @@ -91,7 +91,7 @@ async function run() { /** * Get the commits since the latest tag - * @type {import('./types').Commit[]} + * @type {import('./types.js').Commit[]} */ const commitsSinceLatestTag = ( await new Promise((resolve, reject) => { @@ -111,7 +111,7 @@ async function run() { ).then((res) => resolve(res.filter(Boolean))) }) }) - ).filter((/** @type {import('./types').Commit} */ commit) => { + ).filter((/** @type {import('./types.js').Commit} */ commit) => { const exclude = [ commit.subject.startsWith('Merge branch '), // No merge commits commit.subject.startsWith(releaseCommitMsg('')), // No example update commits @@ -236,7 +236,7 @@ async function run() { ...acc, [type]: [...(acc[type] || []), next], } - }, /** @type {Record} */ ({})), + }, /** @type {Record} */ ({})), ) .sort( getSorterFn([ diff --git a/scripts/validate-packages.mjs b/scripts/validatePackages.js similarity index 92% rename from scripts/validate-packages.mjs rename to scripts/validatePackages.js index 672276640a..529d734fb9 100644 --- a/scripts/validate-packages.mjs +++ b/scripts/validatePackages.js @@ -4,7 +4,7 @@ import path from 'node:path' import fsp from 'node:fs/promises' import jsonfile from 'jsonfile' import { publint } from 'publint' -import { packages, rootDir } from './config.mjs' +import { packages, rootDir } from './config.js' async function run() { console.info('Validating packages...') @@ -58,7 +58,9 @@ async function run() { const publintResult = await publint({ pkgDir: pkg.packageDir }) publintResult.forEach((message) => { - console.log(`Publint warning: ${JSON.stringify(message, null, 2)}`) + failedValidations.push( + `Publint warning: ${JSON.stringify(message, null, 2)}`, + ) }) }), ) diff --git a/tsconfig.json b/tsconfig.json index b7f6b0dc2c..449ccd1fc3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,6 +11,7 @@ "declarationMap": true, "esModuleInterop": true, "forceConsistentCasingInFileNames": true, + "isolatedModules": true, "lib": ["DOM", "DOM.Iterable", "ES2020"], "module": "ES2020", "moduleResolution": "node", @@ -26,5 +27,5 @@ "strictNullChecks": true, "target": "ES2020" }, - "include": [".eslintrc.cjs", "rollup.config.mjs", "scripts"] + "include": [".eslintrc.cjs", "rollup.config.js", "scripts"] }