Merge branch 'main' into oidc-client

.github/workflows/release-next-react-sdk.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - fix/react-sdk-next
 
 env:
   NODE_VERSION: 18.10.0
@@ -49,7 +48,8 @@ jobs:
       - name: Check if should run
         id: 'check'
         run: |
-          if $(npx nx show projects --affected --plain | grep -q "react-sdk"); then
+          # Check if the affected projects include "react-sdk" or "web-component" since the last commit
+          if $(npx nx show projects --affected --base HEAD~1 --head HEAD | grep -q "react-sdk\|web-component"); then
             echo "run=true" >> $GITHUB_OUTPUT
           else
             echo "run=false" >> $GITHUB_OUTPUT

packages/libs/sdk-mixins/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.6.0](https://github.com/descope/descope-js/compare/sdk-mixins-0.5.2...sdk-mixins-0.6.0) (2024-12-24)
+
+
+### Features
+
+* Content from base url ([#871](https://github.com/descope/descope-js/issues/871)) RELEASE ([f3e437e](https://github.com/descope/descope-js/commit/f3e437e0793507627b157317063fe39174600c80))
+
+## [0.5.2](https://github.com/descope/descope-js/compare/sdk-mixins-0.5.1...sdk-mixins-0.5.2) (2024-12-22)
+
+
+### Bug Fixes
+
+* support react-19 ([#860](https://github.com/descope/descope-js/issues/860)) RELEASE ([efd6833](https://github.com/descope/descope-js/commit/efd6833dfefc854b7f461606084234603f2444e0))
+
+## [0.5.1](https://github.com/descope/descope-js/compare/sdk-mixins-0.5.0...sdk-mixins-0.5.1) (2024-12-18)
+
+## [0.5.0](https://github.com/descope/descope-js/compare/sdk-mixins-0.4.0...sdk-mixins-0.5.0) (2024-12-04)
+
+
+### Features
+
+* Status param & dynamic os theme ([#854](https://github.com/descope/descope-js/issues/854)) ([f3deea7](https://github.com/descope/descope-js/commit/f3deea70df62c19209866e918c8013427dc33700))
+
 ## [0.4.0](https://github.com/descope/descope-js/compare/sdk-mixins-0.3.2...sdk-mixins-0.4.0) (2024-11-10)
 
 

packages/libs/sdk-mixins/jest.config.cjs

@@ -9,10 +9,10 @@ module.exports = {
   collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
   coverageThreshold: {
     global: {
-      branches: 80,
-      functions: 93.5,
-      lines: 93.5,
-      statements: 93.5,
+      branches: 12,
+      functions: 17,
+      lines: 36,
+      statements: 36,
     },
   },
   // A set of global variables that need to be available in all test environments

packages/libs/sdk-mixins/package.json

@@ -1,30 +1,52 @@
 {
   "name": "@descope/sdk-mixins",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "author": "Descope Team <[email protected]>",
   "homepage": "https://github.com/descope/sdk-mixins",
   "bugs": {
     "url": "https://github.com/descope/sdk-mixins/issues",
     "email": "[email protected]"
   },
-  "main": "dist/cjs/index.cjs.js",
-  "module": "dist/index.esm.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
-    "require": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/cjs/index.cjs.js"
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      }
     },
-    "import": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.esm.js"
+    "./theme-mixin": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/esm/mixins/themeMixin/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/cjs/mixins/themeMixin/index.js"
+      }
+    },
+    "./static-resources-mixin": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/esm/mixins/staticResourcesMixin/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/cjs/mixins/staticResourcesMixin/index.js"
+      }
     }
   },
   "type": "module",
   "description": "Descope JavaScript SDK mixins",
   "scripts": {
     "build": "rimraf dist && rollup -c",
-    "test": "echo no tests yet",
+    "test": "jest",
     "lint": "eslint '+(src|test|examples)/**/*.ts'"
   },
   "license": "MIT",
@@ -83,7 +105,8 @@
     "ts-node": "10.9.2",
     "typescript": "^5.0.2",
     "@reduxjs/toolkit": "^2.0.1",
-    "redux": "5.0.1"
+    "redux": "5.0.1",
+    "rollup-plugin-no-emit": "1.2.1"
   },
   "dependencies": {
     "@descope/sdk-helpers": "workspace:*",

packages/libs/sdk-mixins/rollup.config.mjs

@@ -6,60 +6,72 @@ import del from 'rollup-plugin-delete';
 import dts from 'rollup-plugin-dts';
 import terser from '@rollup/plugin-terser';
 import replace from '@rollup/plugin-replace';
+import noEmit from 'rollup-plugin-no-emit';
 
 import packageJson from './package.json' assert { type: 'json' };
 
-const plugins = [
-  replace({
-    values: {
-      BUILD_VERSION: JSON.stringify(packageJson.version),
-    },
-    preventAssignment: true,
-  }),
-  typescript({
-    tsconfig: './tsconfig.json',
-  }),
-  commonjs(),
-  resolve(),
-  // terser(),
+const input = [
+  './src/index.ts',
+  './src/mixins/themeMixin/index.ts',
+  './src/mixins/staticResourcesMixin/index.ts',
 ];
-const input = './src/index.ts';
 const external = (id) =>
   !id.startsWith('\0') && !id.startsWith('.') && !id.startsWith('/');
 
 export default [
   {
     input,
-    output: {
-      file: packageJson.main,
-      format: 'cjs',
-      sourcemap: true,
-      exports: 'named',
-      interop: 'compat',
-      inlineDynamicImports: true,
-    },
-    plugins,
-    external,
-  },
-  {
-    input,
-    output: {
-      file: packageJson.module,
-      format: 'esm',
-      sourcemap: true,
-      inlineDynamicImports: true,
-    },
-    plugins,
+    output: [
+      {
+        dir: './dist/cjs',
+        format: 'cjs',
+        sourcemap: true,
+        exports: 'named',
+        interop: 'compat',
+        inlineDynamicImports: false,
+        preserveModules: true,
+      },
+      {
+        dir: './dist/esm',
+        format: 'esm',
+        sourcemap: true,
+        inlineDynamicImports: false,
+        preserveModules: true,
+      },
+    ],
+    plugins: [
+      del({ targets: 'dist/*' }),
+      replace({
+        values: {
+          BUILD_VERSION: JSON.stringify(packageJson.version),
+        },
+        preventAssignment: true,
+      }),
+      typescript({
+        tsconfig: './tsconfig.json',
+      }),
+      commonjs(),
+      resolve(),
+      // terser(),
+    ],
     external,
   },
   {
-    input: './dist/dts/src/index.d.ts',
-    output: [{ file: packageJson.types, format: 'esm' }],
+    input: input[0],
+    output: [{ dir: './dist', format: 'esm', inlineDynamicImports: true }],
     plugins: [
+      typescript({
+        tsconfig: './tsconfig.json',
+        compilerOptions: {
+          declaration: true,
+          declarationDir: './dist/types',
+        },
+      }),
       dts(),
-      del({ hook: 'buildEnd', targets: ['./dist/dts', './dist/cjs/dts'] }),
       cjsPackage(),
+      noEmit({ match: (file) => file.endsWith('.js') }),
     ],
+    external,
   },
 ];
 

packages/libs/sdk-mixins/src/mixins/configMixin/configMixin.ts

@@ -21,10 +21,11 @@ export const configMixin = createSingletonMixin(
 
       #fetchConfig = async () => {
         try {
-          const { body, headers } = await this.fetchStaticResource(
-            CONFIG_FILENAME,
-            'json',
-          );
+          const {
+            body,
+            headers,
+          }: { body: ProjectConfiguration; headers: Record<string, any> } =
+            await (<any>this.fetchStaticResource(CONFIG_FILENAME, 'json'));
           return {
             projectConfig: body as ProjectConfiguration,
             executionContext: { geo: headers['x-geo'] },

packages/libs/sdk-mixins/src/mixins/configMixin/types.ts

@@ -23,18 +23,18 @@ type Operator =
   | 'is-false'
   | 'in'
   | 'not-in';
-export interface ClientCondition {
+export type ClientCondition = {
   operator: Operator;
   key: string;
   predicate?: string | number;
   met: ClientConditionResult;
   unmet?: ClientConditionResult;
-}
+};
 
-export interface ClientConditionResult {
+export type ClientConditionResult = {
   screenId: string;
   interactionId: string;
-}
+};
 
 export type FlowConfig = {
   startScreenId?: string;
@@ -46,7 +46,7 @@ export type FlowConfig = {
   fingerprintKey?: string;
 };
 
-export interface ProjectConfiguration {
+export type ProjectConfiguration = {
   componentsVersion: string;
   cssTemplate: {
     dark: ThemeTemplate;
@@ -55,4 +55,4 @@ export interface ProjectConfiguration {
   flows: {
     [key: string]: FlowConfig; // dynamic key names for flows
   };
-}
+};

packages/libs/sdk-mixins/src/mixins/createValidateAttributesMixin/createValidateAttributesMixin.ts

@@ -33,12 +33,11 @@ const createValidateAttributesMixin =
       }
 
       async init() {
-        await super.init?.();
-
         // check attributes initial values
         mappingsNames.forEach((attr) =>
           this.#handleError(attr, this.getAttribute(attr)),
         );
+        await super.init?.();
       }
     };
   };

packages/libs/sdk-mixins/src/mixins/loggerMixin/index.ts

@@ -1 +1,2 @@
 export * from './loggerMixin';
+export type { Logger } from './types';

packages/libs/sdk-mixins/src/mixins/loggerMixin/loggerMixin.ts

@@ -21,8 +21,8 @@ export const loggerMixin = createSingletonMixin(
         }, {}) as Logger;
       }
 
-      set logger(logger: Partial<Logger>) {
-        this.#logger = this.#wrapLogger(logger);
+      set logger(logger: Partial<Logger> | undefined) {
+        this.#logger = this.#wrapLogger(logger || console);
       }
 
       get logger(): Logger {

packages/libs/sdk-mixins/src/mixins/staticResourcesMixin/fetchWithFallbacks.ts

@@ -0,0 +1,40 @@
+import { Logger } from '../loggerMixin';
+
+type FetchParams = Parameters<typeof fetch>;
+const notLastMsgSuffix = 'Trying the next fallback URL...';
+
+export const fetchWithFallbacks = async (
+  fallbacks: FetchParams['0'] | FetchParams['0'][],
+  init: FetchParams['1'],
+  {
+    logger,
+    onSuccess,
+  }: { logger?: Logger; onSuccess?: (urlIndex: number) => void },
+): ReturnType<typeof fetch> => {
+  const fallbacksArr = Array.isArray(fallbacks) ? fallbacks : [fallbacks];
+
+  for (let index = 0; index < fallbacksArr.length; index++) {
+    const url = fallbacksArr[index];
+    const isLast = index === fallbacksArr.length - 1;
+
+    try {
+      const res = await fetch(url.toString(), init);
+      if (res.ok) {
+        onSuccess?.(index);
+        return res;
+      }
+
+      const errMsg = `Error fetching URL ${url} [${res.status}]`;
+
+      if (isLast) throw new Error(errMsg);
+
+      logger?.debug(`${errMsg}. ${notLastMsgSuffix}`);
+    } catch (e) {
+      const errMsg = `Error fetching URL ${url} [${e.message}]`;
+
+      if (isLast) throw new Error(errMsg);
+
+      logger?.debug(`${errMsg}. ${notLastMsgSuffix}`);
+    }
+  }
+};