RDEV-5995 Fixed issues related with Hot Reload

OutSystems · Nov 2, 2023 · 01b5c1b · 01b5c1b
1 parent b978c94
commit 01b5c1b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
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.17</Version>
+    <Version>1.1.18</Version>
     <PackageId>ViewGenerator</PackageId>
     <PackageTags>Library</PackageTags>
 

diff --git a/ViewGenerator/tools/webpack/Plugins/CommonConfiguration.ts b/ViewGenerator/tools/webpack/Plugins/CommonConfiguration.ts
@@ -12,7 +12,9 @@ import {
     DtsExtension,
     OutputDirectoryDefault,
     JsChunkPlaceholder,
-    NamePlaceholder
+    NamePlaceholder,
+    IdPlaceholder,
+    CssExtension
 } from "./Resources";
 import { Dictionary, generateManifest, getCurrentDirectory, getFileName } from "./Utils";
 
@@ -22,7 +24,7 @@ import SassRuleSet from "../Rules/Sass";
 import getTypeScriptRuleSet from "../Rules/TypeScript";
 import ForkTsCheckerWebpackPlugin from "fork-ts-checker-webpack-plugin";
 
-let getCommonConfiguration = (libraryName: string, useCache: boolean, assemblyName?: string, pluginsRelativePath?: string, forHotReload?: boolean): Configuration => {
+let getCommonConfiguration = (cacheName: string, libraryName: string, assemblyName?: string, pluginsRelativePath?: string, forHotReload?: boolean): Configuration => {
 
     const entryMap: Dictionary<string> = {}
     const outputMap: Dictionary<string> = {};
@@ -56,7 +58,7 @@ let getCommonConfiguration = (libraryName: string, useCache: boolean, assemblyNa
         //
         // E.g. if pluginsRelativePath is "../path/to/plugin/", we want to get the "plugin" part,
         // and therefore we perform a pop twice, as the last portion will be an empty string.
-        pluginsAssembly = pathParts.pop() || pathParts.pop(); 
+        pluginsAssembly = pathParts.pop() || pathParts.pop();
     }
 
     const Configuration: Configuration = {
@@ -106,13 +108,13 @@ let getCommonConfiguration = (libraryName: string, useCache: boolean, assemblyNa
             new Webpack.WatchIgnorePlugin({
                 paths: [ /scss\.d\.ts$/]
             }),
-            
+
             new ForkTsCheckerWebpackPlugin({
                 typescript: {
                     diagnosticOptions: { syntactic: true, semantic: true, declaration: false, global: false },
                 }
             }),
-            
+
             new MiniCssExtractPlugin({
                 filename: (chunkData) => {
                     const Directory: string = outputMap[chunkData.chunk.name];
@@ -121,7 +123,7 @@ let getCommonConfiguration = (libraryName: string, useCache: boolean, assemblyNa
                     }
                     return OutputDirectoryDefault + CssChunkPlaceholder;
                 },
-                chunkFilename: OutputDirectoryDefault + CssChunkPlaceholder
+                chunkFilename: OutputDirectoryDefault + (forHotReload ? IdPlaceholder + CssExtension : CssChunkPlaceholder)
             }),
 
             new WebpackManifestPlugin({
@@ -130,11 +132,12 @@ let getCommonConfiguration = (libraryName: string, useCache: boolean, assemblyNa
             }),
         ]
     };
-    
-    if (useCache) {
+
+    if (cacheName) {
         Configuration.cache ={
             type: 'filesystem',
             allowCollectingMemory: true,
+            name: cacheName
         };
     }
 

diff --git a/ViewGenerator/tools/webpack/webpack_plugins.config.ts b/ViewGenerator/tools/webpack/webpack_plugins.config.ts
@@ -8,10 +8,8 @@ import { getCurrentDirectory, sanitizeCommandLineParam } from "./Plugins/Utils";
 
 const config = (env) => {
 
-    const standardConfig: Configuration = getCommonConfiguration("Plugins", env.useCache, sanitizeCommandLineParam(env.assemblyName));
+    const standardConfig: Configuration = getCommonConfiguration(env.useCache ? "pluginsCache" : "", "Plugins", sanitizeCommandLineParam(env.assemblyName));
 
-    (standardConfig.cache as any).name = "pluginsCache";
-
     standardConfig.optimization = {
         runtimeChunk: {
             name: "PluginsRuntime"

diff --git a/ViewGenerator/tools/webpack/webpack_views.config.ts b/ViewGenerator/tools/webpack/webpack_views.config.ts
@@ -4,7 +4,7 @@ import { Configuration } from "webpack";
 
 import getCommonConfiguration from "./Plugins/CommonConfiguration";
 import { Dictionary, sanitizeCommandLineParam } from "./Plugins/Utils";
-import {FullHashPlaceholder, IdPlaceholder, OutputDirectoryDefault, RuntimePlaceholder} from "./Plugins/Resources";
+import { FullHashPlaceholder, IdPlaceholder, OutputDirectoryDefault, RuntimePlaceholder } from "./Plugins/Resources";
 
 const config = (env) => {
 
@@ -38,10 +38,8 @@ const config = (env) => {
 
     const sanitizedPluginsRelativePath: string = sanitizeCommandLineParam(env.pluginsRelativePath);
 
-    const standardConfig: Configuration = getCommonConfiguration("Views", env.useCache, sanitizeCommandLineParam(env.assemblyName), sanitizedPluginsRelativePath, env.forHotReload);
+    const standardConfig: Configuration = getCommonConfiguration(env.useCache ? "viewsCache" : "", "Views", sanitizeCommandLineParam(env.assemblyName), sanitizedPluginsRelativePath, env.forHotReload);
 
-    (standardConfig.cache as any).name = "viewsCache";
-
     standardConfig.optimization = {
         runtimeChunk: {
             name: "ViewsRuntime"
@@ -88,7 +86,11 @@ const config = (env) => {
             client: {
                 overlay: false
             },
-            allowedHosts: "all"
+            allowedHosts: "all",
+            headers: {
+                "Access-Control-Allow-Origin": "*",
+                "Cache-Control": "no-store"
+            }
         };
     }