From 677d1304372407f3ada4d395646b2bf6ec76d4e8 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 8 Apr 2024 11:52:15 +0200 Subject: [PATCH] import openid from the ts source instead to build properly as esmodule --- .../src/external/openid/index.ts | 21 ++++++++++--------- .../web-test-runner.config.mjs | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/external/openid/index.ts b/src/Umbraco.Web.UI.Client/src/external/openid/index.ts index 8b049e918b..fa968cbfc8 100644 --- a/src/Umbraco.Web.UI.Client/src/external/openid/index.ts +++ b/src/Umbraco.Web.UI.Client/src/external/openid/index.ts @@ -1,16 +1,17 @@ export { - BaseTokenRequestHandler, - BasicQueryStringUtils, - FetchRequestor, - LocalStorageBackend, - RedirectRequestHandler, - RevokeTokenRequest, AuthorizationNotifier, AuthorizationRequest, AuthorizationServiceConfiguration, - GRANT_TYPE_AUTHORIZATION_CODE, - GRANT_TYPE_REFRESH_TOKEN, + BaseTokenRequestHandler, + FetchRequestor, + BasicQueryStringUtils, + LocalStorageBackend, + RedirectRequestHandler, TokenRequest, TokenResponse, -} from '@openid/appauth'; -export type { LocationLike, StringMap } from '@openid/appauth'; + RevokeTokenRequest, + GRANT_TYPE_AUTHORIZATION_CODE, + GRANT_TYPE_REFRESH_TOKEN, +} from '@openid/appauth/src/index.js'; + +export type { LocationLike, StringMap } from '@openid/appauth/src/types.js'; diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index 3da2a3dc6f..832c831714 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -35,7 +35,7 @@ export default { }, }), commonjs({ - include: ['node_modules/**', 'src/external/**'], + include: [/node_modules/], }), ], testRunnerHtml: (testFramework, devMode) =>