Skip to content

Commit c35eb87

Browse files
DamianOsipiukDamianOsipiuk
committed
fix: cjs and esm build bundled to lib dir
1 parent 6e73c78 commit c35eb87

File tree

8 files changed

+46
-39
lines changed

8 files changed

+46
-39
lines changed

‎packages/query-async-storage-persister/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"type": "github",
1111
"url": "https://github.com/sponsors/tannerlinsley"
1212
},
13-
"module": "build/esm/index.mjs",
14-
"main": "build/cjs/index.js",
13+
"module": "build/lib/index.mjs",
14+
"main": "build/lib/index.js",
1515
"browser": "build/umd/index.production.js",
1616
"types": "build/types/packages/query-async-storage-persister/src/index.d.ts",
1717
"exports": {
1818
".": {
19-
"import": "./build/esm/index.mjs",
20-
"default": "./build/cjs/index.js"
19+
"import": "./build/lib/index.mjs",
20+
"default": "./build/lib/index.js"
2121
},
2222
"./package.json": "./package.json"
2323
},

‎packages/query-broadcast-client-experimental/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"type": "github",
1111
"url": "https://github.com/sponsors/tannerlinsley"
1212
},
13-
"module": "build/esm/index.mjs",
14-
"main": "build/cjs/packages/query-broadcast-client-experimental/src/index.js",
13+
"module": "build/lib/index.mjs",
14+
"main": "build/lib/index.js",
1515
"browser": "build/umd/index.production.js",
1616
"types": "build/types/query-broadcast-client-experimental/src/index.d.ts",
1717
"exports": {
1818
".": {
19-
"import": "./build/esm/index.mjs",
20-
"default": "./build/cjs/packages/query-broadcast-client-experimental/src/index.js"
19+
"import": "./build/lib/index.mjs",
20+
"default": "./build/lib/index.js"
2121
},
2222
"./package.json": "./package.json"
2323
},

‎packages/query-core/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"type": "github",
1111
"url": "https://github.com/sponsors/tannerlinsley"
1212
},
13-
"module": "build/esm/index.mjs",
14-
"main": "build/cjs/index.js",
13+
"module": "build/lib/index.mjs",
14+
"main": "build/lib/index.js",
1515
"browser": "build/umd/index.production.js",
1616
"types": "build/types/packages/query-core/src/index.d.ts",
1717
"exports": {
1818
".": {
19-
"import": "./build/esm/index.mjs",
20-
"default": "./build/cjs/index.js"
19+
"import": "./build/lib/index.mjs",
20+
"default": "./build/lib/index.js"
2121
},
2222
"./package.json": "./package.json"
2323
},

‎packages/query-sync-storage-persister/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"type": "github",
1111
"url": "https://github.com/sponsors/tannerlinsley"
1212
},
13-
"module": "build/esm/index.mjs",
14-
"main": "build/cjs/index.js",
13+
"module": "build/lib/index.mjs",
14+
"main": "build/lib/index.js",
1515
"browser": "build/umd/index.production.js",
1616
"types": "build/types/packages/query-sync-storage-persister/src/index.d.ts",
1717
"exports": {
1818
".": {
19-
"import": "./build/esm/index.mjs",
20-
"default": "./build/cjs/index.js"
19+
"import": "./build/lib/index.mjs",
20+
"default": "./build/lib/index.js"
2121
},
2222
"./package.json": "./package.json"
2323
},

‎packages/react-query-devtools/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"type": "github",
1111
"url": "https://github.com/sponsors/tannerlinsley"
1212
},
13-
"module": "build/esm/index.mjs",
14-
"main": "build/cjs/packages/react-query-devtools/src/index.js",
13+
"module": "build/lib/index.mjs",
14+
"main": "build/lib/index.js",
1515
"browser": "build/umd/index.production.js",
1616
"types": "build/types/react-query-devtools/src/index.d.ts",
1717
"files": [
@@ -21,17 +21,17 @@
2121
"exports": {
2222
".": {
2323
"development": {
24-
"require": "./build/cjs/packages/react-query-devtools/src/index.js",
25-
"default": "./build/esm/index.mjs"
24+
"require": "./build/lib/index.js",
25+
"default": "./build/lib/index.mjs"
2626
},
2727
"default": {
28-
"require": "./build/cjs/packages/react-query-devtools/src/noop.js",
29-
"default": "./build/esm/noop.mjs"
28+
"require": "./build/lib/noop.js",
29+
"default": "./build/lib/noop.mjs"
3030
}
3131
},
3232
"./devtools": {
33-
"import": "./build/esm/index.mjs",
34-
"default": "./build/cjs/packages/react-query-devtools/src/index.js"
33+
"import": "./build/lib/index.mjs",
34+
"default": "./build/lib/index.js"
3535
},
3636
"./package.json": "./package.json"
3737
},

‎packages/react-query-persist-client/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"type": "github",
1111
"url": "https://github.com/sponsors/tannerlinsley"
1212
},
13-
"module": "build/esm/index.mjs",
14-
"main": "build/cjs/react-query-persist-client/src/index.js",
13+
"module": "build/lib/index.mjs",
14+
"main": "build/lib/index.js",
1515
"browser": "build/umd/index.production.js",
1616
"types": "build/types/packages/react-query-persist-client/src/index.d.ts",
1717
"exports": {
1818
".": {
19-
"import": "./build/esm/index.mjs",
20-
"default": "./build/cjs/react-query-persist-client/src/index.js"
19+
"import": "./build/lib/index.mjs",
20+
"default": "./build/lib/index.js"
2121
},
2222
"./package.json": "./package.json"
2323
},

‎packages/react-query/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"type": "github",
1111
"url": "https://github.com/sponsors/tannerlinsley"
1212
},
13-
"module": "build/esm/index.mjs",
14-
"main": "build/cjs/react-query/src/index.js",
13+
"module": "build/lib/index.mjs",
14+
"main": "build/lib/index.js",
1515
"browser": "build/umd/index.production.js",
1616
"types": "build/types/packages/react-query/src/index.d.ts",
1717
"exports": {
1818
".": {
19-
"import": "./build/esm/index.mjs",
20-
"default": "./build/cjs/react-query/src/index.js"
19+
"import": "./build/lib/index.mjs",
20+
"default": "./build/lib/index.js"
2121
},
2222
"./package.json": "./package.json"
2323
},

‎rollup.config.ts‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,30 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
4848
jsName: 'QueryAsyncStoragePersister',
4949
outputFile: 'query-async-storage-persister',
5050
entryFile: 'src/index.ts',
51-
globals: {},
51+
globals: {
52+
'@tanstack/react-query-persist-client': 'ReactQueryPersistClient',
53+
},
5254
}),
5355
...buildConfigs({
5456
name: 'query-broadcast-client-experimental',
5557
packageDir: 'packages/query-broadcast-client-experimental',
5658
jsName: 'QueryBroadcastClient',
5759
outputFile: 'query-broadcast-client-experimental',
5860
entryFile: 'src/index.ts',
59-
globals: {},
61+
globals: {
62+
'@tanstack/query-core': 'QueryCore',
63+
'broadcast-channel': 'BroadcastChannel',
64+
},
6065
}),
6166
...buildConfigs({
6267
name: 'query-sync-storage-persister',
6368
packageDir: 'packages/query-sync-storage-persister',
6469
jsName: 'QuerySyncStoragePersister',
6570
outputFile: 'query-sync-storage-persister',
6671
entryFile: 'src/index.ts',
67-
globals: {},
72+
globals: {
73+
'@tanstack/react-query-persist-client': 'ReactQueryPersistClient',
74+
},
6875
}),
6976
...buildConfigs({
7077
name: 'react-query',
@@ -74,6 +81,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
7481
entryFile: 'src/index.ts',
7582
globals: {
7683
react: 'React',
84+
'@tanstack/query-core': 'QueryCore',
7785
},
7886
}),
7987
...buildConfigs({
@@ -146,9 +154,9 @@ function esm({ input, packageDir, external, banner }: Options): RollupOptions {
146154
input,
147155
output: {
148156
format: 'esm',
149-
entryFileNames: "[name].mjs",
157+
entryFileNames: '[name].mjs',
150158
sourcemap: true,
151-
dir: `${packageDir}/build/esm`,
159+
dir: `${packageDir}/build/lib`,
152160
banner,
153161
},
154162
plugins: [
@@ -168,8 +176,7 @@ function cjs({ input, external, packageDir, banner }: Options): RollupOptions {
168176
output: {
169177
format: 'cjs',
170178
sourcemap: true,
171-
dir: `${packageDir}/build/cjs`,
172-
preserveModules: true,
179+
dir: `${packageDir}/build/lib`,
173180
exports: 'named',
174181
banner,
175182
},

0 commit comments

Comments
 (0)