diff --git a/dataconnect-sdk/js/default-connector/package.json b/dataconnect-sdk/js/default-connector/package.json index d436a8a..d77efcc 100644 --- a/dataconnect-sdk/js/default-connector/package.json +++ b/dataconnect-sdk/js/default-connector/package.json @@ -20,6 +20,6 @@ "./package.json": "./package.json" }, "peerDependencies": { - "firebase": "^11.1.0" + "firebase": "^10.14.0 || ^11.0.0" } } \ No newline at end of file diff --git a/packages/react/package.json b/packages/react/package.json index 8a771ff..00876a0 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -13,16 +13,16 @@ "types": "./dist/index.d.ts" }, "./auth": { - "import": "./dist/auth.js", - "types": "./dist/auth.d.ts" + "import": "./dist/auth/index.js", + "types": "./dist/auth/index.d.ts" }, "./firestore": { - "import": "./dist/firestore.js", - "types": "./dist/firestore.d.ts" + "import": "./dist/firestore/index.js", + "types": "./dist/firestore/index.d.ts" }, "./data-connect": { - "import": "./dist/dataconnect.js", - "types": "./dist/dataconnect.d.ts" + "import": "./dist/data-connect/index.js", + "types": "./dist/data-connect/index.d.ts" } }, "author": { diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 3a3e272..cb0abdf 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -4,7 +4,6 @@ "module": "esnext", "moduleResolution": "node", "declaration": true, - "outDir": "./dist", "jsx": "react", "strict": true, "esModuleInterop": true, diff --git a/packages/react/tsup.config.ts b/packages/react/tsup.config.ts index cdae720..8fb2ed3 100644 --- a/packages/react/tsup.config.ts +++ b/packages/react/tsup.config.ts @@ -1,15 +1,14 @@ import { defineConfig } from "tsup"; +const supportedPackages = ['data-connect', 'firestore', 'auth']; export default defineConfig({ - entry: { - index: "src/index.ts", - auth: "src/auth/index.ts", - firestore: "src/firestore/index.ts", - dataconnect: "src/data-connect/index.ts", - }, + entry: [`src/(${supportedPackages.join('|')})/index.ts`, 'src/index.ts'], format: ["esm"], dts: true, // generates .d.ts files outDir: "dist", + esbuildOptions(options, context) { + options.outbase = './src'; + }, // splitting: false, // Disable code splitting to generate distinct files clean: true, }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b711483..35fbb7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ importers: version: 9.0.7 '@vitest/coverage-istanbul': specifier: ^2.0.5 - version: 2.1.1(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)) + version: 2.1.1(vitest@2.1.1(@types/node@20.17.10)(happy-dom@15.7.4)) firebase: specifier: ^11.1.0 version: 11.1.0 @@ -40,12 +40,12 @@ importers: version: 5.6.2 vitest: specifier: ^2.0.5 - version: 2.1.1(@types/node@22.5.5)(happy-dom@15.7.4) + version: 2.1.1(@types/node@20.17.10)(happy-dom@15.7.4) dataconnect-sdk/js/default-connector: dependencies: firebase: - specifier: ^11.1.0 + specifier: ^10.14.0 || ^11.0.0 version: 11.1.0 examples/react-example: @@ -114,7 +114,7 @@ importers: version: link:../../dataconnect-sdk/js/default-connector '@testing-library/react': specifier: ^16.0.1 - version: 16.0.1(@testing-library/dom@10.4.0)(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + version: 16.0.1(@testing-library/dom@10.4.0)(@types/react-dom@19.0.2(@types/react@19.0.1))(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@types/react': specifier: ^19.0.1 version: 19.0.1 @@ -4034,7 +4034,7 @@ snapshots: lz-string: 1.5.0 pretty-format: 27.5.1 - '@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': + '@testing-library/react@16.0.1(@testing-library/dom@10.4.0)(@types/react-dom@19.0.2(@types/react@19.0.1))(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)': dependencies: '@babel/runtime': 7.25.6 '@testing-library/dom': 10.4.0 @@ -4042,6 +4042,7 @@ snapshots: react-dom: 19.0.0(react@19.0.0) optionalDependencies: '@types/react': 19.0.1 + '@types/react-dom': 19.0.2(@types/react@19.0.1) '@types/aria-query@5.0.4': {} @@ -4150,7 +4151,7 @@ snapshots: '@typescript-eslint/types': 8.18.1 eslint-visitor-keys: 4.2.0 - '@vitest/coverage-istanbul@2.1.1(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4))': + '@vitest/coverage-istanbul@2.1.1(vitest@2.1.1(@types/node@20.17.10)(happy-dom@15.7.4))': dependencies: '@istanbuljs/schema': 0.1.3 debug: 4.3.7 @@ -4162,7 +4163,7 @@ snapshots: magicast: 0.3.5 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 2.1.1(@types/node@22.5.5)(happy-dom@15.7.4) + vitest: 2.1.1(@types/node@20.17.10)(happy-dom@15.7.4) transitivePeerDependencies: - supports-color @@ -4173,13 +4174,13 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@22.5.5))': + '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@20.17.10))': dependencies: '@vitest/spy': 2.1.1 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: - vite: 5.4.8(@types/node@22.5.5) + vite: 5.4.8(@types/node@20.17.10) '@vitest/pretty-format@2.1.1': dependencies: @@ -4763,7 +4764,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.18.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@9.17.0(jiti@1.21.6)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.18.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0)(eslint@9.17.0(jiti@1.21.6)))(eslint@9.17.0(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -4785,7 +4786,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.17.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.18.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@9.17.0(jiti@1.21.6)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.18.1(eslint@9.17.0(jiti@1.21.6))(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0)(eslint@9.17.0(jiti@1.21.6)))(eslint@9.17.0(jiti@1.21.6)) hasown: 2.0.2 is-core-module: 2.16.0 is-glob: 4.0.3 @@ -6195,12 +6196,12 @@ snapshots: util-deprecate@1.0.2: {} - vite-node@2.1.1(@types/node@22.5.5): + vite-node@2.1.1(@types/node@20.17.10): dependencies: cac: 6.7.14 debug: 4.3.7 pathe: 1.1.2 - vite: 5.4.8(@types/node@22.5.5) + vite: 5.4.8(@types/node@20.17.10) transitivePeerDependencies: - '@types/node' - less @@ -6212,19 +6213,19 @@ snapshots: - supports-color - terser - vite@5.4.8(@types/node@22.5.5): + vite@5.4.8(@types/node@20.17.10): dependencies: esbuild: 0.21.5 postcss: 8.4.49 rollup: 4.21.3 optionalDependencies: - '@types/node': 22.5.5 + '@types/node': 20.17.10 fsevents: 2.3.3 - vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4): + vitest@2.1.1(@types/node@20.17.10)(happy-dom@15.7.4): dependencies: '@vitest/expect': 2.1.1 - '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@22.5.5)) + '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@20.17.10)) '@vitest/pretty-format': 2.1.1 '@vitest/runner': 2.1.1 '@vitest/snapshot': 2.1.1 @@ -6239,11 +6240,11 @@ snapshots: tinyexec: 0.3.0 tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.4.8(@types/node@22.5.5) - vite-node: 2.1.1(@types/node@22.5.5) + vite: 5.4.8(@types/node@20.17.10) + vite-node: 2.1.1(@types/node@20.17.10) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.5.5 + '@types/node': 20.17.10 happy-dom: 15.7.4 transitivePeerDependencies: - less