From 6d62b5a150eeb9c495e0b617acb64ec2aad37d6f Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Fri, 9 Feb 2024 17:56:28 +0100 Subject: [PATCH] Don't replace process.env.PUBLIC_URL --- .../replaceImportsInJsCode/webpack.ts | 14 -------- test/bin/replacers.spec.ts | 34 ------------------- 2 files changed, 48 deletions(-) diff --git a/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts b/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts index 6adf4193..74a02f5d 100644 --- a/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts +++ b/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts @@ -29,20 +29,6 @@ export function replaceImportsInJsCode_webpack(params: { jsCode: string; buildOp ); } - // d={NODE_ENV:"production",PUBLIC_URL:"/foo-bar",WDS_SOCKET_HOST - // d={NODE_ENV:"production",PUBLIC_URL:"",WDS_SOCKET_HOST - // -> - // ... PUBLIC_URL:window.kcContext.url.resourcesPath+"/build" ... - fixedJsCode = fixedJsCode.replace( - new RegExp( - `NODE_ENV:"production",PUBLIC_URL:"${ - buildOptions.urlPathname !== undefined ? replaceAll(buildOptions.urlPathname.slice(0, -1), "/", "\\/") : "" - }"`, - "g" - ), - `NODE_ENV:"production",PUBLIC_URL:window.${nameOfTheGlobal}.url.resourcesPath+"/${basenameOfTheKeycloakifyResourcesDir}"` - ); - // Example: "static/ or "foo/bar/" const staticDir = (() => { let out = pathRelative(buildOptions.reactAppBuildDirPath, buildOptions.assetsDirPath); diff --git a/test/bin/replacers.spec.ts b/test/bin/replacers.spec.ts index 2390ea3f..eee699a2 100644 --- a/test/bin/replacers.spec.ts +++ b/test/bin/replacers.spec.ts @@ -361,40 +361,6 @@ describe("js replacer - webpack", () => { expect(isSameCode(fixedJsCode, fixedJsCodeExpected)).toBe(true); }); - - it("replaceImportsInJsCode_webpack - 4", () => { - const jsCodeUntransformed = `d={NODE_ENV:"production",PUBLIC_URL:"",WDS_SOCKET_HOST`; - - const { fixedJsCode } = replaceImportsInJsCode_webpack({ - "jsCode": jsCodeUntransformed, - "buildOptions": { - "reactAppBuildDirPath": "/Users/someone/github/keycloakify-starter/build", - "assetsDirPath": "/Users/someone/github/keycloakify-starter/dist/build/static", - "urlPathname": undefined - } - }); - - const fixedJsCodeExpected = `d={NODE_ENV:"production",PUBLIC_URL:window.${nameOfTheGlobal}.url.resourcesPath+"/${basenameOfTheKeycloakifyResourcesDir}",WDS_SOCKET_HOST`; - - expect(isSameCode(fixedJsCode, fixedJsCodeExpected)).toBe(true); - }); - - it("replaceImportsInJsCode_webpack - 5", () => { - const jsCodeUntransformed = `d={NODE_ENV:"production",PUBLIC_URL:"/foo-bar",WDS_SOCKET_HOST`; - - const { fixedJsCode } = replaceImportsInJsCode_webpack({ - "jsCode": jsCodeUntransformed, - "buildOptions": { - "reactAppBuildDirPath": "/Users/someone/github/keycloakify-starter/build", - "assetsDirPath": "/Users/someone/github/keycloakify-starter/dist/build/static", - "urlPathname": "/foo-bar/" - } - }); - - const fixedJsCodeExpected = `d={NODE_ENV:"production",PUBLIC_URL:window.${nameOfTheGlobal}.url.resourcesPath+"/${basenameOfTheKeycloakifyResourcesDir}",WDS_SOCKET_HOST`; - - expect(isSameCode(fixedJsCode, fixedJsCodeExpected)).toBe(true); - }); }); describe("css replacer", () => {