From b3d7d55c5369e19c44ec9c54c799353b4ebaa986 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Thu, 20 Jul 2023 08:37:43 +1000 Subject: [PATCH] feat: Replace rollup with tsup/esbuild (#5597) Co-authored-by: Dominik Dorfmeister Co-authored-by: Aryan Deora --- .browserslistrc | 7 - babel.config.cjs | 50 -- docs/react/installation.md | 6 +- nx.json | 4 +- package.json | 12 - packages/eslint-plugin-query/package.json | 14 +- packages/eslint-plugin-query/tsup.config.js | 13 +- .../package.json | 26 +- .../rollup.config.js | 12 - .../tsconfig.eslint.json | 2 +- .../tsup.config.js | 9 + .../package.json | 26 +- .../rollup.config.js | 12 - .../tsconfig.eslint.json | 2 +- .../tsup.config.js | 9 + packages/query-core/package.json | 26 +- packages/query-core/rollup.config.js | 12 - packages/query-core/tsconfig.eslint.json | 2 +- packages/query-core/tsup.config.js | 9 + packages/query-devtools/package.json | 38 +- packages/query-devtools/rollup.config.js | 32 - packages/query-devtools/tsup.config.js | 29 + .../query-persist-client-core/package.json | 26 +- .../rollup.config.js | 12 - .../tsconfig.eslint.json | 2 +- .../query-persist-client-core/tsup.config.js | 9 + .../query-sync-storage-persister/package.json | 26 +- .../rollup.config.js | 12 - .../tsconfig.eslint.json | 2 +- .../tsup.config.js | 9 + packages/react-query-devtools/package.json | 38 +- .../react-query-devtools/rollup.config.js | 19 - .../react-query-devtools/src/devtools.tsx | 13 +- packages/react-query-devtools/src/index.ts | 7 - .../react-query-devtools/src/production.ts | 5 + .../react-query-devtools/tsconfig.eslint.json | 2 +- packages/react-query-devtools/tsup.config.js | 9 + .../package.json | 26 +- .../rollup.config.js | 12 - .../tsconfig.eslint.json | 2 +- .../tsup.config.js | 9 + .../react-query-persist-client/package.json | 26 +- .../rollup.config.js | 12 - .../tsconfig.eslint.json | 2 +- .../react-query-persist-client/tsup.config.js | 9 + packages/react-query/package.json | 30 +- packages/react-query/rollup.config.js | 12 - packages/react-query/tsconfig.eslint.json | 2 +- packages/react-query/tsup.config.js | 9 + packages/solid-query/package.json | 38 +- packages/solid-query/rollup.config.js | 30 - packages/solid-query/tsup.config.js | 18 + packages/vue-query/package.json | 26 +- packages/vue-query/rollup.config.js | 12 - packages/vue-query/tsconfig.eslint.json | 2 +- packages/vue-query/tsup.config.js | 9 + pnpm-lock.yaml | 828 ++++++++---------- scripts/getRollupConfig.js | 199 ----- scripts/getTsupConfig.js | 41 + 59 files changed, 786 insertions(+), 1111 deletions(-) delete mode 100644 .browserslistrc delete mode 100644 babel.config.cjs delete mode 100644 packages/query-async-storage-persister/rollup.config.js create mode 100644 packages/query-async-storage-persister/tsup.config.js delete mode 100644 packages/query-broadcast-client-experimental/rollup.config.js create mode 100644 packages/query-broadcast-client-experimental/tsup.config.js delete mode 100644 packages/query-core/rollup.config.js create mode 100644 packages/query-core/tsup.config.js delete mode 100644 packages/query-devtools/rollup.config.js create mode 100644 packages/query-devtools/tsup.config.js delete mode 100644 packages/query-persist-client-core/rollup.config.js create mode 100644 packages/query-persist-client-core/tsup.config.js delete mode 100644 packages/query-sync-storage-persister/rollup.config.js create mode 100644 packages/query-sync-storage-persister/tsup.config.js delete mode 100644 packages/react-query-devtools/rollup.config.js create mode 100644 packages/react-query-devtools/src/production.ts create mode 100644 packages/react-query-devtools/tsup.config.js delete mode 100644 packages/react-query-next-experimental/rollup.config.js create mode 100644 packages/react-query-next-experimental/tsup.config.js delete mode 100644 packages/react-query-persist-client/rollup.config.js create mode 100644 packages/react-query-persist-client/tsup.config.js delete mode 100644 packages/react-query/rollup.config.js create mode 100644 packages/react-query/tsup.config.js delete mode 100644 packages/solid-query/rollup.config.js create mode 100644 packages/solid-query/tsup.config.js delete mode 100644 packages/vue-query/rollup.config.js create mode 100644 packages/vue-query/tsup.config.js delete mode 100644 scripts/getRollupConfig.js create mode 100644 scripts/getTsupConfig.js diff --git a/.browserslistrc b/.browserslistrc deleted file mode 100644 index 980cd0a027..0000000000 --- a/.browserslistrc +++ /dev/null @@ -1,7 +0,0 @@ -# Browsers we support -Chrome >= 84 -Firefox >= 90 -Edge >= 84 -Safari >= 15 -iOS >= 15 -opera >= 70 diff --git a/babel.config.cjs b/babel.config.cjs deleted file mode 100644 index 62a4cbae45..0000000000 --- a/babel.config.cjs +++ /dev/null @@ -1,50 +0,0 @@ -const { NODE_ENV, BABEL_ENV } = process.env -const cjs = NODE_ENV === 'test' || BABEL_ENV === 'commonjs' -const es = BABEL_ENV === 'es' -const loose = true - -module.exports = { - presets: [ - [ - '@babel/preset-env', - { - loose, - bugfixes: true, - modules: false, - exclude: [ - '@babel/plugin-transform-regenerator', - '@babel/plugin-transform-parameters', - ], - }, - ], - '@babel/preset-typescript', - ], - plugins: [ - cjs && ['@babel/transform-modules-commonjs', { loose }], - es && ['babel-plugin-add-import-extension', { extension: 'mjs' }], - // no runtime for umd builds - BABEL_ENV && [ - '@babel/transform-runtime', - { - version: require('./package.json').dependencies[ - '@babel/runtime' - ].replace(/^[^0-9]*/, ''), - }, - ], - ].filter(Boolean), - overrides: [ - { - include: [ - './packages/react-query/**', - './packages/react-query-devtools/**', - './packages/react-query-persist-client/**', - './packages/react-query-next-experimental/**', - ], - presets: ['@babel/react'], - }, - { - include: ['./packages/query-devtools/**', './packages/solid-query/**'], - presets: ['babel-preset-solid'], - }, - ], -} diff --git a/docs/react/installation.md b/docs/react/installation.md index 7a99eba2cc..8978d88bef 100644 --- a/docs/react/installation.md +++ b/docs/react/installation.md @@ -42,12 +42,12 @@ If you're not using a module bundler or package manager, you can also use this l React Query is optimized for modern browsers. It is compatible with the following browsers config ``` -Chrome >= 84 +Chrome >= 91 Firefox >= 90 -Edge >= 84 +Edge >= 91 Safari >= 15 iOS >= 15 -opera >= 70 +opera >= 77 ``` > Depending on your environment, you might need to add polyfills. If you want to support older browsers, you need to transpile the library from `node_modules` yourselves. diff --git a/nx.json b/nx.json index 5ce8784f6a..bd16e97bf2 100644 --- a/nx.json +++ b/nx.json @@ -27,11 +27,9 @@ }, "namedInputs": { "sharedGlobals": [ - "{workspaceRoot}/.browserslistrc", "{workspaceRoot}/.eslintrc.cjs", - "{workspaceRoot}/babel.config.cjs", "{workspaceRoot}/package.json", - "{workspaceRoot}/scripts/getRollupConfig.js", + "{workspaceRoot}/scripts/getTsupConfig.js", "{workspaceRoot}/tsconfig.json" ], "default": [ diff --git a/package.json b/package.json index fad4066e5c..2a1198cf80 100644 --- a/package.json +++ b/package.json @@ -31,15 +31,7 @@ "namespace": "@tanstack", "devDependencies": { "@arethetypeswrong/cli": "^0.6.0", - "@babel/core": "^7.21.8", - "@babel/preset-env": "^7.21.5", - "@babel/preset-react": "^7.18.6", - "@babel/preset-typescript": "^7.21.5", "@commitlint/parse": "^17.6.5", - "@rollup/plugin-babel": "^6.0.3", - "@rollup/plugin-commonjs": "^25.0.2", - "@rollup/plugin-node-resolve": "^15.1.0", - "@rollup/plugin-replace": "^5.0.2", "@solidjs/testing-library": "^0.5.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", @@ -59,7 +51,6 @@ "@typescript-eslint/parser": "^5.54.0", "@vitest/coverage-istanbul": "^0.33.0", "axios": "^1.4.0", - "babel-preset-solid": "^1.6.10", "chalk": "^5.2.0", "concurrently": "^8.0.1", "cpy-cli": "^4.2.0", @@ -84,9 +75,6 @@ "react-dom": "^18.2.0", "rimraf": "^5.0.1", "rollup": "^3.26.0", - "rollup-plugin-node-externals": "^6.1.1", - "rollup-plugin-preserve-directives": "^0.2.0", - "rollup-plugin-visualizer": "^5.9.2", "rollup-preset-solid": "^2.0.1", "semver": "^7.5.1", "solid-js": "^1.6.13", diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json index 0072116b56..ba255bb0e2 100644 --- a/packages/eslint-plugin-query/package.json +++ b/packages/eslint-plugin-query/package.json @@ -11,18 +11,18 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.cjs", - "module": "build/lib/index.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { "import": { - "types": "./build/lib/index.d.ts", - "default": "./build/lib/index.js" + "types": "./build/legacy/index.d.ts", + "default": "./build/legacy/index.js" }, "require": { - "types": "./build/lib/index.d.cts", - "default": "./build/lib/index.cjs" + "types": "./build/legacy/index.d.cts", + "default": "./build/legacy/index.cjs" } }, "./package.json": "./package.json" diff --git a/packages/eslint-plugin-query/tsup.config.js b/packages/eslint-plugin-query/tsup.config.js index ead5133195..52ba8edb9e 100644 --- a/packages/eslint-plugin-query/tsup.config.js +++ b/packages/eslint-plugin-query/tsup.config.js @@ -1,13 +1,8 @@ // @ts-check import { defineConfig } from 'tsup' +import { legacyConfig } from '../../scripts/getTsupConfig.js' -export default defineConfig({ - entry: ['src/index.ts'], - format: ['cjs', 'esm'], - target: ['es2020', 'node16'], - outDir: 'build/lib', - dts: true, - sourcemap: true, - clean: true, -}) +export default defineConfig([ + legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'], bundle: true }), +]) diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json index 5e42e638ff..7c632ba82c 100644 --- a/packages/query-async-storage-persister/package.json +++ b/packages/query-async-storage-persister/package.json @@ -11,21 +11,25 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { @@ -34,10 +38,8 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" }, "dependencies": { "@tanstack/query-persist-client-core": "workspace:*" diff --git a/packages/query-async-storage-persister/rollup.config.js b/packages/query-async-storage-persister/rollup.config.js deleted file mode 100644 index 24461ef8e4..0000000000 --- a/packages/query-async-storage-persister/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'query-async-storage-persister', - 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 b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-async-storage-persister/tsup.config.js b/packages/query-async-storage-persister/tsup.config.js new file mode 100644 index 0000000000..5159fbe0a6 --- /dev/null +++ b/packages/query-async-storage-persister/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts'] }), + legacyConfig({ entry: ['src/*.ts'] }), +]) diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json index 6c1c41be9d..7b0c1829aa 100644 --- a/packages/query-broadcast-client-experimental/package.json +++ b/packages/query-broadcast-client-experimental/package.json @@ -11,31 +11,33 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", "test:types": "tsc --noEmit", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" }, "dependencies": { "@tanstack/query-core": "workspace:*", diff --git a/packages/query-broadcast-client-experimental/rollup.config.js b/packages/query-broadcast-client-experimental/rollup.config.js deleted file mode 100644 index e84e03845a..0000000000 --- a/packages/query-broadcast-client-experimental/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'query-broadcast-client-experimental', - 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 b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-broadcast-client-experimental/tsup.config.js b/packages/query-broadcast-client-experimental/tsup.config.js new file mode 100644 index 0000000000..5159fbe0a6 --- /dev/null +++ b/packages/query-broadcast-client-experimental/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts'] }), + legacyConfig({ entry: ['src/*.ts'] }), +]) diff --git a/packages/query-core/package.json b/packages/query-core/package.json index ab46d94b92..dd82173357 100644 --- a/packages/query-core/package.json +++ b/packages/query-core/package.json @@ -11,21 +11,25 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { @@ -34,9 +38,7 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" } } diff --git a/packages/query-core/rollup.config.js b/packages/query-core/rollup.config.js deleted file mode 100644 index ad1bb1839a..0000000000 --- a/packages/query-core/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'query-core', - outputFile: 'index', - entryFile: './src/index.ts', - }), -) diff --git a/packages/query-core/tsconfig.eslint.json b/packages/query-core/tsconfig.eslint.json index b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-core/tsup.config.js b/packages/query-core/tsup.config.js new file mode 100644 index 0000000000..5159fbe0a6 --- /dev/null +++ b/packages/query-core/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts'] }), + legacyConfig({ entry: ['src/*.ts'] }), +]) diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json index 243805384d..4fec785330 100644 --- a/packages/query-devtools/package.json +++ b/packages/query-devtools/package.json @@ -11,34 +11,39 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "dist/types/index.d.ts", - "main": "dist/cjs/index.cjs", - "module": "dist/esm/index.js", + "main": "./build/index.cjs", + "module": "./build/index.js", + "types": "./build/index.d.ts", + "browser": {}, "exports": { - ".": { - "types": "./dist/types/index.d.ts", - "solid": "./dist/source/index.jsx", - "import": "./dist/esm/index.js", - "browser": { - "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.cjs" + "solid": { + "development": "./build/dev.jsx", + "import": "./build/index.jsx" + }, + "development": { + "import": { + "types": "./build/index.d.ts", + "default": "./build/dev.js" }, - "require": "./dist/cjs/index.cjs", - "node": "./dist/cjs/index.cjs" + "require": "./build/dev.cjs" + }, + "import": { + "types": "./build/index.d.ts", + "default": "./build/index.js" }, - "./package.json": "./package.json" + "require": "./build/index.cjs" }, "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", + "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict", - "build": "rollup --config rollup.config.js" + "build": "tsup" }, "files": [ - "dist", + "build", "src" ], "dependencies": { @@ -53,6 +58,7 @@ }, "devDependencies": { "@tanstack/query-core": "workspace:*", + "tsup-preset-solid": "^0.1.8", "vite-plugin-solid": "^2.5.0" } } diff --git a/packages/query-devtools/rollup.config.js b/packages/query-devtools/rollup.config.js deleted file mode 100644 index 4a14e334b5..0000000000 --- a/packages/query-devtools/rollup.config.js +++ /dev/null @@ -1,32 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import withSolid from 'rollup-preset-solid' - -export function createQueryDevtoolsConfig() { - const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ ( - withSolid({ - input: `./src/index.tsx`, - targets: ['esm', 'cjs'], - }) - ) - - solidRollupOptions.external = [] - - const outputs = !solidRollupOptions.output - ? [] - : Array.isArray(solidRollupOptions.output) - ? solidRollupOptions.output - : [solidRollupOptions.output] - - outputs.forEach((output) => { - if (output.format === 'cjs') { - output.entryFileNames = '[name].cjs' - output.chunkFileNames = '[name]-[hash].cjs' - } - }) - - return solidRollupOptions -} - -export default defineConfig(createQueryDevtoolsConfig()) diff --git a/packages/query-devtools/tsup.config.js b/packages/query-devtools/tsup.config.js new file mode 100644 index 0000000000..933a9fb21a --- /dev/null +++ b/packages/query-devtools/tsup.config.js @@ -0,0 +1,29 @@ +// @ts-check + +import { defineConfig } from 'tsup-preset-solid' + +export default defineConfig( + { + entry: 'src/index.tsx', + devEntry: true, + }, + { + dropConsole: true, + cjs: true, + tsupOptions: (config) => ({ + ...config, + outDir: 'build', + noExternal: [ + 'solid-js', + 'solid-js/web', + '@emotion/css', + '@solid-primitives/keyed', + '@solid-primitives/resize-observer', + '@solid-primitives/storage', + '@tanstack/match-sorter-utils', + 'solid-transition-group', + 'superjson', + ], + }), + }, +) diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json index b985dc9e17..63db15d2e7 100644 --- a/packages/query-persist-client-core/package.json +++ b/packages/query-persist-client-core/package.json @@ -11,21 +11,25 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { @@ -34,10 +38,8 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" }, "dependencies": { "@tanstack/query-core": "workspace:*" diff --git a/packages/query-persist-client-core/rollup.config.js b/packages/query-persist-client-core/rollup.config.js deleted file mode 100644 index 327a727cca..0000000000 --- a/packages/query-persist-client-core/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'query-persist-client-core', - 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 b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-persist-client-core/tsup.config.js b/packages/query-persist-client-core/tsup.config.js new file mode 100644 index 0000000000..5159fbe0a6 --- /dev/null +++ b/packages/query-persist-client-core/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts'] }), + legacyConfig({ entry: ['src/*.ts'] }), +]) diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json index 6b5bd53e83..c2f91866f4 100644 --- a/packages/query-sync-storage-persister/package.json +++ b/packages/query-sync-storage-persister/package.json @@ -11,21 +11,25 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { @@ -34,10 +38,8 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" }, "dependencies": { "@tanstack/query-core": "workspace:*", diff --git a/packages/query-sync-storage-persister/rollup.config.js b/packages/query-sync-storage-persister/rollup.config.js deleted file mode 100644 index 25e69335f4..0000000000 --- a/packages/query-sync-storage-persister/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'query-sync-storage-persister', - 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 b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/query-sync-storage-persister/tsup.config.js b/packages/query-sync-storage-persister/tsup.config.js new file mode 100644 index 0000000000..5159fbe0a6 --- /dev/null +++ b/packages/query-sync-storage-persister/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts'] }), + legacyConfig({ entry: ['src/*.ts'] }), +]) diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json index a451f87621..644827c228 100644 --- a/packages/react-query-devtools/package.json +++ b/packages/react-query-devtools/package.json @@ -11,27 +11,35 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./production": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.prod.js", - "require": "./build/lib/index.prod.cjs", - "default": "./build/lib/index.prod.cjs" + "import": { + "types": "./build/modern/production.d.ts", + "default": "./build/modern/production.js" + }, + "require": { + "types": "./build/modern/production.d.cts", + "default": "./build/modern/production.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { @@ -40,10 +48,8 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly && cpy index.d.ts index.prod.d.ts --cwd=build/lib" + "test:build": "publint --strict && attw --pack --ignore-rules no-resolution", + "build": "tsup" }, "dependencies": { "@tanstack/query-devtools": "workspace:*" diff --git a/packages/react-query-devtools/rollup.config.js b/packages/react-query-devtools/rollup.config.js deleted file mode 100644 index 00b1ac221f..0000000000 --- a/packages/react-query-devtools/rollup.config.js +++ /dev/null @@ -1,19 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig([ - ...buildConfigs({ - name: 'react-query-devtools', - outputFile: 'index', - entryFile: './src/index.ts', - }), - ...buildConfigs({ - name: 'react-query-devtools-prod', - outputFile: 'index.prod', - entryFile: './src/index.ts', - forceDevEnv: true, - forceBundle: true, - }), -]) diff --git a/packages/react-query-devtools/src/devtools.tsx b/packages/react-query-devtools/src/devtools.tsx index 283cab168f..0152595d2a 100644 --- a/packages/react-query-devtools/src/devtools.tsx +++ b/packages/react-query-devtools/src/devtools.tsx @@ -37,7 +37,7 @@ export interface DevtoolsOptions { errorTypes?: DevToolsErrorType[] } -function ReactQueryDevtoolsDev( +export function ReactQueryDevtools( props: DevtoolsOptions, ): React.ReactElement | null { const queryClient = useQueryClient() @@ -93,14 +93,3 @@ function ReactQueryDevtoolsDev( return
} - -function ReactQueryDevtoolsProd( - _props: DevtoolsOptions, -): React.ReactElement | null { - return null -} - -export const ReactQueryDevtools: typeof ReactQueryDevtoolsDev = - process.env.NODE_ENV !== 'development' - ? ReactQueryDevtoolsProd - : ReactQueryDevtoolsDev diff --git a/packages/react-query-devtools/src/index.ts b/packages/react-query-devtools/src/index.ts index 67e998a67a..cdf43cfd0e 100644 --- a/packages/react-query-devtools/src/index.ts +++ b/packages/react-query-devtools/src/index.ts @@ -8,10 +8,3 @@ export const ReactQueryDevtools: (typeof devtools)['ReactQueryDevtools'] = return null } : devtools.ReactQueryDevtools - -// export const ReactQueryDevtoolsPanel: (typeof devtools)['ReactQueryDevtoolsPanel'] = -// process.env.NODE_ENV !== 'development' -// ? (function () { -// return null -// } as any) -// : devtools.ReactQueryDevtoolsPanel diff --git a/packages/react-query-devtools/src/production.ts b/packages/react-query-devtools/src/production.ts new file mode 100644 index 0000000000..1abee7eec5 --- /dev/null +++ b/packages/react-query-devtools/src/production.ts @@ -0,0 +1,5 @@ +'use client' + +import * as devtools from './devtools' + +export const ReactQueryDevtools = devtools.ReactQueryDevtools diff --git a/packages/react-query-devtools/tsconfig.eslint.json b/packages/react-query-devtools/tsconfig.eslint.json index b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query-devtools/tsup.config.js b/packages/react-query-devtools/tsup.config.js new file mode 100644 index 0000000000..1031ae9d0b --- /dev/null +++ b/packages/react-query-devtools/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), + legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), +]) diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json index 901bc2e584..503253ceb2 100644 --- a/packages/react-query-next-experimental/package.json +++ b/packages/react-query-next-experimental/package.json @@ -11,21 +11,25 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { @@ -34,10 +38,8 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage --passWithNoTests", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" }, "devDependencies": { "@tanstack/react-query": "workspace:*", diff --git a/packages/react-query-next-experimental/rollup.config.js b/packages/react-query-next-experimental/rollup.config.js deleted file mode 100644 index 149a2f25d5..0000000000 --- a/packages/react-query-next-experimental/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'react-query-next-experimental', - outputFile: 'index', - entryFile: './src/index.ts', - }), -) diff --git a/packages/react-query-next-experimental/tsconfig.eslint.json b/packages/react-query-next-experimental/tsconfig.eslint.json index b15f4d23ab..e3d7964355 100644 --- a/packages/react-query-next-experimental/tsconfig.eslint.json +++ b/packages/react-query-next-experimental/tsconfig.eslint.json @@ -3,5 +3,5 @@ "compilerOptions": { "noEmit": true }, - "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "rollup.config.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query-next-experimental/tsup.config.js b/packages/react-query-next-experimental/tsup.config.js new file mode 100644 index 0000000000..1031ae9d0b --- /dev/null +++ b/packages/react-query-next-experimental/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), + legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), +]) diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json index 7009c4985b..0432a26654 100644 --- a/packages/react-query-persist-client/package.json +++ b/packages/react-query-persist-client/package.json @@ -11,21 +11,25 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, "sideEffects": false, "files": [ - "build/lib/*", + "build", "src" ], "scripts": { @@ -34,10 +38,8 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" }, "dependencies": { "@tanstack/query-persist-client-core": "workspace:*" diff --git a/packages/react-query-persist-client/rollup.config.js b/packages/react-query-persist-client/rollup.config.js deleted file mode 100644 index cce90b9211..0000000000 --- a/packages/react-query-persist-client/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'react-query-persist-client', - 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 b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query-persist-client/tsup.config.js b/packages/react-query-persist-client/tsup.config.js new file mode 100644 index 0000000000..1031ae9d0b --- /dev/null +++ b/packages/react-query-persist-client/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), + legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), +]) diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 877ddb8799..f77e5562b9 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -11,15 +11,19 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, @@ -30,16 +34,14 @@ "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:codemods && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:codemods": "cpy ../codemods/src/**/* ./build/codemods", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "pnpm build:tsup && pnpm build:codemods", + "build:tsup": "tsup", + "build:codemods": "cpy ../codemods/src/**/* ./build/codemods" }, "files": [ - "build/lib/*", + "build", "src", - "build/codemods", "!build/codemods/jest.config.js", "!build/codemods/**/__testfixtures__", "!build/codemods/**/__tests__" diff --git a/packages/react-query/rollup.config.js b/packages/react-query/rollup.config.js deleted file mode 100644 index 817ee15c00..0000000000 --- a/packages/react-query/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'react-query', - outputFile: 'index', - entryFile: './src/index.ts', - }), -) diff --git a/packages/react-query/tsconfig.eslint.json b/packages/react-query/tsconfig.eslint.json index b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/react-query/tsup.config.js b/packages/react-query/tsup.config.js new file mode 100644 index 0000000000..1031ae9d0b --- /dev/null +++ b/packages/react-query/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), + legacyConfig({ entry: ['src/*.ts', 'src/*.tsx'] }), +]) diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json index f632c840aa..49f9421313 100644 --- a/packages/solid-query/package.json +++ b/packages/solid-query/package.json @@ -11,43 +11,49 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "dist/types/index.d.ts", - "main": "dist/cjs/index.cjs", - "module": "dist/esm/index.js", + "main": "./build/index.cjs", + "module": "./build/index.js", + "types": "./build/index.d.ts", + "browser": {}, "exports": { - ".": { - "types": "./dist/types/index.d.ts", - "solid": "./dist/source/index.js", - "import": "./dist/esm/index.js", - "browser": { - "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.cjs" + "solid": { + "development": "./build/dev.js", + "import": "./build/index.js" + }, + "development": { + "import": { + "types": "./build/index.d.ts", + "default": "./build/dev.js" }, - "require": "./dist/cjs/index.cjs", - "node": "./dist/cjs/index.cjs" + "require": "./build/dev.cjs" + }, + "import": { + "types": "./build/index.d.ts", + "default": "./build/index.js" }, - "./package.json": "./package.json" + "require": "./build/index.cjs" }, "sideEffects": [ "./src/setBatchUpdatesFn.ts" ], "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", + "clean": "rimraf ./build && rimraf ./coverage", "test:eslint": "eslint --ext .ts,.tsx ./src", "test:types": "tsc --noEmit", "test:lib": "vitest run --coverage", "test:lib:dev": "pnpm run test:lib --watch", "test:build": "publint --strict", - "build": "rollup --config rollup.config.js" + "build": "tsup" }, "files": [ - "dist", + "build", "src" ], "dependencies": { "@tanstack/query-core": "workspace:*" }, "devDependencies": { + "tsup-preset-solid": "^0.1.8", "vite-plugin-solid": "^2.5.0" }, "peerDependencies": { diff --git a/packages/solid-query/rollup.config.js b/packages/solid-query/rollup.config.js deleted file mode 100644 index 2fcf4ebde6..0000000000 --- a/packages/solid-query/rollup.config.js +++ /dev/null @@ -1,30 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import withSolid from 'rollup-preset-solid' - -export function createSolidQueryConfig() { - const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ ( - withSolid({ - input: `./src/index.ts`, - targets: ['esm', 'cjs'], - }) - ) - - const outputs = !solidRollupOptions.output - ? [] - : Array.isArray(solidRollupOptions.output) - ? solidRollupOptions.output - : [solidRollupOptions.output] - - outputs.forEach((output) => { - if (output.format === 'cjs') { - output.entryFileNames = '[name].cjs' - output.chunkFileNames = '[name]-[hash].cjs' - } - }) - - return solidRollupOptions -} - -export default defineConfig(createSolidQueryConfig()) diff --git a/packages/solid-query/tsup.config.js b/packages/solid-query/tsup.config.js new file mode 100644 index 0000000000..7f965414cb --- /dev/null +++ b/packages/solid-query/tsup.config.js @@ -0,0 +1,18 @@ +// @ts-check + +import { defineConfig } from 'tsup-preset-solid' + +export default defineConfig( + { + entry: 'src/index.ts', + devEntry: true, + }, + { + dropConsole: true, + cjs: true, + tsupOptions: (config) => ({ + ...config, + outDir: 'build', + }), + }, +) diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json index 99fc6ddcf4..21aa6817dd 100644 --- a/packages/vue-query/package.json +++ b/packages/vue-query/package.json @@ -15,15 +15,19 @@ "url": "https://github.com/sponsors/tannerlinsley" }, "type": "module", - "types": "build/lib/index.d.ts", - "main": "build/lib/index.legacy.cjs", - "module": "build/lib/index.legacy.js", + "types": "build/legacy/index.d.ts", + "main": "build/legacy/index.cjs", + "module": "build/legacy/index.js", "exports": { ".": { - "types": "./build/lib/index.d.ts", - "import": "./build/lib/index.js", - "require": "./build/lib/index.cjs", - "default": "./build/lib/index.cjs" + "import": { + "types": "./build/modern/index.d.ts", + "default": "./build/modern/index.js" + }, + "require": { + "types": "./build/modern/index.d.cts", + "default": "./build/modern/index.cjs" + } }, "./package.json": "./package.json" }, @@ -37,10 +41,8 @@ "test:2.7": "vue-demi-switch 2.7 vue2.7 && vitest", "test:3": "vue-demi-switch 3 && vitest", "test:lib:dev": "pnpm run test:lib --watch", - "test:build": "publint --strict", - "build": "pnpm build:rollup && pnpm build:types", - "build:rollup": "rollup --config rollup.config.js", - "build:types": "tsc --emitDeclarationOnly" + "test:build": "publint --strict && attw --pack", + "build": "tsup" }, "nx": { "targets": { @@ -52,7 +54,7 @@ } }, "files": [ - "build/lib/*", + "build", "src" ], "dependencies": { diff --git a/packages/vue-query/rollup.config.js b/packages/vue-query/rollup.config.js deleted file mode 100644 index b1d16f9995..0000000000 --- a/packages/vue-query/rollup.config.js +++ /dev/null @@ -1,12 +0,0 @@ -// @ts-check - -import { defineConfig } from 'rollup' -import { buildConfigs } from '../../scripts/getRollupConfig.js' - -export default defineConfig( - buildConfigs({ - name: 'vue-query', - outputFile: 'index', - entryFile: './src/index.ts', - }), -) diff --git a/packages/vue-query/tsconfig.eslint.json b/packages/vue-query/tsconfig.eslint.json index b15f4d23ab..e3d7964355 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.js"] + "include": ["**/*.ts", "**/*.tsx", ".eslintrc.cjs", "tsup.config.js"] } diff --git a/packages/vue-query/tsup.config.js b/packages/vue-query/tsup.config.js new file mode 100644 index 0000000000..eb54193fe8 --- /dev/null +++ b/packages/vue-query/tsup.config.js @@ -0,0 +1,9 @@ +// @ts-check + +import { defineConfig } from 'tsup' +import { legacyConfig, modernConfig } from '../../scripts/getTsupConfig.js' + +export default defineConfig([ + modernConfig({ entry: ['src/*.ts', 'src/devtools/*.ts'] }), + legacyConfig({ entry: ['src/*.ts', 'src/devtools/*.ts'] }), +]) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aefca60cdb..2474c4ebf3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,33 +12,9 @@ importers: '@arethetypeswrong/cli': specifier: ^0.6.0 version: 0.6.0 - '@babel/core': - specifier: ^7.21.8 - version: 7.21.8 - '@babel/preset-env': - specifier: ^7.21.5 - version: 7.21.5(@babel/core@7.21.8) - '@babel/preset-react': - specifier: ^7.18.6 - version: 7.18.6(@babel/core@7.21.8) - '@babel/preset-typescript': - specifier: ^7.21.5 - version: 7.21.5(@babel/core@7.21.8) '@commitlint/parse': specifier: ^17.6.5 version: 17.6.5 - '@rollup/plugin-babel': - specifier: ^6.0.3 - version: 6.0.3(@babel/core@7.21.8)(rollup@3.26.0) - '@rollup/plugin-commonjs': - specifier: ^25.0.2 - version: 25.0.2(rollup@3.26.0) - '@rollup/plugin-node-resolve': - specifier: ^15.1.0 - version: 15.1.0(rollup@3.26.0) - '@rollup/plugin-replace': - specifier: ^5.0.2 - version: 5.0.2(rollup@3.26.0) '@solidjs/testing-library': specifier: ^0.5.1 version: 0.5.1(solid-js@1.6.13) @@ -96,9 +72,6 @@ importers: axios: specifier: ^1.4.0 version: 1.4.0 - babel-preset-solid: - specifier: ^1.6.10 - version: 1.6.10(@babel/core@7.21.8) chalk: specifier: ^5.2.0 version: 5.2.0 @@ -171,15 +144,6 @@ importers: rollup: specifier: ^3.26.0 version: 3.26.0 - rollup-plugin-node-externals: - specifier: ^6.1.1 - version: 6.1.1(rollup@3.26.0) - rollup-plugin-preserve-directives: - specifier: ^0.2.0 - version: 0.2.0(rollup@3.26.0) - rollup-plugin-visualizer: - specifier: ^5.9.2 - version: 5.9.2(rollup@3.26.0) rollup-preset-solid: specifier: ^2.0.1 version: 2.0.1 @@ -1380,7 +1344,7 @@ importers: version: 0.11.6 jscodeshift: specifier: 0.15.0 - version: 0.15.0(@babel/preset-env@7.21.5) + version: 0.15.0 packages/eslint-plugin-query: dependencies: @@ -1439,6 +1403,9 @@ importers: '@tanstack/query-core': specifier: workspace:* version: link:../query-core + tsup-preset-solid: + specifier: ^0.1.8 + version: 0.1.8(esbuild@0.18.13)(solid-js@1.6.13)(tsup@6.7.0) vite-plugin-solid: specifier: ^2.5.0 version: 2.5.0(solid-js@1.6.13)(vite@4.4.4) @@ -1566,6 +1533,9 @@ importers: specifier: ^1.6.13 version: 1.6.13 devDependencies: + tsup-preset-solid: + specifier: ^0.1.8 + version: 0.1.8(esbuild@0.18.13)(solid-js@1.6.13)(tsup@6.7.0) vite-plugin-solid: specifier: ^2.5.0 version: 2.5.0(solid-js@1.6.13)(vite@4.4.4) @@ -1824,23 +1794,12 @@ packages: dependencies: '@babel/highlight': 7.22.5 - /@babel/code-frame@7.18.6: - resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/highlight': 7.18.6 - /@babel/code-frame@7.22.5: resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/highlight': 7.22.5 - /@babel/compat-data@7.19.1: - resolution: {integrity: sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg==} - engines: {node: '>=6.9.0'} - dev: false - /@babel/compat-data@7.22.5: resolution: {integrity: sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==} engines: {node: '>=6.9.0'} @@ -1881,14 +1840,6 @@ packages: semver: 6.3.0 dev: true - /@babel/generator@7.19.0: - resolution: {integrity: sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - '@jridgewell/gen-mapping': 0.3.2 - jsesc: 2.5.2 - /@babel/generator@7.22.5: resolution: {integrity: sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==} engines: {node: '>=6.9.0'} @@ -1917,19 +1868,6 @@ packages: '@babel/helper-explode-assignable-expression': 7.18.6 '@babel/types': 7.22.5 - /@babel/helper-compilation-targets@7.19.1(@babel/core@7.21.8): - resolution: {integrity: sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/compat-data': 7.19.1 - '@babel/core': 7.21.8 - '@babel/helper-validator-option': 7.18.6 - browserslist: 4.21.4 - semver: 6.3.0 - dev: false - /@babel/helper-compilation-targets@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==} engines: {node: '>=6.9.0'} @@ -1943,23 +1881,6 @@ packages: lru-cache: 5.1.1 semver: 6.3.0 - /@babel/helper-create-class-features-plugin@7.19.0(@babel/core@7.21.8): - resolution: {integrity: sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.19.0 - '@babel/helper-member-expression-to-functions': 7.18.9 - '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-replace-supers': 7.19.1 - '@babel/helper-split-export-declaration': 7.18.6 - transitivePeerDependencies: - - supports-color - /@babel/helper-create-class-features-plugin@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==} engines: {node: '>=6.9.0'} @@ -1986,7 +1907,7 @@ packages: '@babel/core': ^7.0.0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 + '@babel/helper-annotate-as-pure': 7.22.5 regexpu-core: 5.1.0 /@babel/helper-create-regexp-features-plugin@7.22.5(@babel/core@7.21.8): @@ -2015,10 +1936,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-environment-visitor@7.18.9: - resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==} - engines: {node: '>=6.9.0'} - /@babel/helper-environment-visitor@7.22.5: resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==} engines: {node: '>=6.9.0'} @@ -2029,13 +1946,6 @@ packages: dependencies: '@babel/types': 7.22.5 - /@babel/helper-function-name@7.19.0: - resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/template': 7.18.10 - '@babel/types': 7.22.5 - /@babel/helper-function-name@7.22.5: resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==} engines: {node: '>=6.9.0'} @@ -2043,30 +1953,12 @@ packages: '@babel/template': 7.22.5 '@babel/types': 7.22.5 - /@babel/helper-hoist-variables@7.18.6: - resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 - /@babel/helper-member-expression-to-functions@7.18.6: - resolution: {integrity: sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - - /@babel/helper-member-expression-to-functions@7.18.9: - resolution: {integrity: sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - /@babel/helper-member-expression-to-functions@7.22.5: resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==} engines: {node: '>=6.9.0'} @@ -2100,26 +1992,12 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-optimise-call-expression@7.18.6: - resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - /@babel/helper-optimise-call-expression@7.22.5: resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 - /@babel/helper-plugin-utils@7.19.0: - resolution: {integrity: sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==} - engines: {node: '>=6.9.0'} - - /@babel/helper-plugin-utils@7.20.2: - resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==} - engines: {node: '>=6.9.0'} - /@babel/helper-plugin-utils@7.22.5: resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} @@ -2138,30 +2016,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-replace-supers@7.18.6: - resolution: {integrity: sha512-fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-member-expression-to-functions': 7.18.6 - '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/traverse': 7.19.1 - '@babel/types': 7.22.5 - transitivePeerDependencies: - - supports-color - - /@babel/helper-replace-supers@7.19.1: - resolution: {integrity: sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-member-expression-to-functions': 7.18.9 - '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/traverse': 7.19.1 - '@babel/types': 7.22.5 - transitivePeerDependencies: - - supports-color - /@babel/helper-replace-supers@7.22.5: resolution: {integrity: sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==} engines: {node: '>=6.9.0'} @@ -2175,38 +2029,18 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-simple-access@7.18.6: - resolution: {integrity: sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - dev: false - /@babel/helper-simple-access@7.22.5: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 - /@babel/helper-skip-transparent-expression-wrappers@7.18.6: - resolution: {integrity: sha512-4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - dev: false - /@babel/helper-skip-transparent-expression-wrappers@7.22.5: resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.22.5 - /@babel/helper-split-export-declaration@7.18.6: - resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/types': 7.22.5 - /@babel/helper-split-export-declaration@7.22.5: resolution: {integrity: sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==} engines: {node: '>=6.9.0'} @@ -2221,10 +2055,6 @@ packages: resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} engines: {node: '>=6.9.0'} - /@babel/helper-validator-option@7.18.6: - resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==} - engines: {node: '>=6.9.0'} - /@babel/helper-validator-option@7.22.5: resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==} engines: {node: '>=6.9.0'} @@ -2250,14 +2080,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/highlight@7.18.6: - resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-validator-identifier': 7.22.5 - chalk: 2.4.2 - js-tokens: 4.0.0 - /@babel/highlight@7.22.5: resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==} engines: {node: '>=6.9.0'} @@ -2365,7 +2187,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-export-default-from': 7.18.6(@babel/core@7.21.8) dev: false @@ -2425,10 +2247,10 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/compat-data': 7.19.1 + '@babel/compat-data': 7.22.5 '@babel/core': 7.21.8 - '@babel/helper-compilation-targets': 7.19.1(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.21.8) + '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.8) '@babel/plugin-transform-parameters': 7.18.8(@babel/core@7.21.8) dev: false @@ -2453,7 +2275,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.8) /@babel/plugin-proposal-optional-chaining@7.18.6(@babel/core@7.21.8): @@ -2464,7 +2286,7 @@ packages: dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.18.6 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8) dev: false @@ -2486,7 +2308,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-create-class-features-plugin': 7.19.0(@babel/core@7.21.8) + '@babel/helper-create-class-features-plugin': 7.22.5(@babel/core@7.21.8) '@babel/helper-plugin-utils': 7.22.5 transitivePeerDependencies: - supports-color @@ -2498,7 +2320,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 + '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-create-class-features-plugin': 7.22.5(@babel/core@7.21.8) '@babel/helper-plugin-utils': 7.22.5 '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.8) @@ -2529,7 +2351,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.21.8): resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} @@ -2556,7 +2378,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-syntax-export-default-from@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-Kr//z3ujSVNx6E9z9ih5xXXMqK07VVTuqPmqGe6Mss/zW5XPeLZeSDZoP9ab/hT4wPKqAgjl2PnhPrcpk8Seew==} @@ -2565,7 +2387,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.21.8): @@ -2583,7 +2405,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.20.2 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==} @@ -2610,15 +2432,6 @@ packages: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.22.5 - /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.21.8): - resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 - /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} engines: {node: '>=6.9.0'} @@ -2642,7 +2455,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.8): resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} @@ -2658,7 +2471,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.8): resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} @@ -2666,7 +2479,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.8): resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} @@ -2674,7 +2487,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.21.8): resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} @@ -2694,16 +2507,6 @@ packages: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.22.5 - /@babel/plugin-syntax-typescript@7.18.6(@babel/core@7.21.8): - resolution: {integrity: sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 - dev: false - /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} engines: {node: '>=6.9.0'} @@ -2720,7 +2523,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.21.8): @@ -2752,7 +2555,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-block-scoping@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ==} @@ -2761,7 +2564,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.21.8): @@ -2780,13 +2583,13 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.19.0 - '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-plugin-utils': 7.19.0 - '@babel/helper-replace-supers': 7.18.6 - '@babel/helper-split-export-declaration': 7.18.6 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-optimise-call-expression': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-replace-supers': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.5 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -2818,7 +2621,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.21.8): @@ -2838,7 +2641,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.21.8): @@ -2877,7 +2680,7 @@ packages: dependencies: '@babel/core': 7.21.8 '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.6 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-flow-strip-types@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-wE0xtA7csz+hw4fKPwxmu5jnzAsXPIO57XnRwzXP3T19jWh1BODnPGoG9xKYwvAwusP7iUktHayRFbMPGtODaQ==} @@ -2896,7 +2699,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-for-of@7.22.5(@babel/core@7.21.8): @@ -2915,9 +2718,9 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-compilation-targets': 7.19.1(@babel/core@7.21.8) - '@babel/helper-function-name': 7.19.0 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.21.8) + '@babel/helper-function-name': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.21.8): @@ -2938,7 +2741,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-literals@7.22.5(@babel/core@7.21.8): @@ -2957,7 +2760,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==} @@ -2971,21 +2774,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/plugin-transform-modules-commonjs@7.18.6(@babel/core@7.21.8): - resolution: {integrity: sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-module-transforms': 7.22.5 - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-simple-access': 7.18.6 - babel-plugin-dynamic-import-node: 2.3.3 - transitivePeerDependencies: - - supports-color - dev: false - /@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==} engines: {node: '>=6.9.0'} @@ -3051,7 +2839,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.21.8): @@ -3061,8 +2849,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 - '@babel/helper-replace-supers': 7.18.6 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-replace-supers': 7.22.5 transitivePeerDependencies: - supports-color @@ -3084,7 +2872,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-parameters@7.22.5(@babel/core@7.21.8): @@ -3103,7 +2891,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-react-display-name@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==} @@ -3112,17 +2900,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 - - /@babel/plugin-transform-react-jsx-development@7.18.6(@babel/core@7.21.8): - resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.21.8 - '@babel/plugin-transform-react-jsx': 7.19.0(@babel/core@7.21.8) - dev: true + '@babel/helper-plugin-utils': 7.22.5 + dev: false /@babel/plugin-transform-react-jsx-self@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig==} @@ -3131,7 +2910,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-react-jsx-self@7.22.5(@babel/core@7.21.8): @@ -3150,7 +2929,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-react-jsx-source@7.22.5(@babel/core@7.21.8): @@ -3170,21 +2949,10 @@ packages: dependencies: '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-module-imports': 7.18.6 - '@babel/helper-plugin-utils': 7.19.0 - '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.8) - '@babel/types': 7.22.5 - - /@babel/plugin-transform-react-pure-annotations@7.18.6(@babel/core@7.21.8): - resolution: {integrity: sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-annotate-as-pure': 7.18.6 + '@babel/helper-module-imports': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 - dev: true + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.21.8) + '@babel/types': 7.22.5 /@babel/plugin-transform-regenerator@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==} @@ -3193,7 +2961,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 regenerator-transform: 0.15.0 dev: false @@ -3235,7 +3003,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-spread@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw==} @@ -3244,8 +3012,8 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 - '@babel/helper-skip-transparent-expression-wrappers': 7.18.6 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 dev: false /@babel/plugin-transform-spread@7.22.5(@babel/core@7.21.8): @@ -3265,7 +3033,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/plugin-transform-template-literals@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw==} @@ -3274,7 +3042,7 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 dev: false /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.21.8): @@ -3295,20 +3063,6 @@ packages: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.22.5 - /@babel/plugin-transform-typescript@7.19.3(@babel/core@7.21.8): - resolution: {integrity: sha512-z6fnuK9ve9u/0X0rRvI9MY0xg+DOUaABDYOe+/SQTxtlptaBB/V9JIUxJn6xp3lMBeb9qe8xSFmHU35oZDXD+w==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-create-class-features-plugin': 7.19.0(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.20.2 - '@babel/plugin-syntax-typescript': 7.18.6(@babel/core@7.21.8) - transitivePeerDependencies: - - supports-color - dev: false - /@babel/plugin-transform-typescript@7.22.5(@babel/core@7.21.8): resolution: {integrity: sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==} engines: {node: '>=6.9.0'} @@ -3340,7 +3094,7 @@ packages: dependencies: '@babel/core': 7.21.8 '@babel/helper-create-regexp-features-plugin': 7.18.6(@babel/core@7.21.8) - '@babel/helper-plugin-utils': 7.19.0 + '@babel/helper-plugin-utils': 7.22.5 /@babel/preset-env@7.21.5(@babel/core@7.21.8): resolution: {integrity: sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==} @@ -3451,21 +3205,6 @@ packages: '@babel/types': 7.22.5 esutils: 2.0.3 - /@babel/preset-react@7.18.6(@babel/core@7.21.8): - resolution: {integrity: sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-plugin-utils': 7.20.2 - '@babel/helper-validator-option': 7.18.6 - '@babel/plugin-transform-react-display-name': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-react-jsx': 7.19.0(@babel/core@7.21.8) - '@babel/plugin-transform-react-jsx-development': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-react-pure-annotations': 7.18.6(@babel/core@7.21.8) - dev: true - /@babel/preset-typescript@7.21.5(@babel/core@7.21.8): resolution: {integrity: sha512-iqe3sETat5EOrORXiQ6rWfoOg2y68Cs75B9wNxdPW4kixJxh7aXQE1KPdWLDniC24T/6dSnguF33W9j/ZZQcmA==} engines: {node: '>=6.9.0'} @@ -3523,14 +3262,6 @@ packages: dependencies: regenerator-runtime: 0.13.11 - /@babel/template@7.18.10: - resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/code-frame': 7.18.6 - '@babel/parser': 7.22.5 - '@babel/types': 7.22.5 - /@babel/template@7.22.5: resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} engines: {node: '>=6.9.0'} @@ -3539,23 +3270,6 @@ packages: '@babel/parser': 7.22.5 '@babel/types': 7.22.5 - /@babel/traverse@7.19.1: - resolution: {integrity: sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/code-frame': 7.18.6 - '@babel/generator': 7.19.0 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.19.0 - '@babel/helper-hoist-variables': 7.18.6 - '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.22.5 - '@babel/types': 7.22.5 - debug: 4.3.4 - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - /@babel/traverse@7.22.5: resolution: {integrity: sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==} engines: {node: '>=6.9.0'} @@ -3789,6 +3503,15 @@ packages: resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} dev: false + /@esbuild/android-arm64@0.17.19: + resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm64@0.18.13: resolution: {integrity: sha512-j7NhycJUoUAG5kAzGf4fPWfd17N6SM3o1X6MlXVqfHvs2buFraCJzos9vbeWjLxOyBKHyPOnuCuipbhvbYtTAg==} engines: {node: '>=12'} @@ -3806,6 +3529,15 @@ packages: dev: true optional: true + /@esbuild/android-arm@0.17.19: + resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm@0.18.13: resolution: {integrity: sha512-KwqFhxRFMKZINHzCqf8eKxE0XqWlAVPRxwy6rc7CbVFxzUWB2sA/s3hbMZeemPdhN3fKBkqOaFhTbS8xJXYIWQ==} engines: {node: '>=12'} @@ -3814,6 +3546,15 @@ packages: requiresBuild: true optional: true + /@esbuild/android-x64@0.17.19: + resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-x64@0.18.13: resolution: {integrity: sha512-M2eZkRxR6WnWfVELHmv6MUoHbOqnzoTVSIxgtsyhm/NsgmL+uTmag/VVzdXvmahak1I6sOb1K/2movco5ikDJg==} engines: {node: '>=12'} @@ -3822,6 +3563,15 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-arm64@0.17.19: + resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-arm64@0.18.13: resolution: {integrity: sha512-f5goG30YgR1GU+fxtaBRdSW3SBG9pZW834Mmhxa6terzcboz7P2R0k4lDxlkP7NYRIIdBbWp+VgwQbmMH4yV7w==} engines: {node: '>=12'} @@ -3830,6 +3580,15 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-x64@0.17.19: + resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-x64@0.18.13: resolution: {integrity: sha512-RIrxoKH5Eo+yE5BtaAIMZaiKutPhZjw+j0OCh8WdvKEKJQteacq0myZvBDLU+hOzQOZWJeDnuQ2xgSScKf1Ovw==} engines: {node: '>=12'} @@ -3838,12 +3597,30 @@ packages: requiresBuild: true optional: true + /@esbuild/freebsd-arm64@0.17.19: + resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/freebsd-arm64@0.18.13: resolution: {integrity: sha512-AfRPhHWmj9jGyLgW/2FkYERKmYR+IjYxf2rtSLmhOrPGFh0KCETFzSjx/JX/HJnvIqHt/DRQD/KAaVsUKoI3Xg==} engines: {node: '>=12'} - cpu: [arm64] + cpu: [arm64] + os: [freebsd] + requiresBuild: true + optional: true + + /@esbuild/freebsd-x64@0.17.19: + resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} + engines: {node: '>=12'} + cpu: [x64] os: [freebsd] requiresBuild: true + dev: true optional: true /@esbuild/freebsd-x64@0.18.13: @@ -3854,6 +3631,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm64@0.17.19: + resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm64@0.18.13: resolution: {integrity: sha512-hCzZbVJEHV7QM77fHPv2qgBcWxgglGFGCxk6KfQx6PsVIdi1u09X7IvgE9QKqm38OpkzaAkPnnPqwRsltvLkIQ==} engines: {node: '>=12'} @@ -3862,6 +3648,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm@0.17.19: + resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm@0.18.13: resolution: {integrity: sha512-4iMxLRMCxGyk7lEvkkvrxw4aJeC93YIIrfbBlUJ062kilUUnAiMb81eEkVvCVoh3ON283ans7+OQkuy1uHW+Hw==} engines: {node: '>=12'} @@ -3870,6 +3665,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ia32@0.17.19: + resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ia32@0.18.13: resolution: {integrity: sha512-I3OKGbynl3AAIO6onXNrup/ttToE6Rv2XYfFgLK/wnr2J+1g+7k4asLrE+n7VMhaqX+BUnyWkCu27rl+62Adug==} engines: {node: '>=12'} @@ -3895,6 +3699,15 @@ packages: dev: true optional: true + /@esbuild/linux-loong64@0.17.19: + resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-loong64@0.18.13: resolution: {integrity: sha512-8pcKDApAsKc6WW51ZEVidSGwGbebYw2qKnO1VyD8xd6JN0RN6EUXfhXmDk9Vc4/U3Y4AoFTexQewQDJGsBXBpg==} engines: {node: '>=12'} @@ -3903,6 +3716,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-mips64el@0.17.19: + resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-mips64el@0.18.13: resolution: {integrity: sha512-6GU+J1PLiVqWx8yoCK4Z0GnfKyCGIH5L2KQipxOtbNPBs+qNDcMJr9euxnyJ6FkRPyMwaSkjejzPSISD9hb+gg==} engines: {node: '>=12'} @@ -3911,6 +3733,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ppc64@0.17.19: + resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ppc64@0.18.13: resolution: {integrity: sha512-pfn/OGZ8tyR8YCV7MlLl5hAit2cmS+j/ZZg9DdH0uxdCoJpV7+5DbuXrR+es4ayRVKIcfS9TTMCs60vqQDmh+w==} engines: {node: '>=12'} @@ -3919,6 +3750,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-riscv64@0.17.19: + resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-riscv64@0.18.13: resolution: {integrity: sha512-aIbhU3LPg0lOSCfVeGHbmGYIqOtW6+yzO+Nfv57YblEK01oj0mFMtvDJlOaeAZ6z0FZ9D13oahi5aIl9JFphGg==} engines: {node: '>=12'} @@ -3927,6 +3767,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-s390x@0.17.19: + resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-s390x@0.18.13: resolution: {integrity: sha512-Pct1QwF2sp+5LVi4Iu5Y+6JsGaV2Z2vm4O9Dd7XZ5tKYxEHjFtb140fiMcl5HM1iuv6xXO8O1Vrb1iJxHlv8UA==} engines: {node: '>=12'} @@ -3935,6 +3784,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-x64@0.17.19: + resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-x64@0.18.13: resolution: {integrity: sha512-zTrIP0KzYP7O0+3ZnmzvUKgGtUvf4+piY8PIO3V8/GfmVd3ZyHJGz7Ht0np3P1wz+I8qJ4rjwJKqqEAbIEPngA==} engines: {node: '>=12'} @@ -3943,6 +3801,15 @@ packages: requiresBuild: true optional: true + /@esbuild/netbsd-x64@0.17.19: + resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/netbsd-x64@0.18.13: resolution: {integrity: sha512-I6zs10TZeaHDYoGxENuksxE1sxqZpCp+agYeW039yqFwh3MgVvdmXL5NMveImOC6AtpLvE4xG5ujVic4NWFIDQ==} engines: {node: '>=12'} @@ -3951,6 +3818,15 @@ packages: requiresBuild: true optional: true + /@esbuild/openbsd-x64@0.17.19: + resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/openbsd-x64@0.18.13: resolution: {integrity: sha512-W5C5nczhrt1y1xPG5bV+0M12p2vetOGlvs43LH8SopQ3z2AseIROu09VgRqydx5qFN7y9qCbpgHLx0kb0TcW7g==} engines: {node: '>=12'} @@ -3959,6 +3835,15 @@ packages: requiresBuild: true optional: true + /@esbuild/sunos-x64@0.17.19: + resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + /@esbuild/sunos-x64@0.18.13: resolution: {integrity: sha512-X/xzuw4Hzpo/yq3YsfBbIsipNgmsm8mE/QeWbdGdTTeZ77fjxI2K0KP3AlhZ6gU3zKTw1bKoZTuKLnqcJ537qw==} engines: {node: '>=12'} @@ -3967,6 +3852,15 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-arm64@0.17.19: + resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-arm64@0.18.13: resolution: {integrity: sha512-4CGYdRQT/ILd+yLLE5i4VApMPfGE0RPc/wFQhlluDQCK09+b4JDbxzzjpgQqTPrdnP7r5KUtGVGZYclYiPuHrw==} engines: {node: '>=12'} @@ -3975,6 +3869,15 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-ia32@0.17.19: + resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-ia32@0.18.13: resolution: {integrity: sha512-D+wKZaRhQI+MUGMH+DbEr4owC2D7XnF+uyGiZk38QbgzLcofFqIOwFs7ELmIeU45CQgfHNy9Q+LKW3cE8g37Kg==} engines: {node: '>=12'} @@ -3983,6 +3886,15 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-x64@0.17.19: + resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-x64@0.18.13: resolution: {integrity: sha512-iVl6lehAfJS+VmpF3exKpNQ8b0eucf5VWfzR8S7xFve64NBNz2jPUgx1X93/kfnkfgP737O+i1k54SVQS7uVZA==} engines: {node: '>=12'} @@ -4473,7 +4385,7 @@ packages: dependencies: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.14 + '@jridgewell/trace-mapping': 0.3.18 /@jridgewell/resolve-uri@3.1.0: resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} @@ -4495,12 +4407,6 @@ packages: /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - /@jridgewell/trace-mapping@0.3.14: - resolution: {integrity: sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==} - dependencies: - '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.15 - /@jridgewell/trace-mapping@0.3.18: resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==} dependencies: @@ -5521,7 +5427,7 @@ packages: optional: true dependencies: '@babel/core': 7.21.8 - '@babel/helper-module-imports': 7.18.6 + '@babel/helper-module-imports': 7.22.5 '@rollup/pluginutils': 5.0.2(rollup@3.26.0) rollup: 3.26.0 dev: true @@ -5541,24 +5447,6 @@ packages: resolve: 1.22.2 rollup: 2.79.1 - /@rollup/plugin-commonjs@25.0.2(rollup@3.26.0): - resolution: {integrity: sha512-NGTwaJxIO0klMs+WSFFtBP7b9TdTJ3K76HZkewT8/+yHzMiUGVQgaPtLQxNVYIgT5F7lxkEyVID+yS3K7bhCow==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.68.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.0) - commondir: 1.0.1 - estree-walker: 2.0.2 - glob: 8.1.0 - is-reference: 1.2.1 - magic-string: 0.27.0 - rollup: 3.26.0 - dev: true - /@rollup/plugin-json@4.1.0(rollup@2.79.1): resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} peerDependencies: @@ -5599,20 +5487,6 @@ packages: rollup: 3.26.0 dev: true - /@rollup/plugin-replace@5.0.2(rollup@3.26.0): - resolution: {integrity: sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.26.0) - magic-string: 0.27.0 - rollup: 3.26.0 - dev: true - /@rollup/plugin-terser@0.1.0(rollup@3.26.0): resolution: {integrity: sha512-N2KK+qUfHX2hBzVzM41UWGLrEmcjVC37spC8R3c9mt3oEDFKh3N2e12/lLp9aVSt86veR0TQiCNQXrm8C6aiUQ==} engines: {node: '>=14.0.0'} @@ -7145,12 +7019,6 @@ packages: resolution: {integrity: sha512-3AN/9V/rKuv90NG65m4tTHsI04XrCKsWbztIcW7a8H5iIN7WlvWucRtVV0V/rT4QvtA11n5Vmp20fLwfMWqp6g==} dev: true - /babel-plugin-dynamic-import-node@2.3.3: - resolution: {integrity: sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==} - dependencies: - object.assign: 4.1.4 - dev: false - /babel-plugin-jsx-dom-expressions@0.35.23(@babel/core@7.21.8): resolution: {integrity: sha512-KaBiZPm2riB5jyRUy5BVaz8TkKcyAx2frePOG2lj5vbYsBpZHIknQkUU/csWr+EeV75h/mRHIOzLo2mX4Dxq3g==} peerDependencies: @@ -7162,6 +7030,7 @@ packages: '@babel/types': 7.22.5 html-entities: 2.3.3 validate-html-nesting: 1.2.2 + dev: true /babel-plugin-jsx-dom-expressions@0.36.10(@babel/core@7.21.8): resolution: {integrity: sha512-QA2k/14WGw+RgcGGnEuLWwnu4em6CGhjeXtjvgOYyFHYS2a+CzPeaVQHDOlfuiBcjq/3hWMspHMIMnPEOIzdBg==} @@ -7261,7 +7130,7 @@ packages: '@babel/plugin-proposal-object-rest-spread': 7.18.6(@babel/core@7.21.8) '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.8) '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.21.8) '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.8) '@babel/plugin-transform-arrow-functions': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.21.8) @@ -7274,7 +7143,7 @@ packages: '@babel/plugin-transform-function-name': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-literals': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-modules-commonjs': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.21.8) '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-parameters': 7.18.8(@babel/core@7.21.8) '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.21.8) @@ -7295,6 +7164,7 @@ packages: dependencies: '@babel/core': 7.21.8 babel-plugin-jsx-dom-expressions: 0.35.23(@babel/core@7.21.8) + dev: true /babel-preset-solid@1.7.7(@babel/core@7.21.8): resolution: {integrity: sha512-tdxVzx3kgcIjNXAOmGRbzIhFBPeJjSakiN9yM+IYdL/+LtXNnbGqb0Va5tJb8Sjbk+QVEriovCyuzB5T7jeTvg==} @@ -7432,17 +7302,6 @@ packages: unload: 2.4.1 dev: false - /browserslist@4.21.4: - resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - dependencies: - caniuse-lite: 1.0.30001508 - electron-to-chromium: 1.4.441 - node-releases: 2.0.12 - update-browserslist-db: 1.0.11(browserslist@4.21.4) - dev: false - /browserslist@4.21.9: resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -7507,6 +7366,16 @@ packages: dependencies: run-applescript: 5.0.0 + /bundle-require@4.0.1(esbuild@0.17.19): + resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + peerDependencies: + esbuild: '>=0.17' + dependencies: + esbuild: 0.17.19 + load-tsconfig: 0.2.3 + dev: true + /bundle-require@4.0.1(esbuild@0.18.13): resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -8431,6 +8300,7 @@ packages: dependencies: has-property-descriptors: 1.0.0 object-keys: 1.1.1 + dev: true /define-properties@1.2.0: resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==} @@ -9045,12 +8915,27 @@ packages: dependencies: '@babel/core': 7.21.8 '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) - babel-preset-solid: 1.6.10(@babel/core@7.21.8) + babel-preset-solid: 1.7.7(@babel/core@7.21.8) esbuild: 0.14.54 solid-js: 1.6.13 transitivePeerDependencies: - supports-color + /esbuild-plugin-solid@0.5.0(esbuild@0.18.13)(solid-js@1.6.13): + resolution: {integrity: sha512-ITK6n+0ayGFeDVUZWNMxX+vLsasEN1ILrg4pISsNOQ+mq4ljlJJiuXotInd+HE0MzwTcA9wExT1yzDE2hsqPsg==} + peerDependencies: + esbuild: '>=0.12' + solid-js: '>= 1.0' + dependencies: + '@babel/core': 7.21.8 + '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) + babel-preset-solid: 1.7.7(@babel/core@7.21.8) + esbuild: 0.18.13 + solid-js: 1.6.13 + transitivePeerDependencies: + - supports-color + dev: true + /esbuild-sunos-64@0.14.54: resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==} engines: {node: '>=12'} @@ -9177,6 +9062,36 @@ packages: esbuild-windows-arm64: 0.15.18 dev: true + /esbuild@0.17.19: + resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.17.19 + '@esbuild/android-arm64': 0.17.19 + '@esbuild/android-x64': 0.17.19 + '@esbuild/darwin-arm64': 0.17.19 + '@esbuild/darwin-x64': 0.17.19 + '@esbuild/freebsd-arm64': 0.17.19 + '@esbuild/freebsd-x64': 0.17.19 + '@esbuild/linux-arm': 0.17.19 + '@esbuild/linux-arm64': 0.17.19 + '@esbuild/linux-ia32': 0.17.19 + '@esbuild/linux-loong64': 0.17.19 + '@esbuild/linux-mips64el': 0.17.19 + '@esbuild/linux-ppc64': 0.17.19 + '@esbuild/linux-riscv64': 0.17.19 + '@esbuild/linux-s390x': 0.17.19 + '@esbuild/linux-x64': 0.17.19 + '@esbuild/netbsd-x64': 0.17.19 + '@esbuild/openbsd-x64': 0.17.19 + '@esbuild/sunos-x64': 0.17.19 + '@esbuild/win32-arm64': 0.17.19 + '@esbuild/win32-ia32': 0.17.19 + '@esbuild/win32-x64': 0.17.19 + dev: true + /esbuild@0.18.13: resolution: {integrity: sha512-vhg/WR/Oiu4oUIkVhmfcc23G6/zWuEQKFS+yiosSHe4aN6+DQRXIfeloYGibIfVhkr4wyfuVsGNLr+sQU1rWWw==} engines: {node: '>=12'} @@ -10544,6 +10459,7 @@ packages: resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} dependencies: get-intrinsic: 1.2.1 + dev: true /has-proto@1.0.1: resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} @@ -11666,7 +11582,7 @@ packages: - supports-color dev: false - /jscodeshift@0.15.0(@babel/preset-env@7.21.5): + /jscodeshift@0.15.0: resolution: {integrity: sha512-t337Wx7Vy1ffhas7E1KZUHaR9YPdeCfxPvxz9k6DKwYW88pcs1piR1eR9d+7GQZGSQIZd6a+cfIM3XpMe9rFKQ==} hasBin: true peerDependencies: @@ -11681,7 +11597,6 @@ packages: '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8) '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8) '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.21.8) - '@babel/preset-env': 7.21.5(@babel/core@7.21.8) '@babel/preset-flow': 7.18.6(@babel/core@7.21.8) '@babel/preset-typescript': 7.21.5(@babel/core@7.21.8) '@babel/register': 7.18.6(@babel/core@7.21.8) @@ -12324,7 +12239,7 @@ packages: '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8) '@babel/plugin-proposal-optional-chaining': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-flow-strip-types': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-modules-commonjs': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.21.8) '@babel/register': 7.18.6(@babel/core@7.21.8) escape-string-regexp: 1.0.5 transitivePeerDependencies: @@ -12540,7 +12455,7 @@ packages: '@babel/plugin-transform-for-of': 7.18.8(@babel/core@7.21.8) '@babel/plugin-transform-function-name': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-literals': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-modules-commonjs': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.21.8) '@babel/plugin-transform-object-assign': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-parameters': 7.18.8(@babel/core@7.21.8) '@babel/plugin-transform-react-display-name': 7.18.6(@babel/core@7.21.8) @@ -12553,9 +12468,9 @@ packages: '@babel/plugin-transform-spread': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.21.8) '@babel/plugin-transform-template-literals': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-typescript': 7.19.3(@babel/core@7.21.8) + '@babel/plugin-transform-typescript': 7.22.5(@babel/core@7.21.8) '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.21.8) - '@babel/template': 7.18.10 + '@babel/template': 7.22.5 react-refresh: 0.4.3 transitivePeerDependencies: - supports-color @@ -12735,7 +12650,7 @@ packages: /metro-source-map@0.64.0: resolution: {integrity: sha512-OCG2rtcp5cLEGYvAbfkl6mEc0J2FPRP4/UCEly+juBk7hawS9bCBMBfhJm/HIsvY1frk6nT2Vsl1O8YBbwyx2g==} dependencies: - '@babel/traverse': 7.19.1 + '@babel/traverse': 7.22.5 '@babel/types': 7.22.5 invariant: 2.2.4 metro-symbolicate: 0.64.0 @@ -13725,6 +13640,7 @@ packages: /object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} engines: {node: '>= 0.4'} + dev: true /object-path@0.6.0: resolution: {integrity: sha512-fxrwsCFi3/p+LeLOAwo/wyRMODZxdGBtUlWRzsEpsUVrisZbEfZ21arxLGfaWfcnqb8oHPNihIb4XPE8CQPN5A==} @@ -13756,6 +13672,7 @@ packages: define-properties: 1.1.4 has-symbols: 1.0.3 object-keys: 1.1.1 + dev: true /object.entries@1.1.6: resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==} @@ -15313,24 +15230,6 @@ packages: glob: 10.3.0 dev: true - /rollup-plugin-node-externals@6.1.1(rollup@3.26.0): - resolution: {integrity: sha512-127OFMkpH5rBVlRHRBDUMk1m1sGuzbGy7so5aj/IkpUb2r3+wOWjR/erUzd2ChEQWPsxsyQG6xpYYvPBAdcBRA==} - engines: {node: '>=16.0.0'} - peerDependencies: - rollup: ^3.0.0 - dependencies: - rollup: 3.26.0 - dev: true - - /rollup-plugin-preserve-directives@0.2.0(rollup@3.26.0): - resolution: {integrity: sha512-KUwbBaFvD1zFIDNnOkR+u64sSod3m0l6q46/SzTOa4GTQ6hp6w0FRr2u7x99YkY9qhlna5panmTmuLWeJ/2KWw==} - peerDependencies: - rollup: 2.x || 3.x - dependencies: - magic-string: 0.30.0 - rollup: 3.26.0 - dev: true - /rollup-plugin-visualizer@5.9.2(rollup@3.26.0): resolution: {integrity: sha512-waHktD5mlWrYFrhOLbti4YgQCn1uR24nYsNuXxg7LkPH8KdTXVWR9DNY1WU0QqokyMixVXJS4J04HNrVTMP01A==} engines: {node: '>=14'} @@ -16883,6 +16782,56 @@ packages: /tslib@2.5.2: resolution: {integrity: sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==} + /tsup-preset-solid@0.1.8(esbuild@0.18.13)(solid-js@1.6.13)(tsup@6.7.0): + resolution: {integrity: sha512-V5TZFEZY9emACO3AZvKyCRzdoyjUcuMEEbTGcJnCma7OVvGnSNVoewFff9g0CaveJ8cZcC3u2tW9gMaxmPZ71A==} + peerDependencies: + tsup: ^6.5.0 + dependencies: + esbuild-plugin-solid: 0.5.0(esbuild@0.18.13)(solid-js@1.6.13) + tsup: 6.7.0(typescript@5.0.4) + type-fest: 3.13.0 + transitivePeerDependencies: + - esbuild + - solid-js + - supports-color + dev: true + + /tsup@6.7.0(typescript@5.0.4): + resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==} + engines: {node: '>=14.18'} + hasBin: true + peerDependencies: + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.1.0' + peerDependenciesMeta: + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + dependencies: + bundle-require: 4.0.1(esbuild@0.17.19) + cac: 6.7.14 + chokidar: 3.5.3 + debug: 4.3.4 + esbuild: 0.17.19 + execa: 5.1.1 + globby: 11.1.0 + joycon: 3.1.1 + postcss-load-config: 3.1.4(postcss@8.4.23) + resolve-from: 5.0.0 + rollup: 3.26.0 + source-map: 0.8.0-beta.0 + sucrase: 3.32.0 + tree-kill: 1.2.2 + typescript: 5.0.4 + transitivePeerDependencies: + - supports-color + - ts-node + dev: true + /tsup@7.1.0(typescript@5.0.4): resolution: {integrity: sha512-mazl/GRAk70j8S43/AbSYXGgvRP54oQeX8Un4iZxzATHt0roW0t6HYDVZIXMw0ZQIpvr1nFMniIVnN5186lW7w==} engines: {node: '>=16.14'} @@ -17174,17 +17123,6 @@ packages: resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} engines: {node: '>=8'} - /update-browserslist-db@1.0.11(browserslist@4.21.4): - resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} - hasBin: true - peerDependencies: - browserslist: '>= 4.21.0' - dependencies: - browserslist: 4.21.4 - escalade: 3.1.1 - picocolors: 1.0.0 - dev: false - /update-browserslist-db@1.0.11(browserslist@4.21.9): resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} hasBin: true diff --git a/scripts/getRollupConfig.js b/scripts/getRollupConfig.js deleted file mode 100644 index 88385ea036..0000000000 --- a/scripts/getRollupConfig.js +++ /dev/null @@ -1,199 +0,0 @@ -// @ts-check - -import { resolve } from 'node:path' -import { babel } from '@rollup/plugin-babel' -import { visualizer } from 'rollup-plugin-visualizer' -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 preserveDirectives from 'rollup-plugin-preserve-directives' -import { rootDir } from './config.js' - -/** @param {'development' | 'production'} type */ -const forceEnvPlugin = (type) => - replace({ - 'process.env.NODE_ENV': `"${type}"`, - delimiters: ['', ''], - preventAssignment: true, - }) - -/** @param {'legacy' | 'modern'} type */ -const babelPlugin = (type) => - babel({ - configFile: resolve(rootDir, 'babel.config.cjs'), - browserslistConfigFile: type === 'modern' ? true : false, - targets: - type === 'modern' - ? '' - : { - chrome: '73', - firefox: '78', - edge: '79', - safari: '12', - ios: '12', - opera: '53', - }, - babelHelpers: 'bundled', - exclude: /node_modules/, - extensions: ['.ts', '.tsx'], - }) - -/** - * @param {Object} opts - Options for building configurations. - * @param {string} opts.name - The 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[]} - */ -export function buildConfigs(opts) { - return [modernConfig(opts), legacyConfig(opts)] -} - -/** - * @param {Object} opts - Options for building configurations. - * @param {string} opts.name - The 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} - */ -function modernConfig(opts) { - 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}.js`, - sourcemap: true, - }, - { - format: 'cjs', - file: `./build/lib/${opts.outputFile}.cjs`, - sourcemap: true, - exports: 'named', - }, - ] - - /** @type {import('rollup').OutputOptions[]} */ - const normalOutput = [ - { - format: 'esm', - dir: `./build/lib`, - sourcemap: true, - preserveModules: true, - entryFileNames: '[name].js', - }, - { - format: 'cjs', - dir: `./build/lib`, - sourcemap: true, - exports: 'named', - preserveModules: true, - entryFileNames: '[name].cjs', - }, - ] - - return { - input: [opts.entryFile], - output: forceBundle ? bundleOutput : normalOutput, - plugins: [ - commonJS(), - babelPlugin('modern'), - nodeResolve({ extensions: ['.ts', '.tsx'] }), - forceDevEnv ? forceEnvPlugin('development') : undefined, - bundleDeps - ? undefined - : externals({ - packagePath: './package.json', - deps: true, - devDeps: true, - peerDeps: true, - }), - preserveDirectives(), - visualizer({ - filename: `./build/stats.html`, - template: 'treemap', - gzipSize: true, - }), - ], - } -} - -/** - * @param {Object} opts - Options for building configurations. - * @param {string} opts.name - The 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} - */ -function legacyConfig(opts) { - 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}.legacy.js`, - sourcemap: true, - }, - { - format: 'cjs', - file: `./build/lib/${opts.outputFile}.legacy.cjs`, - sourcemap: true, - exports: 'named', - }, - ] - - /** @type {import('rollup').OutputOptions[]} */ - const normalOutput = [ - { - format: 'esm', - dir: `./build/lib`, - sourcemap: true, - preserveModules: true, - entryFileNames: '[name].legacy.js', - }, - { - format: 'cjs', - dir: `./build/lib`, - sourcemap: true, - exports: 'named', - preserveModules: true, - entryFileNames: '[name].legacy.cjs', - }, - ] - - return { - input: [opts.entryFile], - output: forceBundle ? bundleOutput : normalOutput, - plugins: [ - commonJS(), - babelPlugin('legacy'), - nodeResolve({ extensions: ['.ts', '.tsx'] }), - forceDevEnv ? forceEnvPlugin('development') : undefined, - bundleDeps - ? undefined - : externals({ - packagePath: './package.json', - deps: true, - devDeps: true, - peerDeps: true, - }), - preserveDirectives(), - ], - } -} diff --git a/scripts/getTsupConfig.js b/scripts/getTsupConfig.js new file mode 100644 index 0000000000..559886c007 --- /dev/null +++ b/scripts/getTsupConfig.js @@ -0,0 +1,41 @@ +// @ts-check + +/** + * @param {Object} opts - Options for building configurations. + * @param {string[]} opts.entry - The entry array. + * @param {boolean} [opts.bundle] - Whether to bundle the output. + * @returns {import('tsup').Options} + */ +export function modernConfig(opts) { + return { + entry: opts.entry, + format: ['cjs', 'esm'], + target: ['chrome91', 'firefox90', 'edge91', 'safari15', 'ios15', 'opera77'], + outDir: 'build/modern', + bundle: opts.bundle || false, + splitting: opts.bundle || false, + dts: true, + sourcemap: true, + clean: true, + } +} + +/** + * @param {Object} opts - Options for building configurations. + * @param {string[]} opts.entry - The entry array. + * @param {boolean} [opts.bundle] - Whether to bundle the output. + * @returns {import('tsup').Options} + */ +export function legacyConfig(opts) { + return { + entry: opts.entry, + format: ['cjs', 'esm'], + target: ['es2020', 'node16'], + outDir: 'build/legacy', + bundle: opts.bundle || false, + splitting: opts.bundle || false, + dts: true, + sourcemap: true, + clean: true, + } +}