RICT-5442 - Fix Workers Configuration to take inputs into considerati…

…on (#177) * RICT-5442 - Fix Workers Configuration to take inputs into consideration * Upgrade versions * Update ViewGenerator.targets * Update Helpers.ts
OutSystems · Feb 22, 2024 · 45294b8 · 45294b8
1 parent cebd8f1
commit 45294b8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -26,7 +26,7 @@
         <PackageVersion Include="WebViewControl-WPF" Version="$(WebViewVersion)" />
         <PackageVersion Include="WebViewControl-WPF-ARM64" Version="$(WebViewVersion)" />
 
-        <PackageVersion Include="ViewGenerator" Version="1.1.42" />
+        <PackageVersion Include="ViewGenerator" Version="1.1.43" />
         <PackageVersion Include="ViewGeneratorCore" Version="1.0.229" />
 
         <PackageVersion Include="NLog" Version="4.6.2" />

diff --git a/ViewGenerator/ViewGenerator.csproj b/ViewGenerator/ViewGenerator.csproj
@@ -7,7 +7,7 @@
     <AssemblyTitle>ViewGenerator</AssemblyTitle>
     <Product>ViewGenerator</Product>
     <Description>Generates .NET View bindings from typescript</Description>
-    <Version>1.1.43</Version>
+    <Version>1.1.44</Version>
     <PackageId>ViewGenerator</PackageId>
     <PackageTags>Library</PackageTags>
 

diff --git a/ViewGenerator/build/ViewGenerator.targets b/ViewGenerator/build/ViewGenerator.targets
@@ -129,7 +129,7 @@
 
   <!-- Workers related target -->
   <Target Name="VG_GenerateWorkersBundle" >
-    <Exec Command="node &quot;$(ViewPackerToolScript)&quot; --config=&quot;$(ViewGeneratorToolsPath)/webpack/webpack_workers.config.js&quot; --mode=$(WP_Mode) --devtool=$(WP_DevTool) --env useCache=$(WP_UseCache)" />
+    <Exec Command="node &quot;$(ViewPackerToolScript)&quot; --config=&quot;$(ViewGeneratorToolsPath)/webpack/webpack_workers.config.js&quot; --mode=$(WP_Mode) --devtool=$(WP_DevTool) --env useCache=$(WP_UseCache) --env entryPath='@(Workers)'" />
   </Target>
 
   <!-- /// -->

diff --git a/ViewGenerator/tools/webpack/Helpers.ts b/ViewGenerator/tools/webpack/Helpers.ts
@@ -0,0 +1,17 @@
+import {Dictionary, sanitizeCommandLineParam} from "./Plugins/Utils";
+
+const getEntryName = (entryPath: string): string => {
+    const fileExtensionLen: number = entryPath.length - entryPath.lastIndexOf(".");
+    return entryPath.slice(entryPath.replace(/\//g, '\\').lastIndexOf("\\") + 1, -fileExtensionLen);
+};
+
+export function getEntries(entries: string): Dictionary<string>{
+    const entryMap: Dictionary<string> = {};
+    const sanitizeEntries = sanitizeCommandLineParam(entries);
+
+    sanitizeEntries.split(";").map(entryPath => {
+        entryMap[getEntryName(entryPath)] = './' + entryPath;
+    });
+
+    return entryMap;
+}
diff --git a/ViewGenerator/tools/webpack/webpack_stylesheets.config.ts b/ViewGenerator/tools/webpack/webpack_stylesheets.config.ts
@@ -4,24 +4,15 @@ import { Configuration } from "webpack";
 
 import MiniCssExtractPluginCleanup from "./Plugins/MiniCssExtractPluginCleanup";
 import { CssPlaceholder, JsMapPlaceholder, OutputDirectoryDefault } from "./Plugins/Resources";
-import { Dictionary, getCurrentDirectory, sanitizeCommandLineParam } from "./Plugins/Utils"
+import { getCurrentDirectory, sanitizeCommandLineParam } from "./Plugins/Utils"
 
 import getResourcesRuleSet from "./Rules/Files";
 import SassRuleSet from "./Rules/Sass";
+import { getEntries } from "./Helpers";
 
 const config = (env) => {
-
-    const getEntryName = (entryPath: string): string => {
-        const fileExtensionLen: number = entryPath.length - entryPath.lastIndexOf(".");
-        return entryPath.slice(entryPath.replace(/\//g, '\\').lastIndexOf("\\") + 1, -fileExtensionLen);
-    };
-
-    let entries: string = sanitizeCommandLineParam(env.entryPath);
-    let entryMap: Dictionary<string> = {};
-    entries.split(";").map(entryPath => entryMap[getEntryName(entryPath)] = './' + entryPath)
-
     const stylesheetsConfig: Configuration = {
-        entry: entryMap,
+        entry: getEntries(env.entryPath),
 
         output: {
             path: getCurrentDirectory(),

diff --git a/ViewGenerator/tools/webpack/webpack_workers.config.ts b/ViewGenerator/tools/webpack/webpack_workers.config.ts
@@ -1,19 +1,11 @@
-import { sync } from "glob";
-import { parse, resolve } from "path";
+import { resolve } from "path";
 import { getCurrentDirectory } from "./Plugins/Utils";
-import {Configuration} from "webpack";
+import { Configuration } from "webpack";
+import { getEntries } from "./Helpers";
 
 const config = (env) => {
-
-    let entryMap = {};
-
-    sync("**/*.worker.js", { follow: true }).forEach(f => {
-        let entryName: string = parse(f).name;
-        entryMap[entryName] = "./" + f;
-    });
-
     const workersConfig: Configuration = {
-        entry: entryMap,
+        entry: getEntries(env.entryPath),
 
         optimization: {
             minimize: true
@@ -24,15 +16,15 @@ const config = (env) => {
             path: resolve(getCurrentDirectory(), "Generated")
         },
     };
-    
+
     if (env.useCache === "true") {
         workersConfig.cache = {
             type: 'filesystem',
             allowCollectingMemory: true,
-            name: "workersCache" 
+            name: "workersCache"
         }
     }
-    
+
     return workersConfig;
 };