diff --git a/.gitignore b/.gitignore index 998f7b6f..29db0a26 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ jspm_packages .DS_Store /dist + +/build +/keycloak_build diff --git a/src/bin/generateFtl.ts b/src/bin/generateFtl.ts index d2167743..00ee8e09 100644 --- a/src/bin/generateFtl.ts +++ b/src/bin/generateFtl.ts @@ -25,7 +25,7 @@ export function generateFtlFilesCodeFactory( "jsCode": $(element).html()! }); - $(element).html(fixedJsCode); + $(element).text(fixedJsCode); }); @@ -88,7 +88,7 @@ export function generateFtlFilesCodeFactory( [ '', '', '' ].join("\n"), diff --git a/src/bin/main.ts b/src/bin/main.ts index b7690025..e322b497 100644 --- a/src/bin/main.ts +++ b/src/bin/main.ts @@ -10,7 +10,7 @@ import { import { generateFtlFilesCodeFactory } from "./generateFtl"; -const reactAppBuildDirPath = pathJoin(__dirname, "build"); +const reactAppBuildDirPath = pathJoin(process.cwd(), "build"); assert( fs.existsSync(reactAppBuildDirPath), diff --git a/src/bin/replaceImportFromStatic.ts b/src/bin/replaceImportFromStatic.ts index 4cedf710..c9e56898 100644 --- a/src/bin/replaceImportFromStatic.ts +++ b/src/bin/replaceImportFromStatic.ts @@ -12,7 +12,7 @@ export function replaceImportFromStaticInJsCode( const fixedJsCode = jsCode!.replace( /"static\//g, - `window.${ftlValuesGlobalName}.url.resourcesPath.replace(/^\//,"") + "/" + "static/` + `window.${ftlValuesGlobalName}.url.resourcesPath.replace(/^\\//,"") + "/" + "static/` ); return { fixedJsCode }; @@ -80,7 +80,7 @@ export function generateCssCodeToDefineGlobals( ")" ].join("") ].join(" ")) - .map(line => " " + line), + .map(line => ` ${line};`), "}" ].join("\n") }; diff --git a/src/tools/transformCodebase.ts b/src/tools/transformCodebase.ts index 2afcd4b3..6d84fdf8 100644 --- a/src/tools/transformCodebase.ts +++ b/src/tools/transformCodebase.ts @@ -6,7 +6,7 @@ import { crawl } from "denoify/tools/crawl"; import { createDirectoryIfNotExistsRecursive } from "denoify/tools/createDirectoryIfNotExistsRecursive"; /** Apply a transformation function to every file of directory */ -export async function transformCodebase( +export function transformCodebase( params: { srcDirPath: string; destDirPath: string; @@ -35,7 +35,7 @@ export async function transformCodebase( continue; } - await createDirectoryIfNotExistsRecursive( + createDirectoryIfNotExistsRecursive( path.dirname( path.join( destDirPath,