From 0f18f107c34f959f6e42b9cff59724e13a1b1b5f Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 26 May 2023 19:56:11 +1000 Subject: [PATCH 01/14] Remove rollup-plugin-size --- package.json | 1 - rollup.config.ts | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 7c77d58359..c3ac5dac3e 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,6 @@ "rimraf": "^4.1.2", "rollup": "^3.23.0", "rollup-plugin-preserve-directives": "^0.1.1", - "rollup-plugin-size": "^0.2.0", "rollup-plugin-visualizer": "^5.9.0", "rollup-preset-solid": "^1.4.0", "semver": "^7.5.1", diff --git a/rollup.config.ts b/rollup.config.ts index 5b21e03de6..e30e5b3f18 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,7 +1,6 @@ import type { OutputOptions, Plugin, RollupOptions } from 'rollup' import babel from '@rollup/plugin-babel' import terser from '@rollup/plugin-terser' -import size from 'rollup-plugin-size' import visualizer from 'rollup-plugin-visualizer' import replace from '@rollup/plugin-replace' import nodeResolve from '@rollup/plugin-node-resolve' @@ -419,14 +418,14 @@ function umdProd({ mangle: true, compress: true, }), - size({}), visualizer({ filename: `${packageDir}/build/stats-html.html`, + template: 'treemap', gzipSize: true, }), visualizer({ filename: `${packageDir}/build/stats.json`, - json: true, + template: 'raw-data', gzipSize: true, }), ], From cbc45d08581fca3f4e68709f145b33b8a1435832 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 26 May 2023 19:56:24 +1000 Subject: [PATCH 02/14] Update pnpm-lock --- pnpm-lock.yaml | 136 ++----------------------------------------------- 1 file changed, 4 insertions(+), 132 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db4ab795a5..0fd50dc3da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,7 +63,6 @@ importers: rimraf: ^4.1.2 rollup: ^3.23.0 rollup-plugin-preserve-directives: ^0.1.1 - rollup-plugin-size: ^0.2.0 rollup-plugin-visualizer: ^5.9.0 rollup-preset-solid: ^1.4.0 semver: ^7.5.1 @@ -128,7 +127,6 @@ importers: rimraf: 4.1.2 rollup: 3.23.0 rollup-plugin-preserve-directives: 0.1.1_rollup@3.23.0 - rollup-plugin-size: 0.2.2 rollup-plugin-visualizer: 5.9.0_rollup@3.23.0 rollup-preset-solid: 1.4.0 semver: 7.5.1 @@ -5980,17 +5978,6 @@ packages: es-shim-unscopables: 1.0.0 dev: true - /array.prototype.reduce/1.0.5: - resolution: {integrity: sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.21.2 - es-array-method-boxes-properly: 1.0.0 - is-string: 1.0.7 - dev: true - /array.prototype.tosorted/1.1.1: resolution: {integrity: sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==} dependencies: @@ -6085,15 +6072,6 @@ packages: engines: {node: '>=4'} dev: true - /axios/0.19.2: - resolution: {integrity: sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==} - deprecated: Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410 - dependencies: - follow-redirects: 1.5.10 - transitivePeerDependencies: - - supports-color - dev: true - /axios/0.24.0: resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==} dependencies: @@ -6431,13 +6409,6 @@ packages: unload: 2.3.1 dev: false - /brotli-size/4.0.0: - resolution: {integrity: sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==} - engines: {node: '>= 10.16.0'} - dependencies: - duplexer: 0.1.1 - dev: true - /browserslist/4.21.5: resolution: {integrity: sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -7248,17 +7219,6 @@ packages: dependencies: ms: 2.0.0 - /debug/3.1.0: - resolution: {integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.0.0 - dev: true - /debug/3.2.7: resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} peerDependencies: @@ -7537,10 +7497,6 @@ packages: resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==} engines: {node: '>=12'} - /duplexer/0.1.1: - resolution: {integrity: sha512-sxNZ+ljy+RA1maXoUReeqBBpBC6RLKmg5ewzV+x+mSETmWNoKdZN6vcQjpFROemza23hGFskJtFNoUWUaQ+R4Q==} - dev: true - /duplexer/0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} dev: true @@ -7706,10 +7662,6 @@ packages: which-typed-array: 1.1.9 dev: true - /es-array-method-boxes-properly/1.0.0: - resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==} - dev: true - /es-get-iterator/1.1.3: resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==} dependencies: @@ -9057,15 +9009,6 @@ packages: dependencies: debug: 4.3.4 - /follow-redirects/1.5.10: - resolution: {integrity: sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==} - engines: {node: '>=4.0'} - dependencies: - debug: 3.1.0 - transitivePeerDependencies: - - supports-color - dev: true - /fontfaceobserver/2.3.0: resolution: {integrity: sha512-6FPvD/IVyT4ZlNe7Wcn5Fb/4ChigpucKYSvD6a+0iMoLn2inpo711eyIcKjmDtE5XNcgAkSH9uN/nfAeZzHEfg==} dev: false @@ -9143,6 +9086,7 @@ packages: graceful-fs: 4.2.10 jsonfile: 4.0.0 universalify: 0.1.2 + dev: false /fs-extra/9.0.0: resolution: {integrity: sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==} @@ -9437,14 +9381,6 @@ packages: engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} dev: false - /gzip-size/5.1.1: - resolution: {integrity: sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==} - engines: {node: '>=6'} - dependencies: - duplexer: 0.1.2 - pify: 4.0.1 - dev: true - /gzip-size/6.0.0: resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==} engines: {node: '>=10'} @@ -10540,6 +10476,7 @@ packages: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} optionalDependencies: graceful-fs: 4.2.10 + dev: false /jsonfile/6.1.0: resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} @@ -11953,17 +11890,6 @@ packages: es-abstract: 1.21.1 dev: true - /object.getownpropertydescriptors/2.1.6: - resolution: {integrity: sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==} - engines: {node: '>= 0.8'} - dependencies: - array.prototype.reduce: 1.0.5 - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.21.2 - safe-array-concat: 1.0.0 - dev: true - /object.hasown/1.1.2: resolution: {integrity: sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==} dependencies: @@ -12506,6 +12432,7 @@ packages: /pretty-bytes/5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} engines: {node: '>=6'} + dev: false /pretty-format/26.6.2: resolution: {integrity: sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==} @@ -13304,15 +13231,6 @@ packages: rollup: 3.23.0 dev: true - /rollup-plugin-size/0.2.2: - resolution: {integrity: sha512-XIQpfwp1dLXzr4qCopY5ZSEEPB3bgZLkGw2BB3+TXmfH2jxGSmuN/+sRxnA5MvJe+Z4atW0x0qTQz5EuTQy01Q==} - engines: {node: '>=10.0.0'} - dependencies: - size-plugin-core: 0.0.7 - transitivePeerDependencies: - - supports-color - dev: true - /rollup-plugin-terser/7.0.2_rollup@2.79.1: resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser @@ -13428,16 +13346,6 @@ packages: dependencies: mri: 1.2.0 - /safe-array-concat/1.0.0: - resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==} - engines: {node: '>=0.4'} - dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.0 - has-symbols: 1.0.3 - isarray: 2.0.5 - dev: true - /safe-buffer/5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} @@ -13672,31 +13580,6 @@ packages: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} dev: false - /size-plugin-core/0.0.7: - resolution: {integrity: sha512-vMX3AhK3hh5vxfOL5VgEIxUkcm0MFfiPsZ9LqZsZRH7iQ+erU669zYsx+WCF4EQ+nn11GYXL91U/sEvS1FnPug==} - dependencies: - brotli-size: 4.0.0 - chalk: 2.4.2 - fs-extra: 8.1.0 - glob: 7.2.3 - gzip-size: 5.1.1 - minimatch: 3.1.2 - pretty-bytes: 5.6.0 - size-plugin-store: 0.0.5 - util.promisify: 1.1.2 - transitivePeerDependencies: - - supports-color - dev: true - - /size-plugin-store/0.0.5: - resolution: {integrity: sha512-SIFBv0wMMMfdqg1Po8vem90OaXe2Cftfo0AiXYU9m9JxDhOd726K+0BfNcYyOmDyrH2uUM7zMlnU2OhbbsDv5Q==} - dependencies: - axios: 0.19.2 - ci-env: 1.17.0 - transitivePeerDependencies: - - supports-color - dev: true - /slash/3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} @@ -15143,6 +15026,7 @@ packages: /universalify/0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} + dev: false /universalify/0.2.0: resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} @@ -15237,18 +15121,6 @@ packages: /util-deprecate/1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - /util.promisify/1.1.2: - resolution: {integrity: sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA==} - dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - for-each: 0.3.3 - has-proto: 1.0.1 - has-symbols: 1.0.3 - object.getownpropertydescriptors: 2.1.6 - safe-array-concat: 1.0.0 - dev: true - /utils-merge/1.0.1: resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} engines: {node: '>= 0.4.0'} From bb1b007d77325939513c44f10105f0381613d49d Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 26 May 2023 19:56:48 +1000 Subject: [PATCH 03/14] Delete old config --- old/rollup.config.js | 106 ------------------------------------------- 1 file changed, 106 deletions(-) delete mode 100644 old/rollup.config.js diff --git a/old/rollup.config.js b/old/rollup.config.js deleted file mode 100644 index e675a18041..0000000000 --- a/old/rollup.config.js +++ /dev/null @@ -1,106 +0,0 @@ -import babel from '@rollup/plugin-babel' -import terser from '@rollup/plugin-terser' -import size from 'rollup-plugin-size' -import externals from 'rollup-plugin-node-externals' -import resolve from '@rollup/plugin-node-resolve' -import commonJS from '@rollup/plugin-commonjs' -import visualizer from 'rollup-plugin-visualizer' -import replace from '@rollup/plugin-replace' -import { defineConfig } from 'rollup' - -const external = ['react', 'react-dom', 'react-query'] - -const globals = { - react: 'React', - 'react-dom': 'ReactDOM', - 'react-query': 'ReactQuery', -} - -const inputSrcs = [ - ['src/index.ts', 'ReactQuery', 'react-query'], - ['src/core/index.ts', 'ReactQueryCore', 'react-query-core'], - ['src/devtools/index.ts', 'ReactQueryDevtools', 'react-query-devtools'], - [ - 'src/persistQueryClient/index.ts', - 'ReactQueryPersistQueryClient', - 'persistQueryClient', - ], - [ - 'src/createWebStoragePersister/index.ts', - 'ReactQueryCreateWebStoragePersister', - 'createWebStoragePersister', - ], - [ - 'src/createAsyncStoragePersister/index.ts', - 'ReactQueryCreateAsyncStoragePersister', - 'createAsyncStoragePersister', - ], - [ - 'src/broadcastQueryClient-experimental/index.ts', - 'ReactQueryBroadcastQueryClientExperimental', - 'broadcastQueryClient-experimental', - ], -] - -const extensions = ['.js', '.jsx', '.es6', '.es', '.mjs', '.ts', '.tsx'] - -const babelConfig = { - extensions, - babelHelpers: 'bundled', -} -const resolveConfig = { extensions } - -const externalPeerDeps = () => - externals({ deps: false, devDeps: false, peerDeps: true }) - -export default inputSrcs - .map(([input, name, file]) => { - return defineConfig([ - { - input: input, - output: { - name, - file: `dist/${file}.development.js`, - format: 'umd', - sourcemap: true, - globals, - }, - external, - plugins: [ - externalPeerDeps(), - resolve(resolveConfig), - babel(babelConfig), - commonJS(), - ], - }, - { - input: input, - output: { - name, - file: `dist/${file}.production.min.js`, - format: 'umd', - sourcemap: true, - globals, - }, - external, - plugins: [ - replace({ - 'process.env.NODE_ENV': `"production"`, - delimiters: ['', ''], - preventAssignment: true, - }), - externalPeerDeps(), - resolve(resolveConfig), - babel(babelConfig), - commonJS(), - terser(), - size(), - visualizer({ - filename: 'stats-react.json', - json: true, - }), - ], - }, - ]) - }) - .flat() From a4e1b56fcadefdb9c13407b6415e69352e72c896 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 26 May 2023 19:59:52 +1000 Subject: [PATCH 04/14] Use @rollup/plugin-typescript --- examples/svelte/auto-refetching/package.json | 1 - examples/svelte/basic/package.json | 1 - .../load-more-infinite-scroll/package.json | 1 - .../package.json | 1 - examples/svelte/playground/package.json | 1 - examples/svelte/simple/package.json | 1 - examples/svelte/ssr/package.json | 1 - examples/svelte/star-wars/package.json | 1 - package.json | 2 + packages/svelte-query-devtools/package.json | 1 - packages/svelte-query/package.json | 1 - pnpm-lock.yaml | 50 +++++++++---------- project.json | 2 +- rollup.config.js | 7 --- tsconfig.json | 19 ++----- 15 files changed, 33 insertions(+), 57 deletions(-) delete mode 100644 rollup.config.js diff --git a/examples/svelte/auto-refetching/package.json b/examples/svelte/auto-refetching/package.json index 3c343e9a78..156d73b348 100644 --- a/examples/svelte/auto-refetching/package.json +++ b/examples/svelte/auto-refetching/package.json @@ -17,7 +17,6 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/basic/package.json b/examples/svelte/basic/package.json index 5ae4ebf48b..33a9c94d34 100644 --- a/examples/svelte/basic/package.json +++ b/examples/svelte/basic/package.json @@ -17,7 +17,6 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/load-more-infinite-scroll/package.json b/examples/svelte/load-more-infinite-scroll/package.json index 6c6028f5d3..196ebde6e4 100644 --- a/examples/svelte/load-more-infinite-scroll/package.json +++ b/examples/svelte/load-more-infinite-scroll/package.json @@ -17,7 +17,6 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/optimistic-updates-typescript/package.json b/examples/svelte/optimistic-updates-typescript/package.json index 06955fb881..78ab62177d 100644 --- a/examples/svelte/optimistic-updates-typescript/package.json +++ b/examples/svelte/optimistic-updates-typescript/package.json @@ -17,7 +17,6 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/playground/package.json b/examples/svelte/playground/package.json index 89577694a6..835caea4ed 100644 --- a/examples/svelte/playground/package.json +++ b/examples/svelte/playground/package.json @@ -17,7 +17,6 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/simple/package.json b/examples/svelte/simple/package.json index 5d89257aad..f5c4845154 100644 --- a/examples/svelte/simple/package.json +++ b/examples/svelte/simple/package.json @@ -17,7 +17,6 @@ "@tsconfig/svelte": "^4.0.1", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/ssr/package.json b/examples/svelte/ssr/package.json index def5dc749b..1e2238932e 100644 --- a/examples/svelte/ssr/package.json +++ b/examples/svelte/ssr/package.json @@ -17,7 +17,6 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/star-wars/package.json b/examples/svelte/star-wars/package.json index 3ec6f0c4e9..aea767d7dd 100644 --- a/examples/svelte/star-wars/package.json +++ b/examples/svelte/star-wars/package.json @@ -20,7 +20,6 @@ "svelte": "^3.54.0", "svelte-check": "^3.3.2", "tailwindcss": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/package.json b/package.json index c3ac5dac3e..1d14881d58 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-terser": "^0.4.3", + "@rollup/plugin-typescript": "^11.1.1", "@solidjs/testing-library": "^0.5.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", @@ -90,6 +91,7 @@ "solid-js": "^1.6.13", "stream-to-array": "^2.3.0", "ts-node": "^10.9.1", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vitest": "^0.27.1", "vue": "^3.2.47" diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index fe9d62a212..04d594dfaf 100644 --- a/packages/svelte-query-devtools/package.json +++ b/packages/svelte-query-devtools/package.json @@ -41,7 +41,6 @@ "jsdom": "^22.0.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" }, diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index 1c0523f63e..c1f02105f7 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -45,7 +45,6 @@ "jsdom": "^22.0.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0fd50dc3da..a539e55a31 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,6 +19,7 @@ importers: '@rollup/plugin-node-resolve': ^15.0.2 '@rollup/plugin-replace': ^5.0.2 '@rollup/plugin-terser': ^0.4.3 + '@rollup/plugin-typescript': ^11.1.1 '@solidjs/testing-library': ^0.5.1 '@testing-library/jest-dom': ^5.16.5 '@testing-library/react': ^14.0.0 @@ -69,6 +70,7 @@ importers: solid-js: ^1.6.13 stream-to-array: ^2.3.0 ts-node: ^10.9.1 + tslib: ^2.5.2 typescript: ^5.0.4 vitest: ^0.27.1 vue: ^3.2.47 @@ -83,6 +85,7 @@ importers: '@rollup/plugin-node-resolve': 15.0.2_rollup@3.23.0 '@rollup/plugin-replace': 5.0.2_rollup@3.23.0 '@rollup/plugin-terser': 0.4.3_rollup@3.23.0 + '@rollup/plugin-typescript': 11.1.1_3z2bg3rkwokrf7bt2qgphugr2y '@solidjs/testing-library': 0.5.2_solid-js@1.6.16 '@testing-library/jest-dom': 5.16.5 '@testing-library/react': 14.0.0_biqbaboplfbrettd7655fr4n2y @@ -133,6 +136,7 @@ importers: solid-js: 1.6.16 stream-to-array: 2.3.0 ts-node: 10.9.1_ztltjo43tmsep75uum5mceyifa + tslib: 2.5.2 typescript: 5.0.4 vitest: 0.27.3 vue: 3.2.47 @@ -739,7 +743,6 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -749,7 +752,6 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -760,7 +762,6 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -770,7 +771,6 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -781,7 +781,6 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -791,7 +790,6 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -802,7 +800,6 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -812,7 +809,6 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -823,7 +819,6 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -833,7 +828,6 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -844,7 +838,6 @@ importers: '@tsconfig/svelte': ^4.0.1 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -854,7 +847,6 @@ importers: '@tsconfig/svelte': 4.0.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -865,7 +857,6 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -875,7 +866,6 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -889,7 +879,6 @@ importers: svelte: ^3.54.0 svelte-check: ^3.3.2 tailwindcss: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -902,7 +891,6 @@ importers: svelte: 3.55.0 svelte-check: 3.3.2_unnuimhrmy7wkrlhr4xd5f5uky tailwindcss: 3.3.2 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -1103,7 +1091,6 @@ importers: jsdom: ^22.0.0 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -1116,7 +1103,6 @@ importers: jsdom: 22.0.0 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -1132,7 +1118,6 @@ importers: jsdom: ^22.0.0 svelte: ^3.54.0 svelte-check: ^3.3.2 - tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -1147,7 +1132,6 @@ importers: jsdom: 22.0.0 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 - tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -4557,6 +4541,26 @@ packages: terser: 5.17.6 dev: true + /@rollup/plugin-typescript/11.1.1_3z2bg3rkwokrf7bt2qgphugr2y: + resolution: {integrity: sha512-Ioir+x5Bejv72Lx2Zbz3/qGg7tvGbxQZALCLoJaGrkNXak/19+vKgKYJYM3i/fJxvsb23I9FuFQ8CUBEfsmBRg==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.14.0||^3.0.0 + tslib: '*' + typescript: '>=3.7.0' + peerDependenciesMeta: + rollup: + optional: true + tslib: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2_rollup@3.23.0 + resolve: 1.22.2 + rollup: 3.23.0 + tslib: 2.5.2 + typescript: 5.0.4 + dev: true + /@rollup/pluginutils/3.1.0_rollup@2.79.1: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} @@ -11798,7 +11802,7 @@ packages: tar-stream: 2.2.0 tmp: 0.2.1 tsconfig-paths: 4.1.2 - tslib: 2.5.0 + tslib: 2.5.2 v8-compile-cache: 2.3.0 yargs: 17.7.1 yargs-parser: 21.1.1 @@ -14784,10 +14788,6 @@ packages: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true - /tslib/2.5.0: - resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} - dev: true - /tslib/2.5.2: resolution: {integrity: sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==} diff --git a/project.json b/project.json index 668fd5efc7..b0accff596 100644 --- a/project.json +++ b/project.json @@ -4,7 +4,7 @@ "sourceRoot": "./", "targets": { "rollup": { - "command": "rollup --config rollup.config.js", + "command": "rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript", "outputs": [ "{workspaceRoot}/packages/*/build/**/*(.cjs|.mjs|.js)*", "{workspaceRoot}/packages/*/build/stats*", diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index ff9029888d..0000000000 --- a/rollup.config.js +++ /dev/null @@ -1,7 +0,0 @@ -require("ts-node").register({ - compilerOptions: { - esModuleInterop: true, - }, -}); - -module.exports = require("./rollup.config.ts"); diff --git a/tsconfig.json b/tsconfig.json index 9c00d899c6..05660b36a7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,16 +1,7 @@ { - "files": [], - "references": [ - { "path": "packages/query-core" }, - { "path": "packages/query-persist-client-core" }, - { "path": "packages/query-async-storage-persister" }, - { "path": "packages/query-broadcast-client-experimental" }, - { "path": "packages/query-sync-storage-persister" }, - { "path": "packages/react-query" }, - { "path": "packages/react-query-devtools" }, - { "path": "packages/react-query-persist-client" }, - { "path": "packages/solid-query" }, - { "path": "packages/vue-query" }, - { "path": "packages/query-devtools" } - ] + "compilerOptions": { + "esModuleInterop": true, + "noEmit": true, + }, + "include": ["rollup.config.ts"] } From 9af6d40eb2d513c678b193ac7de9b45a47c18dfa Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 26 May 2023 20:02:28 +1000 Subject: [PATCH 05/14] Update rollup-preset-solid --- package.json | 2 +- pnpm-lock.yaml | 339 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 251 insertions(+), 90 deletions(-) diff --git a/package.json b/package.json index 1d14881d58..d163add724 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "rollup": "^3.23.0", "rollup-plugin-preserve-directives": "^0.1.1", "rollup-plugin-visualizer": "^5.9.0", - "rollup-preset-solid": "^1.4.0", + "rollup-preset-solid": "^2.0.1", "semver": "^7.5.1", "solid-js": "^1.6.13", "stream-to-array": "^2.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a539e55a31..69cd28b212 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,7 +65,7 @@ importers: rollup: ^3.23.0 rollup-plugin-preserve-directives: ^0.1.1 rollup-plugin-visualizer: ^5.9.0 - rollup-preset-solid: ^1.4.0 + rollup-preset-solid: ^2.0.1 semver: ^7.5.1 solid-js: ^1.6.13 stream-to-array: ^2.3.0 @@ -131,7 +131,7 @@ importers: rollup: 3.23.0 rollup-plugin-preserve-directives: 0.1.1_rollup@3.23.0 rollup-plugin-visualizer: 5.9.0_rollup@3.23.0 - rollup-preset-solid: 1.4.0 + rollup-preset-solid: 2.0.1 semver: 7.5.1 solid-js: 1.6.16 stream-to-array: 2.3.0 @@ -2881,6 +2881,15 @@ packages: resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} dev: false + /@esbuild/android-arm/0.15.18: + resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm/0.17.14: resolution: {integrity: sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==} engines: {node: '>=12'} @@ -2969,6 +2978,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-loong64/0.15.18: + resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-loong64/0.17.14: resolution: {integrity: sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==} engines: {node: '>=12'} @@ -4382,23 +4400,6 @@ packages: engines: {node: '>=14'} dev: false - /@rollup/plugin-babel/5.3.1_ixpapmkxoyzypvxfdre42vzpgy: - resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} - engines: {node: '>= 10.0.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@types/babel__core': ^7.1.9 - rollup: ^1.20.0||^2.0.0 - peerDependenciesMeta: - '@types/babel__core': - optional: true - dependencies: - '@babel/core': 7.21.8 - '@babel/helper-module-imports': 7.21.4 - '@rollup/pluginutils': 3.1.0_rollup@2.79.1 - rollup: 2.79.1 - dev: true - /@rollup/plugin-babel/6.0.3_lxlhoxoxyvbpb2ro632dgii55q: resolution: {integrity: sha512-fKImZKppa1A/gX73eg4JGo+8kQr/q1HBQaCGKECZ0v4YBBv3lFqi14+7xyApECzvkLTHCifx+7ntcrvtBIRcpg==} engines: {node: '>=14.0.0'} @@ -4465,21 +4466,6 @@ packages: '@rollup/pluginutils': 5.0.2_rollup@3.23.0 rollup: 3.23.0 - /@rollup/plugin-node-resolve/13.3.0_rollup@2.79.1: - resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==} - engines: {node: '>= 10.0.0'} - peerDependencies: - rollup: ^2.42.0 - dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.79.1 - '@types/resolve': 1.17.1 - deepmerge: 4.3.1 - is-builtin-module: 3.2.1 - is-module: 1.0.0 - resolve: 1.22.2 - rollup: 2.79.1 - dev: true - /@rollup/plugin-node-resolve/13.3.0_rollup@3.23.0: resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==} engines: {node: '>= 10.0.0'} @@ -4526,6 +4512,19 @@ packages: rollup: 3.23.0 dev: true + /@rollup/plugin-terser/0.1.0_rollup@3.23.0: + resolution: {integrity: sha512-N2KK+qUfHX2hBzVzM41UWGLrEmcjVC37spC8R3c9mt3oEDFKh3N2e12/lLp9aVSt86veR0TQiCNQXrm8C6aiUQ==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.x || ^3.x + peerDependenciesMeta: + rollup: + optional: true + dependencies: + rollup: 3.23.0 + terser: 5.17.6 + dev: true + /@rollup/plugin-terser/0.4.3_rollup@3.23.0: resolution: {integrity: sha512-EF0oejTMtkyhrkwCdg0HJ0IpkcaVg1MMSf2olHb2Jp+1mnLM04OhjpJWGma4HobiDTF0WCyViWuvadyE9ch2XA==} engines: {node: '>=14.0.0'} @@ -4561,18 +4560,6 @@ packages: typescript: 5.0.4 dev: true - /@rollup/pluginutils/3.1.0_rollup@2.79.1: - resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} - engines: {node: '>= 8.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0 - dependencies: - '@types/estree': 0.0.39 - estree-walker: 1.0.1 - picomatch: 2.3.1 - rollup: 2.79.1 - dev: true - /@rollup/pluginutils/3.1.0_rollup@3.23.0: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} @@ -7719,6 +7706,15 @@ packages: requiresBuild: true optional: true + /esbuild-android-64/0.15.18: + resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + /esbuild-android-arm64/0.14.54: resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==} engines: {node: '>=12'} @@ -7727,6 +7723,15 @@ packages: requiresBuild: true optional: true + /esbuild-android-arm64/0.15.18: + resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /esbuild-darwin-64/0.14.54: resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==} engines: {node: '>=12'} @@ -7735,6 +7740,15 @@ packages: requiresBuild: true optional: true + /esbuild-darwin-64/0.15.18: + resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /esbuild-darwin-arm64/0.14.54: resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==} engines: {node: '>=12'} @@ -7743,6 +7757,15 @@ packages: requiresBuild: true optional: true + /esbuild-darwin-arm64/0.15.18: + resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /esbuild-freebsd-64/0.14.54: resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==} engines: {node: '>=12'} @@ -7751,6 +7774,15 @@ packages: requiresBuild: true optional: true + /esbuild-freebsd-64/0.15.18: + resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /esbuild-freebsd-arm64/0.14.54: resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==} engines: {node: '>=12'} @@ -7759,6 +7791,15 @@ packages: requiresBuild: true optional: true + /esbuild-freebsd-arm64/0.15.18: + resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-32/0.14.54: resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==} engines: {node: '>=12'} @@ -7767,6 +7808,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-32/0.15.18: + resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-64/0.14.54: resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==} engines: {node: '>=12'} @@ -7775,6 +7825,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-64/0.15.18: + resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-arm/0.14.54: resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==} engines: {node: '>=12'} @@ -7783,6 +7842,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-arm/0.15.18: + resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-arm64/0.14.54: resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==} engines: {node: '>=12'} @@ -7791,6 +7859,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-arm64/0.15.18: + resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-mips64le/0.14.54: resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==} engines: {node: '>=12'} @@ -7799,6 +7876,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-mips64le/0.15.18: + resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-ppc64le/0.14.54: resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==} engines: {node: '>=12'} @@ -7807,6 +7893,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-ppc64le/0.15.18: + resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-riscv64/0.14.54: resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==} engines: {node: '>=12'} @@ -7815,6 +7910,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-riscv64/0.15.18: + resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-linux-s390x/0.14.54: resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==} engines: {node: '>=12'} @@ -7823,6 +7927,15 @@ packages: requiresBuild: true optional: true + /esbuild-linux-s390x/0.15.18: + resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + /esbuild-netbsd-64/0.14.54: resolution: {integrity: sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==} engines: {node: '>=12'} @@ -7831,6 +7944,15 @@ packages: requiresBuild: true optional: true + /esbuild-netbsd-64/0.15.18: + resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + /esbuild-openbsd-64/0.14.54: resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==} engines: {node: '>=12'} @@ -7839,6 +7961,15 @@ packages: requiresBuild: true optional: true + /esbuild-openbsd-64/0.15.18: + resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + /esbuild-plugin-solid/0.4.2_ajcandgzujanbl7g4gahkpcrcq: resolution: {integrity: sha512-T5GphLoud3RumjeNYO3K9WVjWDzVKG5evlS7hUEUI0n9tiCL+CnbvJh3SSwFi3xeeXpZRrnZc1gd6FWQsVobTg==} peerDependencies: @@ -7861,6 +7992,15 @@ packages: requiresBuild: true optional: true + /esbuild-sunos-64/0.15.18: + resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + /esbuild-windows-32/0.14.54: resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==} engines: {node: '>=12'} @@ -7869,6 +8009,15 @@ packages: requiresBuild: true optional: true + /esbuild-windows-32/0.15.18: + resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild-windows-64/0.14.54: resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==} engines: {node: '>=12'} @@ -7877,6 +8026,15 @@ packages: requiresBuild: true optional: true + /esbuild-windows-64/0.15.18: + resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild-windows-arm64/0.14.54: resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==} engines: {node: '>=12'} @@ -7885,6 +8043,15 @@ packages: requiresBuild: true optional: true + /esbuild-windows-arm64/0.15.18: + resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.14.54: resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==} engines: {node: '>=12'} @@ -7913,6 +8080,36 @@ packages: esbuild-windows-64: 0.14.54 esbuild-windows-arm64: 0.14.54 + /esbuild/0.15.18: + resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.15.18 + '@esbuild/linux-loong64': 0.15.18 + esbuild-android-64: 0.15.18 + esbuild-android-arm64: 0.15.18 + esbuild-darwin-64: 0.15.18 + esbuild-darwin-arm64: 0.15.18 + esbuild-freebsd-64: 0.15.18 + esbuild-freebsd-arm64: 0.15.18 + esbuild-linux-32: 0.15.18 + esbuild-linux-64: 0.15.18 + esbuild-linux-arm: 0.15.18 + esbuild-linux-arm64: 0.15.18 + esbuild-linux-mips64le: 0.15.18 + esbuild-linux-ppc64le: 0.15.18 + esbuild-linux-riscv64: 0.15.18 + esbuild-linux-s390x: 0.15.18 + esbuild-netbsd-64: 0.15.18 + esbuild-openbsd-64: 0.15.18 + esbuild-sunos-64: 0.15.18 + esbuild-windows-32: 0.15.18 + esbuild-windows-64: 0.15.18 + esbuild-windows-arm64: 0.15.18 + dev: true + /esbuild/0.17.14: resolution: {integrity: sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==} engines: {node: '>=12'} @@ -10277,15 +10474,6 @@ packages: pretty-format: 26.6.2 dev: false - /jest-worker/26.6.2: - resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} - engines: {node: '>= 10.13.0'} - dependencies: - '@types/node': 18.13.0 - merge-stream: 2.0.0 - supports-color: 7.2.0 - dev: true - /jest-worker/27.5.1: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} @@ -13235,19 +13423,6 @@ packages: rollup: 3.23.0 dev: true - /rollup-plugin-terser/7.0.2_rollup@2.79.1: - resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} - deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser - peerDependencies: - rollup: ^2.0.0 - dependencies: - '@babel/code-frame': 7.21.4 - jest-worker: 26.6.2 - rollup: 2.79.1 - serialize-javascript: 4.0.0 - terser: 5.17.6 - dev: true - /rollup-plugin-visualizer/5.9.0_rollup@3.23.0: resolution: {integrity: sha512-bbDOv47+Bw4C/cgs0czZqfm8L82xOZssk4ayZjG40y9zbXclNk7YikrZTDao6p7+HDiGxrN0b65SgZiVm9k1Cg==} engines: {node: '>=14'} @@ -13264,20 +13439,20 @@ packages: source-map: 0.7.4 yargs: 17.5.1 - /rollup-preset-solid/1.4.0: - resolution: {integrity: sha512-rjUH0dMkyHxkin1uBcdZX110DL/P0hppMWF0RAwJdl7ly9IH/N+jHxmnyf7OzkyI2pGUBO9Lr1NN8Me9TFKN6Q==} + /rollup-preset-solid/2.0.1: + resolution: {integrity: sha512-CPJn3SqADlIxhAW3jwZuAFRyZcz7HPeUAz4f+6BzulxHnK4v6tgoTbMvk8vEsfsvHwiTmX93KHIKdf79aTdVSA==} dependencies: '@babel/core': 7.21.8 '@babel/preset-env': 7.21.5_@babel+core@7.21.8 '@babel/preset-typescript': 7.21.5_@babel+core@7.21.8 - '@rollup/plugin-babel': 5.3.1_ixpapmkxoyzypvxfdre42vzpgy - '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 + '@rollup/plugin-babel': 6.0.3_lxlhoxoxyvbpb2ro632dgii55q + '@rollup/plugin-node-resolve': 15.0.2_rollup@3.23.0 + '@rollup/plugin-terser': 0.1.0_rollup@3.23.0 babel-preset-solid: 1.6.10_@babel+core@7.21.8 colorette: 2.0.19 - esbuild: 0.14.54 + esbuild: 0.15.18 merge-anything: 5.1.4 - rollup: 2.79.1 - rollup-plugin-terser: 7.0.2_rollup@2.79.1 + rollup: 3.23.0 typescript: 4.9.5 transitivePeerDependencies: - '@types/babel__core' @@ -13293,14 +13468,6 @@ packages: rollup: 3.23.0 route-sort: 1.0.0 - /rollup/2.79.1: - resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} - engines: {node: '>=10.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: true - /rollup/3.23.0: resolution: {integrity: sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -13463,12 +13630,6 @@ packages: type-fest: 0.12.0 dev: false - /serialize-javascript/4.0.0: - resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==} - dependencies: - randombytes: 2.1.0 - dev: true - /serialize-javascript/6.0.1: resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} dependencies: From 870cc114b9ff6b125a19d83fedb60600ce24e33f Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 26 May 2023 21:13:24 +1000 Subject: [PATCH 06/14] Use named import for visualizer --- rollup.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup.config.ts b/rollup.config.ts index e30e5b3f18..2a1ae85612 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,7 +1,7 @@ import type { OutputOptions, Plugin, RollupOptions } from 'rollup' import babel from '@rollup/plugin-babel' import terser from '@rollup/plugin-terser' -import visualizer from 'rollup-plugin-visualizer' +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' From e22347498519ccb5433c13d65170c4494ac03c3d Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 26 May 2023 21:28:00 +1000 Subject: [PATCH 07/14] Remove unused banner --- rollup.config.ts | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 2a1ae85612..dabc906246 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -432,19 +432,6 @@ function umdProd({ } } -function createBanner(libraryName: string) { - return `/** - * ${libraryName} - * - * Copyright (c) TanStack - * - * This source code is licensed under the MIT license found in the - * LICENSE.md file in the root directory of this source tree. - * - * @license MIT - */` -} - function createSolidQueryConfig() { const packageDir = 'packages/solid-query' const solidRollupOptions = withSolid({ From 5ff4befd54570d9c82ab80ffd4b626721b307afb Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 27 May 2023 08:47:00 +1000 Subject: [PATCH 08/14] Remove banner --- rollup.config.ts | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index dabc906246..9803951d7d 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,19 +1,18 @@ -import type { OutputOptions, Plugin, RollupOptions } from 'rollup' +import path from 'node:path' import babel from '@rollup/plugin-babel' import terser from '@rollup/plugin-terser' 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 path from 'path' import withSolid from 'rollup-preset-solid' import preserveDirectives from 'rollup-plugin-preserve-directives' +import type { OutputOptions, Plugin, RollupOptions } from 'rollup' type Options = { input: string | string[] packageDir: string external: RollupOptions['external'] - banner: string jsName: string outputFile: string globals: Record @@ -210,7 +209,6 @@ function buildConfigs(opts: { ) const external = (moduleName) => externalDeps.includes(moduleName) - const banner = '' //createBanner(opts.name) const options: Options = { input, @@ -218,7 +216,6 @@ function buildConfigs(opts: { outputFile: opts.outputFile, packageDir: opts.packageDir, external, - banner, globals: opts.globals, forceDevEnv: opts.forceDevEnv || false, forceBundle: opts.forceBundle || false, @@ -240,7 +237,6 @@ function mjs({ input, packageDir, external, - banner, outputFile, forceDevEnv, forceBundle, @@ -249,14 +245,12 @@ function mjs({ format: 'esm', file: `${packageDir}/build/lib/${outputFile}.mjs`, sourcemap: true, - banner, } const normalOutput: OutputOptions = { format: 'esm', dir: `${packageDir}/build/lib`, sourcemap: true, - banner, preserveModules: true, entryFileNames: '[name].mjs', } @@ -280,7 +274,6 @@ function esm({ input, packageDir, external, - banner, outputFile, forceDevEnv, forceBundle, @@ -289,14 +282,12 @@ function esm({ format: 'esm', file: `${packageDir}/build/lib/${outputFile}.esm.js`, sourcemap: true, - banner, } const normalOutput: OutputOptions = { format: 'esm', dir: `${packageDir}/build/lib`, sourcemap: true, - banner, preserveModules: true, entryFileNames: '[name].esm.js', } @@ -320,7 +311,6 @@ function cjs({ input, external, packageDir, - banner, outputFile, forceDevEnv, forceBundle, @@ -330,7 +320,6 @@ function cjs({ file: `${packageDir}/build/lib/${outputFile}.js`, sourcemap: true, exports: 'named', - banner, } const normalOutput: OutputOptions = { @@ -338,7 +327,6 @@ function cjs({ dir: `${packageDir}/build/lib`, sourcemap: true, exports: 'named', - banner, preserveModules: true, entryFileNames: '[name].js', } @@ -364,7 +352,6 @@ function umdDev({ packageDir, outputFile, globals, - banner, jsName, }: Options): RollupOptions { return { @@ -377,7 +364,6 @@ function umdDev({ file: `${packageDir}/build/umd/${outputFile}.development.js`, name: jsName, globals, - banner, }, plugins: [ commonJS(), @@ -394,7 +380,6 @@ function umdProd({ packageDir, outputFile, globals, - banner, jsName, }: Options): RollupOptions { return { @@ -407,7 +392,6 @@ function umdProd({ file: `${packageDir}/build/umd/${outputFile}.production.js`, name: jsName, globals, - banner, }, plugins: [ commonJS(), From 4b2ea08d182a394aab87b6b7d2745fe8c0840e91 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 27 May 2023 09:03:06 +1000 Subject: [PATCH 09/14] Use defineConfig --- rollup.config.ts | 265 +++++++++++++++++++++++------------------------ tsconfig.json | 2 + 2 files changed, 134 insertions(+), 133 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 9803951d7d..0a9d7a7890 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,4 +1,5 @@ import path from 'node:path' +import { defineConfig } from 'rollup' import babel from '@rollup/plugin-babel' import terser from '@rollup/plugin-terser' import { visualizer } from 'rollup-plugin-visualizer' @@ -46,139 +47,6 @@ const babelPlugin = (type: 'legacy' | 'modern') => extensions: ['.ts', '.tsx', '.native.ts'], }) -export default function rollup(options: RollupOptions): RollupOptions[] { - return [ - createTanstackQueryDevtoolsConfig(), - ...buildConfigs({ - name: 'query-core', - packageDir: 'packages/query-core', - jsName: 'QueryCore', - outputFile: 'index', - entryFile: ['src/index.ts'], - globals: {}, - }), - ...buildConfigs({ - name: 'query-persist-client-core', - packageDir: 'packages/query-persist-client-core', - jsName: 'QueryPersistClientCore', - outputFile: 'index', - entryFile: ['src/index.ts'], - globals: { - '@tanstack/query-core': 'QueryCore', - }, - }), - ...buildConfigs({ - name: 'query-async-storage-persister', - packageDir: 'packages/query-async-storage-persister', - jsName: 'QueryAsyncStoragePersister', - outputFile: 'index', - entryFile: 'src/index.ts', - globals: { - '@tanstack/query-persist-client-core': 'QueryPersistClientCore', - }, - }), - ...buildConfigs({ - name: 'query-broadcast-client-experimental', - packageDir: 'packages/query-broadcast-client-experimental', - jsName: 'QueryBroadcastClient', - outputFile: 'index', - entryFile: 'src/index.ts', - globals: { - '@tanstack/query-core': 'QueryCore', - 'broadcast-channel': 'BroadcastChannel', - }, - }), - ...buildConfigs({ - name: 'query-sync-storage-persister', - packageDir: 'packages/query-sync-storage-persister', - jsName: 'QuerySyncStoragePersister', - outputFile: 'index', - entryFile: 'src/index.ts', - globals: { - '@tanstack/query-persist-client-core': 'QueryPersistClientCore', - }, - }), - ...buildConfigs({ - name: 'react-query', - packageDir: 'packages/react-query', - jsName: 'ReactQuery', - outputFile: 'index', - entryFile: ['src/index.ts'], - globals: { - react: 'React', - 'react-dom': 'ReactDOM', - '@tanstack/query-core': 'QueryCore', - 'react-native': 'ReactNative', - }, - bundleUMDGlobals: ['@tanstack/query-core'], - }), - ...buildConfigs({ - name: 'react-query-devtools', - packageDir: 'packages/react-query-devtools', - jsName: 'ReactQueryDevtools', - outputFile: 'index', - entryFile: 'src/index.ts', - globals: { - react: 'React', - 'react-dom': 'ReactDOM', - '@tanstack/react-query': 'ReactQuery', - '@tanstack/query-devtools': 'TanstackQueryDevtools', - }, - bundleUMDGlobals: ['@tanstack/query-devtools'], - }), - ...buildConfigs({ - name: 'react-query-devtools-prod', - packageDir: 'packages/react-query-devtools', - jsName: 'ReactQueryDevtools', - outputFile: 'index.prod', - entryFile: 'src/index.ts', - globals: { - react: 'React', - 'react-dom': 'ReactDOM', - '@tanstack/react-query': 'ReactQuery', - '@tanstack/match-sorter-utils': 'MatchSorterUtils', - superjson: 'SuperJson', - }, - forceDevEnv: true, - forceBundle: true, - skipUmdBuild: true, - }), - ...buildConfigs({ - name: 'react-query-persist-client', - packageDir: 'packages/react-query-persist-client', - jsName: 'ReactQueryPersistClient', - outputFile: 'index', - entryFile: 'src/index.ts', - globals: { - react: 'React', - '@tanstack/query-persist-client-core': 'QueryPersistClientCore', - '@tanstack/react-query': 'ReactQuery', - }, - bundleUMDGlobals: ['@tanstack/query-persist-client-core'], - }), - createSolidQueryConfig(), - ...buildConfigs({ - name: 'vue-query', - packageDir: 'packages/vue-query', - jsName: 'VueQuery', - outputFile: 'index', - entryFile: 'src/index.ts', - globals: { - '@tanstack/query-core': 'QueryCore', - vue: 'Vue', - 'vue-demi': 'Vue', - '@tanstack/match-sorter-utils': 'MatchSorter', - '@vue/devtools-api': 'DevtoolsApi', - }, - bundleUMDGlobals: [ - '@tanstack/query-core', - '@tanstack/match-sorter-utils', - '@vue/devtools-api', - ], - }), - ] -} - function buildConfigs(opts: { packageDir: string name: string @@ -486,3 +354,134 @@ function createTanstackQueryDevtoolsConfig() { return solidRollupOptions } + +export default defineConfig([ + createTanstackQueryDevtoolsConfig(), + ...buildConfigs({ + name: 'query-core', + packageDir: 'packages/query-core', + jsName: 'QueryCore', + outputFile: 'index', + entryFile: ['src/index.ts'], + globals: {}, + }), + ...buildConfigs({ + name: 'query-persist-client-core', + packageDir: 'packages/query-persist-client-core', + jsName: 'QueryPersistClientCore', + outputFile: 'index', + entryFile: ['src/index.ts'], + globals: { + '@tanstack/query-core': 'QueryCore', + }, + }), + ...buildConfigs({ + name: 'query-async-storage-persister', + packageDir: 'packages/query-async-storage-persister', + jsName: 'QueryAsyncStoragePersister', + outputFile: 'index', + entryFile: 'src/index.ts', + globals: { + '@tanstack/query-persist-client-core': 'QueryPersistClientCore', + }, + }), + ...buildConfigs({ + name: 'query-broadcast-client-experimental', + packageDir: 'packages/query-broadcast-client-experimental', + jsName: 'QueryBroadcastClient', + outputFile: 'index', + entryFile: 'src/index.ts', + globals: { + '@tanstack/query-core': 'QueryCore', + 'broadcast-channel': 'BroadcastChannel', + }, + }), + ...buildConfigs({ + name: 'query-sync-storage-persister', + packageDir: 'packages/query-sync-storage-persister', + jsName: 'QuerySyncStoragePersister', + outputFile: 'index', + entryFile: 'src/index.ts', + globals: { + '@tanstack/query-persist-client-core': 'QueryPersistClientCore', + }, + }), + ...buildConfigs({ + name: 'react-query', + packageDir: 'packages/react-query', + jsName: 'ReactQuery', + outputFile: 'index', + entryFile: ['src/index.ts'], + globals: { + react: 'React', + 'react-dom': 'ReactDOM', + '@tanstack/query-core': 'QueryCore', + 'react-native': 'ReactNative', + }, + bundleUMDGlobals: ['@tanstack/query-core'], + }), + ...buildConfigs({ + name: 'react-query-devtools', + packageDir: 'packages/react-query-devtools', + jsName: 'ReactQueryDevtools', + outputFile: 'index', + entryFile: 'src/index.ts', + globals: { + react: 'React', + 'react-dom': 'ReactDOM', + '@tanstack/react-query': 'ReactQuery', + '@tanstack/query-devtools': 'TanstackQueryDevtools', + }, + bundleUMDGlobals: ['@tanstack/query-devtools'], + }), + ...buildConfigs({ + name: 'react-query-devtools-prod', + packageDir: 'packages/react-query-devtools', + jsName: 'ReactQueryDevtools', + outputFile: 'index.prod', + entryFile: 'src/index.ts', + globals: { + react: 'React', + 'react-dom': 'ReactDOM', + '@tanstack/react-query': 'ReactQuery', + '@tanstack/match-sorter-utils': 'MatchSorterUtils', + superjson: 'SuperJson', + }, + forceDevEnv: true, + forceBundle: true, + skipUmdBuild: true, + }), + ...buildConfigs({ + name: 'react-query-persist-client', + packageDir: 'packages/react-query-persist-client', + jsName: 'ReactQueryPersistClient', + outputFile: 'index', + entryFile: 'src/index.ts', + globals: { + react: 'React', + '@tanstack/query-persist-client-core': 'QueryPersistClientCore', + '@tanstack/react-query': 'ReactQuery', + }, + bundleUMDGlobals: ['@tanstack/query-persist-client-core'], + }), + createSolidQueryConfig(), + ...buildConfigs({ + name: 'vue-query', + packageDir: 'packages/vue-query', + jsName: 'VueQuery', + outputFile: 'index', + entryFile: 'src/index.ts', + globals: { + '@tanstack/query-core': 'QueryCore', + vue: 'Vue', + 'vue-demi': 'Vue', + '@tanstack/match-sorter-utils': 'MatchSorter', + '@vue/devtools-api': 'DevtoolsApi', + }, + bundleUMDGlobals: [ + '@tanstack/query-core', + '@tanstack/match-sorter-utils', + '@vue/devtools-api', + ], + }), +]) diff --git a/tsconfig.json b/tsconfig.json index 05660b36a7..33fb9d9631 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,7 @@ { "compilerOptions": { + "allowJs": true, + "checkJs": true, "esModuleInterop": true, "noEmit": true, }, From 4cef00fe5da49548d5c180b37e53816a5c7067bc Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 27 May 2023 09:06:31 +1000 Subject: [PATCH 10/14] Convert rollup config to JSDoc --- package.json | 1 - pnpm-lock.yaml | 45 ++++----- project.json | 2 +- rollup.config.ts => rollup.config.mjs | 132 ++++++++++++++++---------- tsconfig.json | 2 +- 5 files changed, 104 insertions(+), 78 deletions(-) rename rollup.config.ts => rollup.config.mjs (76%) diff --git a/package.json b/package.json index d163add724..1331b8f26b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-terser": "^0.4.3", - "@rollup/plugin-typescript": "^11.1.1", "@solidjs/testing-library": "^0.5.1", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 69cd28b212..c154f429b6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,6 @@ importers: '@rollup/plugin-node-resolve': ^15.0.2 '@rollup/plugin-replace': ^5.0.2 '@rollup/plugin-terser': ^0.4.3 - '@rollup/plugin-typescript': ^11.1.1 '@solidjs/testing-library': ^0.5.1 '@testing-library/jest-dom': ^5.16.5 '@testing-library/react': ^14.0.0 @@ -85,7 +84,6 @@ importers: '@rollup/plugin-node-resolve': 15.0.2_rollup@3.23.0 '@rollup/plugin-replace': 5.0.2_rollup@3.23.0 '@rollup/plugin-terser': 0.4.3_rollup@3.23.0 - '@rollup/plugin-typescript': 11.1.1_3z2bg3rkwokrf7bt2qgphugr2y '@solidjs/testing-library': 0.5.2_solid-js@1.6.16 '@testing-library/jest-dom': 5.16.5 '@testing-library/react': 14.0.0_biqbaboplfbrettd7655fr4n2y @@ -253,7 +251,7 @@ importers: '@tanstack/query-sync-storage-persister': link:../../../packages/query-sync-storage-persister '@tanstack/react-query': link:../../../packages/react-query '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools - '@tanstack/react-query-persist-client': link:../../../packages/react-query-persist-client + '@tanstack/react-query-persist-client': 5.0.0-alpha.40_humrprwu6vw6cl2ap36kcn45uy axios: 1.4.0 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -367,7 +365,7 @@ importers: '@tanstack/react-location': 3.7.4_biqbaboplfbrettd7655fr4n2y '@tanstack/react-query': link:../../../packages/react-query '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools - '@tanstack/react-query-persist-client': link:../../../packages/react-query-persist-client + '@tanstack/react-query-persist-client': 5.0.0-alpha.40_humrprwu6vw6cl2ap36kcn45uy ky: 0.33.3 msw: 0.39.2 react: 18.2.0 @@ -4540,26 +4538,6 @@ packages: terser: 5.17.6 dev: true - /@rollup/plugin-typescript/11.1.1_3z2bg3rkwokrf7bt2qgphugr2y: - resolution: {integrity: sha512-Ioir+x5Bejv72Lx2Zbz3/qGg7tvGbxQZALCLoJaGrkNXak/19+vKgKYJYM3i/fJxvsb23I9FuFQ8CUBEfsmBRg==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.14.0||^3.0.0 - tslib: '*' - typescript: '>=3.7.0' - peerDependenciesMeta: - rollup: - optional: true - tslib: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2_rollup@3.23.0 - resolve: 1.22.2 - rollup: 3.23.0 - tslib: 2.5.2 - typescript: 5.0.4 - dev: true - /@rollup/pluginutils/3.1.0_rollup@3.23.0: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} @@ -4837,6 +4815,16 @@ packages: remove-accents: 0.4.2 dev: false + /@tanstack/query-core/5.0.0-alpha.38: + resolution: {integrity: sha512-V5sxUNw2heNjAv15fgFODWxvjpJ/cw9rUN/uS0jFJCGE25tGuuoTSuYaIneChiBkEEK99QEWESY7sypWQY9f1g==} + dev: false + + /@tanstack/query-persist-client-core/5.0.0-alpha.38: + resolution: {integrity: sha512-Nl+qcIgdUZj8Xccb4TBQV1u9qIakX7958+Ig77+YtpxxCpwWL605v/Lpxu5E0DIc/L6Oqvv2gq1LJaI1ZggRMg==} + dependencies: + '@tanstack/query-core': 5.0.0-alpha.38 + dev: false + /@tanstack/react-location/3.7.4_biqbaboplfbrettd7655fr4n2y: resolution: {integrity: sha512-6rH2vNHGr0uyeUz5ZHvWMYjeYKGgIKFzvs5749QtnS9f+FU7t7fQE0hKZAzltBZk82LT7iYbcHBRyUg2lW13VA==} engines: {node: '>=12'} @@ -4850,6 +4838,15 @@ packages: react-dom: 18.2.0_react@18.2.0 dev: false + /@tanstack/react-query-persist-client/5.0.0-alpha.40_humrprwu6vw6cl2ap36kcn45uy: + resolution: {integrity: sha512-RasVSA5mPyo/iFNg3DmyiJU9YbK0hBdFXjpGRyD1q3VxF6ve90i6eqxBBT+efWNA5LCfvsofHCh0ZNFmtZFXoA==} + peerDependencies: + '@tanstack/react-query': 5.0.0-alpha.38 + dependencies: + '@tanstack/query-persist-client-core': 5.0.0-alpha.38 + '@tanstack/react-query': link:packages/react-query + dev: false + /@testing-library/dom/8.18.1: resolution: {integrity: sha512-oEvsm2B/WtcHKE+IcEeeCqNU/ltFGaVyGbpcm4g/2ytuT49jrlH9x5qRKL/H3A6yfM4YAbSbC0ceT5+9CEXnLg==} engines: {node: '>=12'} diff --git a/project.json b/project.json index b0accff596..cb2f79301b 100644 --- a/project.json +++ b/project.json @@ -4,7 +4,7 @@ "sourceRoot": "./", "targets": { "rollup": { - "command": "rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript", + "command": "rollup --config rollup.config.mjs", "outputs": [ "{workspaceRoot}/packages/*/build/**/*(.cjs|.mjs|.js)*", "{workspaceRoot}/packages/*/build/stats*", diff --git a/rollup.config.ts b/rollup.config.mjs similarity index 76% rename from rollup.config.ts rename to rollup.config.mjs index 0a9d7a7890..7f991f05c2 100644 --- a/rollup.config.ts +++ b/rollup.config.mjs @@ -7,28 +7,30 @@ import replace from '@rollup/plugin-replace' import nodeResolve from '@rollup/plugin-node-resolve' import commonJS from '@rollup/plugin-commonjs' import withSolid from 'rollup-preset-solid' -import preserveDirectives from 'rollup-plugin-preserve-directives' -import type { OutputOptions, Plugin, RollupOptions } from 'rollup' - -type Options = { - input: string | string[] - packageDir: string - external: RollupOptions['external'] - jsName: string - outputFile: string - globals: Record - forceDevEnv: boolean - forceBundle: boolean -} - -const forceEnvPlugin = (type: 'development' | 'production') => +// import preserveDirectives from 'rollup-plugin-preserve-directives' + +/** + * @typedef {Object} Options + * @property {string | string[]} input - The input string or array of strings. + * @property {string} packageDir - The package directory. + * @property {import('rollup').RollupOptions['external']} external - The external options of Rollup. + * @property {string} jsName - The JavaScript name. + * @property {string} outputFile - The output file. + * @property {Record} globals - The globals record. + * @property {boolean} forceDevEnv - Flag indicating whether to force development environment. + * @property {boolean} forceBundle - Flag indicating whether to force bundling. + */ + +/** @param {'development' | 'production'} type */ +const forceEnvPlugin = (type) => replace({ 'process.env.NODE_ENV': `"${type}"`, delimiters: ['', ''], preventAssignment: true, }) -const babelPlugin = (type: 'legacy' | 'modern') => +/** @param {'legacy' | 'modern'} type */ +const babelPlugin = (type) => babel({ browserslistConfigFile: type === 'modern' ? true : false, targets: @@ -47,20 +49,21 @@ const babelPlugin = (type: 'legacy' | 'modern') => extensions: ['.ts', '.tsx', '.native.ts'], }) -function buildConfigs(opts: { - packageDir: string - name: string - jsName: string - outputFile: string - entryFile: string | string[] - globals: Record - // This option allows to bundle specified dependencies for umd build - bundleUMDGlobals?: string[] - // Force prod env build - forceDevEnv?: boolean - forceBundle?: boolean - skipUmdBuild?: boolean -}): RollupOptions[] { +/** + * @param {Object} opts - Options for building configurations. + * @param {string} opts.packageDir - The package directory. + * @param {string} opts.name - The name. + * @param {string} opts.jsName - The JavaScript name. + * @param {string} opts.outputFile - The output file. + * @param {string | string[]} opts.entryFile - The entry file or array of entry files. + * @param {Record} opts.globals - The globals record. + * @param {string[]} [opts.bundleUMDGlobals] - List of dependencies to bundle for UMD build. + * @param {boolean} [opts.forceDevEnv] - Flag indicating whether to force development environment. + * @param {boolean} [opts.forceBundle] - Flag indicating whether to force bundling. + * @param {boolean} [opts.skipUmdBuild] - Flag indicating whether to skip UMD build. + * @returns {import('rollup').RollupOptions[]} + */ +function buildConfigs(opts) { const firstEntry = path.resolve( opts.packageDir, Array.isArray(opts.entryFile) ? opts.entryFile[0] : opts.entryFile, @@ -78,7 +81,8 @@ function buildConfigs(opts: { const external = (moduleName) => externalDeps.includes(moduleName) - const options: Options = { + /** @type {Options} */ + const options = { input, jsName: opts.jsName, outputFile: opts.outputFile, @@ -101,6 +105,10 @@ function buildConfigs(opts: { return builds } +/** + * @param {Options} options - Options for building configurations. + * @returns {import('rollup').RollupOptions} + */ function mjs({ input, packageDir, @@ -108,14 +116,16 @@ function mjs({ outputFile, forceDevEnv, forceBundle, -}: Options): RollupOptions { - const bundleOutput: OutputOptions = { +}) { + /** @type {import('rollup').OutputOptions} */ + const bundleOutput = { format: 'esm', file: `${packageDir}/build/lib/${outputFile}.mjs`, sourcemap: true, } - const normalOutput: OutputOptions = { + /** @type {import('rollup').OutputOptions} */ + const normalOutput = { format: 'esm', dir: `${packageDir}/build/lib`, sourcemap: true, @@ -133,11 +143,15 @@ function mjs({ commonJS(), nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }), forceDevEnv ? forceEnvPlugin('development') : undefined, - preserveDirectives(), + // preserveDirectives(), ], } } +/** + * @param {Options} options - Options for building configurations. + * @returns {import('rollup').RollupOptions} + */ function esm({ input, packageDir, @@ -145,14 +159,16 @@ function esm({ outputFile, forceDevEnv, forceBundle, -}: Options): RollupOptions { - const bundleOutput: OutputOptions = { +}) { + /** @type {import('rollup').OutputOptions} */ + const bundleOutput = { format: 'esm', file: `${packageDir}/build/lib/${outputFile}.esm.js`, sourcemap: true, } - const normalOutput: OutputOptions = { + /** @type {import('rollup').OutputOptions} */ + const normalOutput = { format: 'esm', dir: `${packageDir}/build/lib`, sourcemap: true, @@ -170,11 +186,15 @@ function esm({ commonJS(), nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }), forceDevEnv ? forceEnvPlugin('development') : undefined, - preserveDirectives(), + // preserveDirectives(), ], } } +/** + * @param {Options} options - Options for building configurations. + * @returns {import('rollup').RollupOptions} + */ function cjs({ input, external, @@ -182,15 +202,17 @@ function cjs({ outputFile, forceDevEnv, forceBundle, -}: Options): RollupOptions { - const bundleOutput: OutputOptions = { +}) { + /** @type {import('rollup').OutputOptions} */ + const bundleOutput = { format: 'cjs', file: `${packageDir}/build/lib/${outputFile}.js`, sourcemap: true, exports: 'named', } - const normalOutput: OutputOptions = { + /** @type {import('rollup').OutputOptions} */ + const normalOutput = { format: 'cjs', dir: `${packageDir}/build/lib`, sourcemap: true, @@ -209,11 +231,15 @@ function cjs({ commonJS(), nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }), forceDevEnv ? forceEnvPlugin('development') : undefined, - preserveDirectives(), + // preserveDirectives(), ], } } +/** + * @param {Options} options - Options for building configurations. + * @returns {import('rollup').RollupOptions} + */ function umdDev({ input, external, @@ -221,7 +247,7 @@ function umdDev({ outputFile, globals, jsName, -}: Options): RollupOptions { +}) { return { // UMD (Dev) external, @@ -242,6 +268,10 @@ function umdDev({ } } +/** + * @param {Options} options - Options for building configurations. + * @returns {import('rollup').RollupOptions} + */ function umdProd({ input, external, @@ -249,7 +279,7 @@ function umdProd({ outputFile, globals, jsName, -}: Options): RollupOptions { +}) { return { // UMD (Prod) external, @@ -286,11 +316,11 @@ function umdProd({ function createSolidQueryConfig() { const packageDir = 'packages/solid-query' - const solidRollupOptions = withSolid({ + const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ (withSolid({ input: `${packageDir}/src/index.ts`, targets: ['esm', 'cjs', 'umd'], external: ['@tanstack/query-core'], - }) as RollupOptions + })) const outputs = !solidRollupOptions.output ? [] @@ -311,7 +341,7 @@ function createSolidQueryConfig() { output.dir = `${packageDir}/build/${format}` }) - const plugins = solidRollupOptions.plugins as Plugin[] + const plugins = /** @type {import('rollup').Plugin[]} */ (solidRollupOptions.plugins) // Prevent types generation since it doesn't resolve the directory correctly // Instead build:types will generate those types anyway const filtered = plugins.filter((plugin) => plugin.name !== 'ts') @@ -323,10 +353,10 @@ function createSolidQueryConfig() { function createTanstackQueryDevtoolsConfig() { const packageDir = 'packages/query-devtools' - const solidRollupOptions = withSolid({ + const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ (withSolid({ input: `${packageDir}/src/index.tsx`, targets: ['esm', 'cjs', 'umd'], - }) as RollupOptions + })) const outputs = !solidRollupOptions.output ? [] @@ -345,7 +375,7 @@ function createTanstackQueryDevtoolsConfig() { solidRollupOptions.external = [] - const plugins = solidRollupOptions.plugins as Plugin[] + const plugins = /** @type {import('rollup').Plugin[]} */ (solidRollupOptions.plugins) // Prevent types generation since it doesn't resolve the directory correctly // Instead build:types will generate those types anyway const filtered = plugins.filter((plugin) => plugin.name !== 'ts') diff --git a/tsconfig.json b/tsconfig.json index 33fb9d9631..822ac88e14 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,5 +5,5 @@ "esModuleInterop": true, "noEmit": true, }, - "include": ["rollup.config.ts"] + "include": ["rollup.config.mjs"] } From f9adfb26abb654362b63cc1f4a9901574e067530 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 27 May 2023 09:23:47 +1000 Subject: [PATCH 11/14] More config --- rollup.config.mjs | 12 ++++++++---- tsconfig.json | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rollup.config.mjs b/rollup.config.mjs index 7f991f05c2..1f04f75166 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -1,4 +1,5 @@ -import path from 'node:path' +import { resolve } from 'node:path' +import { fileURLToPath } from "node:url" import { defineConfig } from 'rollup' import babel from '@rollup/plugin-babel' import terser from '@rollup/plugin-terser' @@ -9,6 +10,8 @@ import commonJS from '@rollup/plugin-commonjs' import withSolid from 'rollup-preset-solid' // import preserveDirectives from 'rollup-plugin-preserve-directives' +const __dirname = fileURLToPath(new URL(".", import.meta.url)); + /** * @typedef {Object} Options * @property {string | string[]} input - The input string or array of strings. @@ -32,6 +35,7 @@ const forceEnvPlugin = (type) => /** @param {'legacy' | 'modern'} type */ const babelPlugin = (type) => babel({ + configFile: resolve(__dirname, 'babel.config.js'), browserslistConfigFile: type === 'modern' ? true : false, targets: type === 'modern' @@ -63,15 +67,15 @@ const babelPlugin = (type) => * @param {boolean} [opts.skipUmdBuild] - Flag indicating whether to skip UMD build. * @returns {import('rollup').RollupOptions[]} */ -function buildConfigs(opts) { - const firstEntry = path.resolve( +export function buildConfigs(opts) { + const firstEntry = resolve( opts.packageDir, Array.isArray(opts.entryFile) ? opts.entryFile[0] : opts.entryFile, ) const entries = Array.isArray(opts.entryFile) ? opts.entryFile : [opts.entryFile] - const input = entries.map((entry) => path.resolve(opts.packageDir, entry)) + const input = entries.map((entry) => resolve(opts.packageDir, entry)) const externalDeps = Object.keys(opts.globals) const bundleUMDGlobals = opts.bundleUMDGlobals || [] diff --git a/tsconfig.json b/tsconfig.json index 822ac88e14..732e7821be 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,8 @@ "allowJs": true, "checkJs": true, "esModuleInterop": true, + "module": "ES2020", + "moduleResolution": "node", "noEmit": true, }, "include": ["rollup.config.mjs"] From cdfdf753b5f48f3d409ffe80685d8c0bb117af5e Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 27 May 2023 14:44:23 +1000 Subject: [PATCH 12/14] Remove tslib from root --- examples/svelte/auto-refetching/package.json | 1 + examples/svelte/basic/package.json | 1 + .../load-more-infinite-scroll/package.json | 1 + .../package.json | 1 + examples/svelte/playground/package.json | 1 + examples/svelte/simple/package.json | 1 + examples/svelte/ssr/package.json | 1 + examples/svelte/star-wars/package.json | 1 + package.json | 1 - packages/svelte-query-devtools/package.json | 1 + packages/svelte-query/package.json | 1 + pnpm-lock.yaml | 390 ++++++------------ tsconfig.json | 15 +- 13 files changed, 140 insertions(+), 276 deletions(-) diff --git a/examples/svelte/auto-refetching/package.json b/examples/svelte/auto-refetching/package.json index 156d73b348..3c343e9a78 100644 --- a/examples/svelte/auto-refetching/package.json +++ b/examples/svelte/auto-refetching/package.json @@ -17,6 +17,7 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/basic/package.json b/examples/svelte/basic/package.json index 33a9c94d34..5ae4ebf48b 100644 --- a/examples/svelte/basic/package.json +++ b/examples/svelte/basic/package.json @@ -17,6 +17,7 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/load-more-infinite-scroll/package.json b/examples/svelte/load-more-infinite-scroll/package.json index 196ebde6e4..6c6028f5d3 100644 --- a/examples/svelte/load-more-infinite-scroll/package.json +++ b/examples/svelte/load-more-infinite-scroll/package.json @@ -17,6 +17,7 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/optimistic-updates-typescript/package.json b/examples/svelte/optimistic-updates-typescript/package.json index 78ab62177d..06955fb881 100644 --- a/examples/svelte/optimistic-updates-typescript/package.json +++ b/examples/svelte/optimistic-updates-typescript/package.json @@ -17,6 +17,7 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/playground/package.json b/examples/svelte/playground/package.json index 835caea4ed..89577694a6 100644 --- a/examples/svelte/playground/package.json +++ b/examples/svelte/playground/package.json @@ -17,6 +17,7 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/simple/package.json b/examples/svelte/simple/package.json index f5c4845154..5d89257aad 100644 --- a/examples/svelte/simple/package.json +++ b/examples/svelte/simple/package.json @@ -17,6 +17,7 @@ "@tsconfig/svelte": "^4.0.1", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/ssr/package.json b/examples/svelte/ssr/package.json index 1e2238932e..def5dc749b 100644 --- a/examples/svelte/ssr/package.json +++ b/examples/svelte/ssr/package.json @@ -17,6 +17,7 @@ "@sveltejs/kit": "^1.19.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/examples/svelte/star-wars/package.json b/examples/svelte/star-wars/package.json index aea767d7dd..3ec6f0c4e9 100644 --- a/examples/svelte/star-wars/package.json +++ b/examples/svelte/star-wars/package.json @@ -20,6 +20,7 @@ "svelte": "^3.54.0", "svelte-check": "^3.3.2", "tailwindcss": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" } diff --git a/package.json b/package.json index 1331b8f26b..8e4256c103 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,6 @@ "solid-js": "^1.6.13", "stream-to-array": "^2.3.0", "ts-node": "^10.9.1", - "tslib": "^2.5.2", "typescript": "^5.0.4", "vitest": "^0.27.1", "vue": "^3.2.47" diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json index 04d594dfaf..fe9d62a212 100644 --- a/packages/svelte-query-devtools/package.json +++ b/packages/svelte-query-devtools/package.json @@ -41,6 +41,7 @@ "jsdom": "^22.0.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" }, diff --git a/packages/svelte-query/package.json b/packages/svelte-query/package.json index c1f02105f7..1c0523f63e 100644 --- a/packages/svelte-query/package.json +++ b/packages/svelte-query/package.json @@ -45,6 +45,7 @@ "jsdom": "^22.0.0", "svelte": "^3.54.0", "svelte-check": "^3.3.2", + "tslib": "^2.5.2", "typescript": "^5.0.4", "vite": "^4.2.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c154f429b6..0fd50dc3da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,12 +64,11 @@ importers: rollup: ^3.23.0 rollup-plugin-preserve-directives: ^0.1.1 rollup-plugin-visualizer: ^5.9.0 - rollup-preset-solid: ^2.0.1 + rollup-preset-solid: ^1.4.0 semver: ^7.5.1 solid-js: ^1.6.13 stream-to-array: ^2.3.0 ts-node: ^10.9.1 - tslib: ^2.5.2 typescript: ^5.0.4 vitest: ^0.27.1 vue: ^3.2.47 @@ -129,12 +128,11 @@ importers: rollup: 3.23.0 rollup-plugin-preserve-directives: 0.1.1_rollup@3.23.0 rollup-plugin-visualizer: 5.9.0_rollup@3.23.0 - rollup-preset-solid: 2.0.1 + rollup-preset-solid: 1.4.0 semver: 7.5.1 solid-js: 1.6.16 stream-to-array: 2.3.0 ts-node: 10.9.1_ztltjo43tmsep75uum5mceyifa - tslib: 2.5.2 typescript: 5.0.4 vitest: 0.27.3 vue: 3.2.47 @@ -251,7 +249,7 @@ importers: '@tanstack/query-sync-storage-persister': link:../../../packages/query-sync-storage-persister '@tanstack/react-query': link:../../../packages/react-query '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools - '@tanstack/react-query-persist-client': 5.0.0-alpha.40_humrprwu6vw6cl2ap36kcn45uy + '@tanstack/react-query-persist-client': link:../../../packages/react-query-persist-client axios: 1.4.0 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -365,7 +363,7 @@ importers: '@tanstack/react-location': 3.7.4_biqbaboplfbrettd7655fr4n2y '@tanstack/react-query': link:../../../packages/react-query '@tanstack/react-query-devtools': link:../../../packages/react-query-devtools - '@tanstack/react-query-persist-client': 5.0.0-alpha.40_humrprwu6vw6cl2ap36kcn45uy + '@tanstack/react-query-persist-client': link:../../../packages/react-query-persist-client ky: 0.33.3 msw: 0.39.2 react: 18.2.0 @@ -741,6 +739,7 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -750,6 +749,7 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -760,6 +760,7 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -769,6 +770,7 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -779,6 +781,7 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -788,6 +791,7 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -798,6 +802,7 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -807,6 +812,7 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -817,6 +823,7 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -826,6 +833,7 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -836,6 +844,7 @@ importers: '@tsconfig/svelte': ^4.0.1 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -845,6 +854,7 @@ importers: '@tsconfig/svelte': 4.0.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -855,6 +865,7 @@ importers: '@tanstack/svelte-query': ^5.0.0-alpha.38 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -864,6 +875,7 @@ importers: '@sveltejs/kit': 1.19.0_svelte@3.55.0+vite@4.2.1 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -877,6 +889,7 @@ importers: svelte: ^3.54.0 svelte-check: ^3.3.2 tailwindcss: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -889,6 +902,7 @@ importers: svelte: 3.55.0 svelte-check: 3.3.2_unnuimhrmy7wkrlhr4xd5f5uky tailwindcss: 3.3.2 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -1089,6 +1103,7 @@ importers: jsdom: ^22.0.0 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -1101,6 +1116,7 @@ importers: jsdom: 22.0.0 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -1116,6 +1132,7 @@ importers: jsdom: ^22.0.0 svelte: ^3.54.0 svelte-check: ^3.3.2 + tslib: ^2.5.2 typescript: ^5.0.4 vite: ^4.2.0 dependencies: @@ -1130,6 +1147,7 @@ importers: jsdom: 22.0.0 svelte: 3.55.0 svelte-check: 3.3.2_svelte@3.55.0 + tslib: 2.5.2 typescript: 5.0.4 vite: 4.2.1 @@ -2879,15 +2897,6 @@ packages: resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} dev: false - /@esbuild/android-arm/0.15.18: - resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm/0.17.14: resolution: {integrity: sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==} engines: {node: '>=12'} @@ -2976,15 +2985,6 @@ packages: requiresBuild: true optional: true - /@esbuild/linux-loong64/0.15.18: - resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64/0.17.14: resolution: {integrity: sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==} engines: {node: '>=12'} @@ -4398,6 +4398,23 @@ packages: engines: {node: '>=14'} dev: false + /@rollup/plugin-babel/5.3.1_ixpapmkxoyzypvxfdre42vzpgy: + resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==} + engines: {node: '>= 10.0.0'} + peerDependencies: + '@babel/core': ^7.0.0 + '@types/babel__core': ^7.1.9 + rollup: ^1.20.0||^2.0.0 + peerDependenciesMeta: + '@types/babel__core': + optional: true + dependencies: + '@babel/core': 7.21.8 + '@babel/helper-module-imports': 7.21.4 + '@rollup/pluginutils': 3.1.0_rollup@2.79.1 + rollup: 2.79.1 + dev: true + /@rollup/plugin-babel/6.0.3_lxlhoxoxyvbpb2ro632dgii55q: resolution: {integrity: sha512-fKImZKppa1A/gX73eg4JGo+8kQr/q1HBQaCGKECZ0v4YBBv3lFqi14+7xyApECzvkLTHCifx+7ntcrvtBIRcpg==} engines: {node: '>=14.0.0'} @@ -4464,6 +4481,21 @@ packages: '@rollup/pluginutils': 5.0.2_rollup@3.23.0 rollup: 3.23.0 + /@rollup/plugin-node-resolve/13.3.0_rollup@2.79.1: + resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==} + engines: {node: '>= 10.0.0'} + peerDependencies: + rollup: ^2.42.0 + dependencies: + '@rollup/pluginutils': 3.1.0_rollup@2.79.1 + '@types/resolve': 1.17.1 + deepmerge: 4.3.1 + is-builtin-module: 3.2.1 + is-module: 1.0.0 + resolve: 1.22.2 + rollup: 2.79.1 + dev: true + /@rollup/plugin-node-resolve/13.3.0_rollup@3.23.0: resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==} engines: {node: '>= 10.0.0'} @@ -4510,19 +4542,6 @@ packages: rollup: 3.23.0 dev: true - /@rollup/plugin-terser/0.1.0_rollup@3.23.0: - resolution: {integrity: sha512-N2KK+qUfHX2hBzVzM41UWGLrEmcjVC37spC8R3c9mt3oEDFKh3N2e12/lLp9aVSt86veR0TQiCNQXrm8C6aiUQ==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.x || ^3.x - peerDependenciesMeta: - rollup: - optional: true - dependencies: - rollup: 3.23.0 - terser: 5.17.6 - dev: true - /@rollup/plugin-terser/0.4.3_rollup@3.23.0: resolution: {integrity: sha512-EF0oejTMtkyhrkwCdg0HJ0IpkcaVg1MMSf2olHb2Jp+1mnLM04OhjpJWGma4HobiDTF0WCyViWuvadyE9ch2XA==} engines: {node: '>=14.0.0'} @@ -4538,6 +4557,18 @@ packages: terser: 5.17.6 dev: true + /@rollup/pluginutils/3.1.0_rollup@2.79.1: + resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} + engines: {node: '>= 8.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0 + dependencies: + '@types/estree': 0.0.39 + estree-walker: 1.0.1 + picomatch: 2.3.1 + rollup: 2.79.1 + dev: true + /@rollup/pluginutils/3.1.0_rollup@3.23.0: resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} @@ -4815,16 +4846,6 @@ packages: remove-accents: 0.4.2 dev: false - /@tanstack/query-core/5.0.0-alpha.38: - resolution: {integrity: sha512-V5sxUNw2heNjAv15fgFODWxvjpJ/cw9rUN/uS0jFJCGE25tGuuoTSuYaIneChiBkEEK99QEWESY7sypWQY9f1g==} - dev: false - - /@tanstack/query-persist-client-core/5.0.0-alpha.38: - resolution: {integrity: sha512-Nl+qcIgdUZj8Xccb4TBQV1u9qIakX7958+Ig77+YtpxxCpwWL605v/Lpxu5E0DIc/L6Oqvv2gq1LJaI1ZggRMg==} - dependencies: - '@tanstack/query-core': 5.0.0-alpha.38 - dev: false - /@tanstack/react-location/3.7.4_biqbaboplfbrettd7655fr4n2y: resolution: {integrity: sha512-6rH2vNHGr0uyeUz5ZHvWMYjeYKGgIKFzvs5749QtnS9f+FU7t7fQE0hKZAzltBZk82LT7iYbcHBRyUg2lW13VA==} engines: {node: '>=12'} @@ -4838,15 +4859,6 @@ packages: react-dom: 18.2.0_react@18.2.0 dev: false - /@tanstack/react-query-persist-client/5.0.0-alpha.40_humrprwu6vw6cl2ap36kcn45uy: - resolution: {integrity: sha512-RasVSA5mPyo/iFNg3DmyiJU9YbK0hBdFXjpGRyD1q3VxF6ve90i6eqxBBT+efWNA5LCfvsofHCh0ZNFmtZFXoA==} - peerDependencies: - '@tanstack/react-query': 5.0.0-alpha.38 - dependencies: - '@tanstack/query-persist-client-core': 5.0.0-alpha.38 - '@tanstack/react-query': link:packages/react-query - dev: false - /@testing-library/dom/8.18.1: resolution: {integrity: sha512-oEvsm2B/WtcHKE+IcEeeCqNU/ltFGaVyGbpcm4g/2ytuT49jrlH9x5qRKL/H3A6yfM4YAbSbC0ceT5+9CEXnLg==} engines: {node: '>=12'} @@ -7703,15 +7715,6 @@ packages: requiresBuild: true optional: true - /esbuild-android-64/0.15.18: - resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - /esbuild-android-arm64/0.14.54: resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==} engines: {node: '>=12'} @@ -7720,15 +7723,6 @@ packages: requiresBuild: true optional: true - /esbuild-android-arm64/0.15.18: - resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /esbuild-darwin-64/0.14.54: resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==} engines: {node: '>=12'} @@ -7737,15 +7731,6 @@ packages: requiresBuild: true optional: true - /esbuild-darwin-64/0.15.18: - resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /esbuild-darwin-arm64/0.14.54: resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==} engines: {node: '>=12'} @@ -7754,15 +7739,6 @@ packages: requiresBuild: true optional: true - /esbuild-darwin-arm64/0.15.18: - resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /esbuild-freebsd-64/0.14.54: resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==} engines: {node: '>=12'} @@ -7771,15 +7747,6 @@ packages: requiresBuild: true optional: true - /esbuild-freebsd-64/0.15.18: - resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /esbuild-freebsd-arm64/0.14.54: resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==} engines: {node: '>=12'} @@ -7788,15 +7755,6 @@ packages: requiresBuild: true optional: true - /esbuild-freebsd-arm64/0.15.18: - resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-32/0.14.54: resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==} engines: {node: '>=12'} @@ -7805,15 +7763,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-32/0.15.18: - resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-64/0.14.54: resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==} engines: {node: '>=12'} @@ -7822,15 +7771,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-64/0.15.18: - resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-arm/0.14.54: resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==} engines: {node: '>=12'} @@ -7839,15 +7779,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-arm/0.15.18: - resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-arm64/0.14.54: resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==} engines: {node: '>=12'} @@ -7856,15 +7787,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-arm64/0.15.18: - resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-mips64le/0.14.54: resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==} engines: {node: '>=12'} @@ -7873,15 +7795,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-mips64le/0.15.18: - resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-ppc64le/0.14.54: resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==} engines: {node: '>=12'} @@ -7890,15 +7803,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-ppc64le/0.15.18: - resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-riscv64/0.14.54: resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==} engines: {node: '>=12'} @@ -7907,15 +7811,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-riscv64/0.15.18: - resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-linux-s390x/0.14.54: resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==} engines: {node: '>=12'} @@ -7924,15 +7819,6 @@ packages: requiresBuild: true optional: true - /esbuild-linux-s390x/0.15.18: - resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - /esbuild-netbsd-64/0.14.54: resolution: {integrity: sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==} engines: {node: '>=12'} @@ -7941,15 +7827,6 @@ packages: requiresBuild: true optional: true - /esbuild-netbsd-64/0.15.18: - resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - /esbuild-openbsd-64/0.14.54: resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==} engines: {node: '>=12'} @@ -7958,15 +7835,6 @@ packages: requiresBuild: true optional: true - /esbuild-openbsd-64/0.15.18: - resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - /esbuild-plugin-solid/0.4.2_ajcandgzujanbl7g4gahkpcrcq: resolution: {integrity: sha512-T5GphLoud3RumjeNYO3K9WVjWDzVKG5evlS7hUEUI0n9tiCL+CnbvJh3SSwFi3xeeXpZRrnZc1gd6FWQsVobTg==} peerDependencies: @@ -7989,15 +7857,6 @@ packages: requiresBuild: true optional: true - /esbuild-sunos-64/0.15.18: - resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-32/0.14.54: resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==} engines: {node: '>=12'} @@ -8006,15 +7865,6 @@ packages: requiresBuild: true optional: true - /esbuild-windows-32/0.15.18: - resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-64/0.14.54: resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==} engines: {node: '>=12'} @@ -8023,15 +7873,6 @@ packages: requiresBuild: true optional: true - /esbuild-windows-64/0.15.18: - resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild-windows-arm64/0.14.54: resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==} engines: {node: '>=12'} @@ -8040,15 +7881,6 @@ packages: requiresBuild: true optional: true - /esbuild-windows-arm64/0.15.18: - resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /esbuild/0.14.54: resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==} engines: {node: '>=12'} @@ -8077,36 +7909,6 @@ packages: esbuild-windows-64: 0.14.54 esbuild-windows-arm64: 0.14.54 - /esbuild/0.15.18: - resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.15.18 - '@esbuild/linux-loong64': 0.15.18 - esbuild-android-64: 0.15.18 - esbuild-android-arm64: 0.15.18 - esbuild-darwin-64: 0.15.18 - esbuild-darwin-arm64: 0.15.18 - esbuild-freebsd-64: 0.15.18 - esbuild-freebsd-arm64: 0.15.18 - esbuild-linux-32: 0.15.18 - esbuild-linux-64: 0.15.18 - esbuild-linux-arm: 0.15.18 - esbuild-linux-arm64: 0.15.18 - esbuild-linux-mips64le: 0.15.18 - esbuild-linux-ppc64le: 0.15.18 - esbuild-linux-riscv64: 0.15.18 - esbuild-linux-s390x: 0.15.18 - esbuild-netbsd-64: 0.15.18 - esbuild-openbsd-64: 0.15.18 - esbuild-sunos-64: 0.15.18 - esbuild-windows-32: 0.15.18 - esbuild-windows-64: 0.15.18 - esbuild-windows-arm64: 0.15.18 - dev: true - /esbuild/0.17.14: resolution: {integrity: sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==} engines: {node: '>=12'} @@ -10471,6 +10273,15 @@ packages: pretty-format: 26.6.2 dev: false + /jest-worker/26.6.2: + resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} + engines: {node: '>= 10.13.0'} + dependencies: + '@types/node': 18.13.0 + merge-stream: 2.0.0 + supports-color: 7.2.0 + dev: true + /jest-worker/27.5.1: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} @@ -11987,7 +11798,7 @@ packages: tar-stream: 2.2.0 tmp: 0.2.1 tsconfig-paths: 4.1.2 - tslib: 2.5.2 + tslib: 2.5.0 v8-compile-cache: 2.3.0 yargs: 17.7.1 yargs-parser: 21.1.1 @@ -13420,6 +13231,19 @@ packages: rollup: 3.23.0 dev: true + /rollup-plugin-terser/7.0.2_rollup@2.79.1: + resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==} + deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser + peerDependencies: + rollup: ^2.0.0 + dependencies: + '@babel/code-frame': 7.21.4 + jest-worker: 26.6.2 + rollup: 2.79.1 + serialize-javascript: 4.0.0 + terser: 5.17.6 + dev: true + /rollup-plugin-visualizer/5.9.0_rollup@3.23.0: resolution: {integrity: sha512-bbDOv47+Bw4C/cgs0czZqfm8L82xOZssk4ayZjG40y9zbXclNk7YikrZTDao6p7+HDiGxrN0b65SgZiVm9k1Cg==} engines: {node: '>=14'} @@ -13436,20 +13260,20 @@ packages: source-map: 0.7.4 yargs: 17.5.1 - /rollup-preset-solid/2.0.1: - resolution: {integrity: sha512-CPJn3SqADlIxhAW3jwZuAFRyZcz7HPeUAz4f+6BzulxHnK4v6tgoTbMvk8vEsfsvHwiTmX93KHIKdf79aTdVSA==} + /rollup-preset-solid/1.4.0: + resolution: {integrity: sha512-rjUH0dMkyHxkin1uBcdZX110DL/P0hppMWF0RAwJdl7ly9IH/N+jHxmnyf7OzkyI2pGUBO9Lr1NN8Me9TFKN6Q==} dependencies: '@babel/core': 7.21.8 '@babel/preset-env': 7.21.5_@babel+core@7.21.8 '@babel/preset-typescript': 7.21.5_@babel+core@7.21.8 - '@rollup/plugin-babel': 6.0.3_lxlhoxoxyvbpb2ro632dgii55q - '@rollup/plugin-node-resolve': 15.0.2_rollup@3.23.0 - '@rollup/plugin-terser': 0.1.0_rollup@3.23.0 + '@rollup/plugin-babel': 5.3.1_ixpapmkxoyzypvxfdre42vzpgy + '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 babel-preset-solid: 1.6.10_@babel+core@7.21.8 colorette: 2.0.19 - esbuild: 0.15.18 + esbuild: 0.14.54 merge-anything: 5.1.4 - rollup: 3.23.0 + rollup: 2.79.1 + rollup-plugin-terser: 7.0.2_rollup@2.79.1 typescript: 4.9.5 transitivePeerDependencies: - '@types/babel__core' @@ -13465,6 +13289,14 @@ packages: rollup: 3.23.0 route-sort: 1.0.0 + /rollup/2.79.1: + resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} + engines: {node: '>=10.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + /rollup/3.23.0: resolution: {integrity: sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -13627,6 +13459,12 @@ packages: type-fest: 0.12.0 dev: false + /serialize-javascript/4.0.0: + resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==} + dependencies: + randombytes: 2.1.0 + dev: true + /serialize-javascript/6.0.1: resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} dependencies: @@ -14946,6 +14784,10 @@ packages: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true + /tslib/2.5.0: + resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} + dev: true + /tslib/2.5.2: resolution: {integrity: sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==} diff --git a/tsconfig.json b/tsconfig.json index 732e7821be..0b4f1e2cec 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,5 +7,18 @@ "moduleResolution": "node", "noEmit": true, }, - "include": ["rollup.config.mjs"] + "include": ["rollup.config.mjs"], + "references": [ + { "path": "packages/query-core" }, + { "path": "packages/query-persist-client-core" }, + { "path": "packages/query-async-storage-persister" }, + { "path": "packages/query-broadcast-client-experimental" }, + { "path": "packages/query-sync-storage-persister" }, + { "path": "packages/react-query" }, + { "path": "packages/react-query-devtools" }, + { "path": "packages/react-query-persist-client" }, + { "path": "packages/solid-query" }, + { "path": "packages/vue-query" }, + { "path": "packages/query-devtools" } + ] } From 01cdd0150a940f7ceea2903352f1f6b6ba4d2978 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Mon, 29 May 2023 06:44:12 +1000 Subject: [PATCH 13/14] Update rollup-plugin-preserve-directives --- package.json | 2 +- pnpm-lock.yaml | 13 ++++--------- rollup.config.mjs | 8 ++++---- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 566ffed933..6e417b04f9 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "react-dom": "^18.2.0", "rimraf": "^4.1.2", "rollup": "^3.23.0", - "rollup-plugin-preserve-directives": "^0.1.1", + "rollup-plugin-preserve-directives": "^0.2.0", "rollup-plugin-visualizer": "^5.9.0", "rollup-preset-solid": "^2.0.1", "semver": "^7.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7f739ae81..000a1960c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -157,8 +157,8 @@ importers: specifier: ^3.23.0 version: 3.23.0 rollup-plugin-preserve-directives: - specifier: ^0.1.1 - version: 0.1.1(rollup@3.23.0) + specifier: ^0.2.0 + version: 0.2.0(rollup@3.23.0) rollup-plugin-visualizer: specifier: ^5.9.0 version: 5.9.0(rollup@3.23.0) @@ -6425,11 +6425,6 @@ packages: engines: {node: '>= 0.4'} dev: true - /axe-core@4.6.3: - resolution: {integrity: sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==} - engines: {node: '>=4'} - dev: true - /axios@0.24.0: resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==} dependencies: @@ -14180,8 +14175,8 @@ packages: hasBin: true dev: true - /rollup-plugin-preserve-directives@0.1.1(rollup@3.23.0): - resolution: {integrity: sha512-htKdBt+0ONtxIx2nB10vmQwNn7xJrAKR+HL4rCiP972s6bVlFYaUBm3dXFGfD29Ur/LTOtSakmASi9EUdq/MPQ==} + /rollup-plugin-preserve-directives@0.2.0(rollup@3.23.0): + resolution: {integrity: sha512-KUwbBaFvD1zFIDNnOkR+u64sSod3m0l6q46/SzTOa4GTQ6hp6w0FRr2u7x99YkY9qhlna5panmTmuLWeJ/2KWw==} peerDependencies: rollup: 2.x || 3.x dependencies: diff --git a/rollup.config.mjs b/rollup.config.mjs index 1f04f75166..7455435f68 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -8,7 +8,7 @@ import replace from '@rollup/plugin-replace' import nodeResolve from '@rollup/plugin-node-resolve' import commonJS from '@rollup/plugin-commonjs' import withSolid from 'rollup-preset-solid' -// import preserveDirectives from 'rollup-plugin-preserve-directives' +import preserveDirectives from 'rollup-plugin-preserve-directives' const __dirname = fileURLToPath(new URL(".", import.meta.url)); @@ -147,7 +147,7 @@ function mjs({ commonJS(), nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }), forceDevEnv ? forceEnvPlugin('development') : undefined, - // preserveDirectives(), + preserveDirectives(), ], } } @@ -190,7 +190,7 @@ function esm({ commonJS(), nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }), forceDevEnv ? forceEnvPlugin('development') : undefined, - // preserveDirectives(), + preserveDirectives(), ], } } @@ -235,7 +235,7 @@ function cjs({ commonJS(), nodeResolve({ extensions: ['.ts', '.tsx', '.native.ts'] }), forceDevEnv ? forceEnvPlugin('development') : undefined, - // preserveDirectives(), + preserveDirectives(), ], } } From 13faf290d7ce14a79300e879973a958d2ffacf11 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Mon, 29 May 2023 06:50:43 +1000 Subject: [PATCH 14/14] Add back rollup-plugin-size --- package.json | 1 + pnpm-lock.yaml | 33 +++++++++++++++++++++++++++++++++ rollup.config.mjs | 8 ++++++-- tsconfig.base.json | 2 +- tsconfig.json | 10 +--------- 5 files changed, 42 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 6e417b04f9..0ee01170c7 100644 --- a/package.json +++ b/package.json @@ -81,6 +81,7 @@ "rimraf": "^4.1.2", "rollup": "^3.23.0", "rollup-plugin-preserve-directives": "^0.2.0", + "rollup-plugin-size": "^0.3.1", "rollup-plugin-visualizer": "^5.9.0", "rollup-preset-solid": "^2.0.1", "semver": "^7.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 000a1960c5..f5d1832d77 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -159,6 +159,9 @@ importers: rollup-plugin-preserve-directives: specifier: ^0.2.0 version: 0.2.0(rollup@3.23.0) + rollup-plugin-size: + specifier: ^0.3.1 + version: 0.3.1 rollup-plugin-visualizer: specifier: ^5.9.0 version: 5.9.0(rollup@3.23.0) @@ -6992,6 +6995,11 @@ packages: ansi-styles: 4.3.0 supports-color: 7.2.0 + /chalk@5.2.0: + resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + dev: true + /chardet@0.7.0: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} dev: false @@ -13300,6 +13308,11 @@ packages: engines: {node: '>=6'} dev: false + /pretty-bytes@6.1.0: + resolution: {integrity: sha512-Rk753HI8f4uivXi4ZCIYdhmG1V+WKzvRMg/X+M42a6t7D07RcmopXJMDNk6N++7Bl75URRGsb40ruvg7Hcp2wQ==} + engines: {node: ^14.13.1 || >=16.0.0} + dev: true + /pretty-format@25.5.0: resolution: {integrity: sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==} engines: {node: '>= 8.3'} @@ -14184,6 +14197,21 @@ packages: rollup: 3.23.0 dev: true + /rollup-plugin-size@0.3.1: + resolution: {integrity: sha512-SAtpTAAJ0nFkISxLxYjDZX9Zqt34tAIil98R305ZM0GhTnnO6VYG0P5M+2IXKo/iNDdbpBcIfg1W06CLtk/vXA==} + dependencies: + axios: 1.4.0 + chalk: 5.2.0 + ci-env: 1.17.0 + fs-extra: 11.1.1 + glob: 8.1.0 + minimatch: 5.1.6 + pretty-bytes: 6.1.0 + zlib: 1.0.5 + transitivePeerDependencies: + - debug + dev: true + /rollup-plugin-visualizer@5.9.0(rollup@3.23.0): resolution: {integrity: sha512-bbDOv47+Bw4C/cgs0czZqfm8L82xOZssk4ayZjG40y9zbXclNk7YikrZTDao6p7+HDiGxrN0b65SgZiVm9k1Cg==} engines: {node: '>=14'} @@ -16685,6 +16713,11 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} + /zlib@1.0.5: + resolution: {integrity: sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w==} + engines: {node: '>=0.2.0'} + dev: true + /zod@3.21.4: resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==} dev: false diff --git a/rollup.config.mjs b/rollup.config.mjs index 7455435f68..262579d167 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -1,11 +1,14 @@ +// @ts-check + import { resolve } from 'node:path' import { fileURLToPath } from "node:url" import { defineConfig } from 'rollup' -import babel from '@rollup/plugin-babel' +import { babel } from '@rollup/plugin-babel' import terser from '@rollup/plugin-terser' +import size from 'rollup-plugin-size' import { visualizer } from 'rollup-plugin-visualizer' import replace from '@rollup/plugin-replace' -import nodeResolve from '@rollup/plugin-node-resolve' +import { nodeResolve } from '@rollup/plugin-node-resolve' import commonJS from '@rollup/plugin-commonjs' import withSolid from 'rollup-preset-solid' import preserveDirectives from 'rollup-plugin-preserve-directives' @@ -304,6 +307,7 @@ function umdProd({ mangle: true, compress: true, }), + size({}), visualizer({ filename: `${packageDir}/build/stats-html.html`, template: 'treemap', diff --git a/tsconfig.base.json b/tsconfig.base.json index dd666899f4..a63d06e27d 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -46,5 +46,5 @@ "@tanstack/query-devtools": ["packages/query-devtools"] } }, - "include": [".eslintrc.cjs", "scripts"] + "include": [".eslintrc.cjs", "rollup.config.mjs", "scripts"] } diff --git a/tsconfig.json b/tsconfig.json index 0b4f1e2cec..9c00d899c6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,13 +1,5 @@ { - "compilerOptions": { - "allowJs": true, - "checkJs": true, - "esModuleInterop": true, - "module": "ES2020", - "moduleResolution": "node", - "noEmit": true, - }, - "include": ["rollup.config.mjs"], + "files": [], "references": [ { "path": "packages/query-core" }, { "path": "packages/query-persist-client-core" },