From e662d7d1232f17530bb10fb0f1445d3c253faff5 Mon Sep 17 00:00:00 2001 From: lonelyhentxi Date: Tue, 4 Mar 2025 02:22:23 +0800 Subject: [PATCH] fix: fix solid-js adapter and exclude spec from build --- package.json | 4 +- pnpm-lock.yaml | 138 ++++++++++++++++++--------------- rslib.config.ts | 5 ++ src/adapters/solid-js/index.ts | 11 ++- 4 files changed, 86 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index 3e4f9a6..e2b084b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oidc-client-rx", - "version": "0.1.0-alpha.7", + "version": "0.1.0-alpha.8", "homepage": "https://github.com/lonelyhentxi/oidc-client-rx", "author": "lonelyhentxi", "description": "ReactiveX enhanced OIDC and OAuth2 protocol support for browser-based JavaScript applications", @@ -70,7 +70,7 @@ "@biomejs/js-api": "0.7.1", "@biomejs/wasm-nodejs": "^1.9.4", "@playwright/test": "^1.49.1", - "@rslib/core": "^0.5.0", + "@rslib/core": "^0.5.3", "@swc/core": "^1.10.12", "@tanstack/react-router": "^1.112.11", "@tanstack/solid-router": "^1.112.11", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 35aad5d..815a316 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,8 +31,8 @@ importers: specifier: ^1.49.1 version: 1.49.1 '@rslib/core': - specifier: ^0.5.0 - version: 0.5.0(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(typescript@5.7.3) + specifier: ^0.5.3 + version: 0.5.3(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(typescript@5.7.3) '@swc/core': specifier: ^1.10.12 version: 1.10.12(@swc/helpers@0.5.15) @@ -1009,8 +1009,8 @@ packages: cpu: [x64] os: [win32] - '@rsbuild/core@1.2.11': - resolution: {integrity: sha512-bsTtXlqJKoqnHwOZ05NePGpBf/neuwHTzJtQegQ9GA8YLyjow1wn8vPXFiRtYL0UqASEDtFtAm2bcaieg7r/TQ==} + '@rsbuild/core@1.2.15': + resolution: {integrity: sha512-f17C4q3MoQ1G9CXzGkiZKZj3MHnV9oSovBjjQQ5bXVBICfGVyRHlHHCa5b9b40F67lbez2K6eLkLP9wU1j1Udw==} engines: {node: '>=16.7.0'} hasBin: true @@ -1024,9 +1024,9 @@ packages: peerDependencies: '@rsbuild/core': 1.x - '@rslib/core@0.5.0': - resolution: {integrity: sha512-zHgu9GmT/gvbuDoGLxMHxYbKRiARZsH4UXWFsezq7+KZ3PdEMBUNywmslExY/pk+xSpBUF6+peE6WCUOeW3mKQ==} - engines: {node: '>=16.0.0'} + '@rslib/core@0.5.3': + resolution: {integrity: sha512-HlFGd4PZ4kJDrGZ4VBPIglGPjsTI+LuVWTaFg/hrmElnmXpw3iq0Oln5Esv24L3VBofyvZGPMlu1fZTiqTPzcw==} + engines: {node: '>=16.7.0'} hasBin: true peerDependencies: '@microsoft/api-extractor': ^7 @@ -1042,8 +1042,8 @@ packages: cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-arm64@1.2.3': - resolution: {integrity: sha512-xuwYzhPgNCr4BtKXCU3xe4249TFsXAZglIlbxv8Qs3PeIarrZMRddcqH2zUXi+nJavNw3yN12sCYEzk1f+O4FQ==} + '@rspack/binding-darwin-arm64@1.2.7': + resolution: {integrity: sha512-dT5eSMTknZaI8Djmz8KnaWM68rjZuBZwsKyF144o+ZSJM55vgiNXyL0lQYB8mX9nR3Gck+jKuGUAT2W/EF/t5Q==} cpu: [arm64] os: [darwin] @@ -1052,8 +1052,8 @@ packages: cpu: [x64] os: [darwin] - '@rspack/binding-darwin-x64@1.2.3': - resolution: {integrity: sha512-afiIN8elcrO2EtO27UN0qyZqu5FXGUdclud56DrhvEfnWS3GGxJEdjA8XUYVXkfCYakdXHucIJKlkkgaAjEvHg==} + '@rspack/binding-darwin-x64@1.2.7': + resolution: {integrity: sha512-5n8IhKBxH71d4BUIvyzTwSOAOKNneLPJwLIphSPNIbCMGjLI59/EVpxSQ/AAUfyMkqOs635NNCn0eGQVuzpI/w==} cpu: [x64] os: [darwin] @@ -1062,8 +1062,8 @@ packages: cpu: [arm64] os: [linux] - '@rspack/binding-linux-arm64-gnu@1.2.3': - resolution: {integrity: sha512-K2u/fPUmKujlKSWL3q2zaUu8/6ZK/bOGKcqJSib8jdanQQ/GFKwKtPAFOOa/vvqbzhDocqKOobFR10FhgJqCHg==} + '@rspack/binding-linux-arm64-gnu@1.2.7': + resolution: {integrity: sha512-DTtFBJmgQQrVWjbklpgJDr3kE9Uf1fHsPh+1GVslsBuyn+o4O7JslrnjuVsQCYKoiEg0Lg4ZPQmwnhJLHssZ5A==} cpu: [arm64] os: [linux] @@ -1072,8 +1072,8 @@ packages: cpu: [arm64] os: [linux] - '@rspack/binding-linux-arm64-musl@1.2.3': - resolution: {integrity: sha512-mgovdzGb6cH9hQsjTyzDbfZWCPhTcoHcLro1P7UbiqcLPMDJp/k3Io9xV2/EJhaDA1aynIdq7XfY0fuk4+6Irw==} + '@rspack/binding-linux-arm64-musl@1.2.7': + resolution: {integrity: sha512-01/OoQQF9eyDvRKkxj4DzCznfGZIvnzI8qOsrv+M7VBm8FLoKpb3hygXixaGQOXmNL42XTh61qjgm++fBu6aUA==} cpu: [arm64] os: [linux] @@ -1082,8 +1082,8 @@ packages: cpu: [x64] os: [linux] - '@rspack/binding-linux-x64-gnu@1.2.3': - resolution: {integrity: sha512-542lwJzB1RMGuVdBdA3cOWTlmL9okpOppHUBWcNCjmJM+9zTI+0jwjVe8HaqOqtuR8XzNsoCwT9QonU/GLcuhg==} + '@rspack/binding-linux-x64-gnu@1.2.7': + resolution: {integrity: sha512-lUOAUq0YSsofCXsP6XnlgfH0ZRDZ2X2XqXLXYjqf4xkSxCl5eBmE0EQYjAHF4zjUvU5rVx4a4bDLWv7+t3bOHg==} cpu: [x64] os: [linux] @@ -1092,8 +1092,8 @@ packages: cpu: [x64] os: [linux] - '@rspack/binding-linux-x64-musl@1.2.3': - resolution: {integrity: sha512-dJromiREDcTWqzfCOI5y1IVoYmUnCv7vCp63AEq0+13fJJdk7+pcNN3VV2jOKpk9VECSvjg1c01wl+UzXAXFMw==} + '@rspack/binding-linux-x64-musl@1.2.7': + resolution: {integrity: sha512-ZrPXfgT30p4DlydYavaTHiluxHkWvZHt7K4q7qNyTfYYowG6jRGwWi/PATdugNICGv027Wsh5nzEO4o27Iuhwg==} cpu: [x64] os: [linux] @@ -1102,8 +1102,8 @@ packages: cpu: [arm64] os: [win32] - '@rspack/binding-win32-arm64-msvc@1.2.3': - resolution: {integrity: sha512-S8ZKddMMQDGy8jx/R0i2m1XrmfY2CpI+t6lIEpsuZuKUR4MbOGKN2DuL4MDnT3m8JaYvC8ihsvQjBXQCy3SNxQ==} + '@rspack/binding-win32-arm64-msvc@1.2.7': + resolution: {integrity: sha512-1OzzM+OUSWX39XYcDfxJ8bGX5vNNrRejCMGotBEdP+uQ3KMWCPz0G4KRc3QIjghaLIYk3ofd83hcfUxyk/2Xog==} cpu: [arm64] os: [win32] @@ -1112,8 +1112,8 @@ packages: cpu: [ia32] os: [win32] - '@rspack/binding-win32-ia32-msvc@1.2.3': - resolution: {integrity: sha512-74lqSMKQJcJcgfFaxm+G9YVJSl2KK9/v4fRoMsWApztNy2qNgee+UguNBCOU6JLa3rVSj8Z5OVVDtJkGFrSvVg==} + '@rspack/binding-win32-ia32-msvc@1.2.7': + resolution: {integrity: sha512-VWlDCV9kDtijk9GK6ZtBQmYoVzKGpnrJB0iI3d2gIEa/2NwikJ89bLMFE4dFx8UNH3p/sSyb5pmPOQnbudFK7Q==} cpu: [ia32] os: [win32] @@ -1122,16 +1122,16 @@ packages: cpu: [x64] os: [win32] - '@rspack/binding-win32-x64-msvc@1.2.3': - resolution: {integrity: sha512-fcU532PgFdd5Bil8jwQW0Dcb/80oM6V0qSstGIxZ4M77t4t8e/PcukXfORTL71FfNQ64Rd4Dp6XRl1NHNJVxeg==} + '@rspack/binding-win32-x64-msvc@1.2.7': + resolution: {integrity: sha512-l/sTdeMsQF1a1aB79cWykDNRZG6nkUA0biJo2/sEARP3ijdr8TuwUdirp2JRDmZfQJkoJnQ2un9y9qyW+TIZzA==} cpu: [x64] os: [win32] '@rspack/binding@1.2.2': resolution: {integrity: sha512-GCZwpGFYlLTdJ2soPLwjw9z4LSZ+GdpbHNfBt3Cm/f/bAF8n6mZc7dHUqN893RFh7MPU17HNEL3fMw7XR+6pHg==} - '@rspack/binding@1.2.3': - resolution: {integrity: sha512-enpOXZPQOJO800wdWcR7H5Dx5UZfwkaT0D0xsHD53WbpI09Z2KJbLX7I/i1FLLy3K1KQTB+2FIHLVdRikasXZA==} + '@rspack/binding@1.2.7': + resolution: {integrity: sha512-QH+kxkG0I9C6lmlwgBUDFsy24ihXMGG5lfiNtQilk4CyBN+AgSWFENcYrnkUaBioZAvMBznQLiccV3X0JeH9iQ==} '@rspack/core@1.2.2': resolution: {integrity: sha512-EeHAmY65Uj62hSbUKesbrcWGE7jfUI887RD03G++Gj8jS4WPHEu1TFODXNOXg6pa7zyIvs2BK0Bm16Kwz8AEaQ==} @@ -1145,8 +1145,8 @@ packages: '@swc/helpers': optional: true - '@rspack/core@1.2.3': - resolution: {integrity: sha512-BFgdUYf05/hjjY9Nlwq8DpWaRJN5w2kTl8ZJi20SRL60oAx+ZD2ABT+fsPhBiFSmfTZDdvGGIq5e3vfRzoIuqg==} + '@rspack/core@1.2.7': + resolution: {integrity: sha512-Vg7ySflnqI1nNOBPd6VJkQozWADssxn3einbxa9OqDVAB+dGSj8qihTs6rlaTSewidoaYTGIAiTMHO2y+61qqQ==} engines: {node: '>=16.0.0'} peerDependencies: '@rspack/tracing': ^1.x @@ -1802,6 +1802,9 @@ packages: caniuse-lite@1.0.30001692: resolution: {integrity: sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==} + caniuse-lite@1.0.30001702: + resolution: {integrity: sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==} + chai@5.1.2: resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==} engines: {node: '>=12'} @@ -1888,6 +1891,9 @@ packages: core-js@3.40.0: resolution: {integrity: sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==} + core-js@3.41.0: + resolution: {integrity: sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==} + core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -2936,9 +2942,9 @@ packages: rrweb-cssom@0.8.0: resolution: {integrity: sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==} - rsbuild-plugin-dts@0.5.0: - resolution: {integrity: sha512-m9p53zzcKJ+dWJ/sQfI7jaF9UpmQigdMXQm96tvSpnzSp7WQvjTHAyV5iB6H/3lWTcRJXmLb6mxSzIiCVRnNNA==} - engines: {node: '>=16.0.0'} + rsbuild-plugin-dts@0.5.3: + resolution: {integrity: sha512-NLy2oKyStcM89CwSdgQUu10BlNTpZieshGj7p7w/sge9VM7aADp8mUqo86bDKX4ITMMACLTO6Q/VQmp9B/1tMg==} + engines: {node: '>=16.7.0'} peerDependencies: '@microsoft/api-extractor': ^7 '@rsbuild/core': 1.x @@ -4260,12 +4266,13 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.30.1': optional: true - '@rsbuild/core@1.2.11': + '@rsbuild/core@1.2.15': dependencies: - '@rspack/core': 1.2.3(@swc/helpers@0.5.15) + '@rspack/core': 1.2.7(@swc/helpers@0.5.15) '@rspack/lite-tapable': 1.0.1 '@swc/helpers': 0.5.15 - core-js: 3.40.0 + core-js: 3.41.0 + jiti: 2.4.2 transitivePeerDependencies: - '@rspack/tracing' @@ -4284,10 +4291,10 @@ snapshots: '@rspack/plugin-react-refresh': 1.0.1(react-refresh@0.16.0) react-refresh: 0.16.0 - '@rslib/core@0.5.0(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(typescript@5.7.3)': + '@rslib/core@0.5.3(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(typescript@5.7.3)': dependencies: - '@rsbuild/core': 1.2.11 - rsbuild-plugin-dts: 0.5.0(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(@rsbuild/core@1.2.11)(typescript@5.7.3) + '@rsbuild/core': 1.2.15 + rsbuild-plugin-dts: 0.5.3(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(@rsbuild/core@1.2.15)(typescript@5.7.3) tinyglobby: 0.2.12 optionalDependencies: '@microsoft/api-extractor': 7.49.2(@types/node@22.12.0) @@ -4298,55 +4305,55 @@ snapshots: '@rspack/binding-darwin-arm64@1.2.2': optional: true - '@rspack/binding-darwin-arm64@1.2.3': + '@rspack/binding-darwin-arm64@1.2.7': optional: true '@rspack/binding-darwin-x64@1.2.2': optional: true - '@rspack/binding-darwin-x64@1.2.3': + '@rspack/binding-darwin-x64@1.2.7': optional: true '@rspack/binding-linux-arm64-gnu@1.2.2': optional: true - '@rspack/binding-linux-arm64-gnu@1.2.3': + '@rspack/binding-linux-arm64-gnu@1.2.7': optional: true '@rspack/binding-linux-arm64-musl@1.2.2': optional: true - '@rspack/binding-linux-arm64-musl@1.2.3': + '@rspack/binding-linux-arm64-musl@1.2.7': optional: true '@rspack/binding-linux-x64-gnu@1.2.2': optional: true - '@rspack/binding-linux-x64-gnu@1.2.3': + '@rspack/binding-linux-x64-gnu@1.2.7': optional: true '@rspack/binding-linux-x64-musl@1.2.2': optional: true - '@rspack/binding-linux-x64-musl@1.2.3': + '@rspack/binding-linux-x64-musl@1.2.7': optional: true '@rspack/binding-win32-arm64-msvc@1.2.2': optional: true - '@rspack/binding-win32-arm64-msvc@1.2.3': + '@rspack/binding-win32-arm64-msvc@1.2.7': optional: true '@rspack/binding-win32-ia32-msvc@1.2.2': optional: true - '@rspack/binding-win32-ia32-msvc@1.2.3': + '@rspack/binding-win32-ia32-msvc@1.2.7': optional: true '@rspack/binding-win32-x64-msvc@1.2.2': optional: true - '@rspack/binding-win32-x64-msvc@1.2.3': + '@rspack/binding-win32-x64-msvc@1.2.7': optional: true '@rspack/binding@1.2.2': @@ -4361,17 +4368,17 @@ snapshots: '@rspack/binding-win32-ia32-msvc': 1.2.2 '@rspack/binding-win32-x64-msvc': 1.2.2 - '@rspack/binding@1.2.3': + '@rspack/binding@1.2.7': optionalDependencies: - '@rspack/binding-darwin-arm64': 1.2.3 - '@rspack/binding-darwin-x64': 1.2.3 - '@rspack/binding-linux-arm64-gnu': 1.2.3 - '@rspack/binding-linux-arm64-musl': 1.2.3 - '@rspack/binding-linux-x64-gnu': 1.2.3 - '@rspack/binding-linux-x64-musl': 1.2.3 - '@rspack/binding-win32-arm64-msvc': 1.2.3 - '@rspack/binding-win32-ia32-msvc': 1.2.3 - '@rspack/binding-win32-x64-msvc': 1.2.3 + '@rspack/binding-darwin-arm64': 1.2.7 + '@rspack/binding-darwin-x64': 1.2.7 + '@rspack/binding-linux-arm64-gnu': 1.2.7 + '@rspack/binding-linux-arm64-musl': 1.2.7 + '@rspack/binding-linux-x64-gnu': 1.2.7 + '@rspack/binding-linux-x64-musl': 1.2.7 + '@rspack/binding-win32-arm64-msvc': 1.2.7 + '@rspack/binding-win32-ia32-msvc': 1.2.7 + '@rspack/binding-win32-x64-msvc': 1.2.7 '@rspack/core@1.2.2(@swc/helpers@0.5.15)': dependencies: @@ -4382,12 +4389,12 @@ snapshots: optionalDependencies: '@swc/helpers': 0.5.15 - '@rspack/core@1.2.3(@swc/helpers@0.5.15)': + '@rspack/core@1.2.7(@swc/helpers@0.5.15)': dependencies: '@module-federation/runtime-tools': 0.8.4 - '@rspack/binding': 1.2.3 + '@rspack/binding': 1.2.7 '@rspack/lite-tapable': 1.0.1 - caniuse-lite: 1.0.30001692 + caniuse-lite: 1.0.30001702 optionalDependencies: '@swc/helpers': 0.5.15 @@ -5185,6 +5192,8 @@ snapshots: caniuse-lite@1.0.30001692: {} + caniuse-lite@1.0.30001702: {} + chai@5.1.2: dependencies: assertion-error: 2.0.1 @@ -5294,6 +5303,8 @@ snapshots: core-js@3.40.0: {} + core-js@3.41.0: {} + core-util-is@1.0.3: optional: true @@ -5862,8 +5873,7 @@ snapshots: jiti@1.21.7: {} - jiti@2.4.2: - optional: true + jiti@2.4.2: {} jju@1.4.0: optional: true @@ -6496,10 +6506,10 @@ snapshots: rrweb-cssom@0.8.0: optional: true - rsbuild-plugin-dts@0.5.0(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(@rsbuild/core@1.2.11)(typescript@5.7.3): + rsbuild-plugin-dts@0.5.3(@microsoft/api-extractor@7.49.2(@types/node@22.12.0))(@rsbuild/core@1.2.15)(typescript@5.7.3): dependencies: '@ast-grep/napi': 0.35.0 - '@rsbuild/core': 1.2.11 + '@rsbuild/core': 1.2.15 magic-string: 0.30.17 picocolors: 1.1.1 tinyglobby: 0.2.12 diff --git a/rslib.config.ts b/rslib.config.ts index bc4fbab..9311629 100644 --- a/rslib.config.ts +++ b/rslib.config.ts @@ -14,6 +14,11 @@ export default defineConfig({ build: false, distPath: './dist', }, + source: { + entry: { + index: ['src/**/*.ts', '!**/*.spec.ts', '!src/testing/**/*'], + }, + }, }, { format: 'cjs', diff --git a/src/adapters/solid-js/index.ts b/src/adapters/solid-js/index.ts index b7ddec9..fd2c074 100644 --- a/src/adapters/solid-js/index.ts +++ b/src/adapters/solid-js/index.ts @@ -1,13 +1,12 @@ import type { InjectionToken, Injector, Type } from '@outposts/injection-js'; import { - type ParentProps, + type FlowProps, createContext, createMemo, mergeProps, splitProps, useContext, } from 'solid-js'; -import h from 'solid-js/h'; import { OidcSecurityService } from '../../oidc.security.service'; export const InjectorContextVoidInjector: Injector = { @@ -20,10 +19,10 @@ export const InjectorContext = createContext( InjectorContextVoidInjector ); -export function InjectorProvider(props: ParentProps<{ injector: Injector }>) { - const [local, others] = splitProps(props, ['children', 'injector']); +export function InjectorProvider(props: FlowProps<{ injector: Injector }>) { + const [local, others] = splitProps(props, ['injector']); const providerProps = mergeProps(others, { value: local.injector }); - return h(InjectorContext.Provider, providerProps, local.children); + return InjectorContext.Provider(providerProps); } export function useInjector() { @@ -39,6 +38,6 @@ export function useOidcClient() { return { injector, - oidcSecurityService, + oidcSecurityService: oidcSecurityService(), }; }