From a7831f3f71d5865ec94b0dd4cab68d26f92ce2d9 Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Mon, 22 Nov 2021 17:45:55 +0000
Subject: [PATCH 1/9] Updated deps, including webpack. Updated webpack config
 to new format, and explicitly passed it to the build cmd as it wasn't being
 picked up automatically.

---
 Content/default/Build.fs          |  2 +-
 Content/default/package.json      | 28 +++++++++----------
 Content/default/webpack.config.js | 45 ++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index 06b912bb..ecbf888a 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -46,7 +46,7 @@ Target.create "Azure" (fun _ ->
 Target.create "Run" (fun _ ->
     run dotnet "build" sharedPath
     [ "server", dotnet "watch run" serverPath
-      "client", dotnet "fable watch -o output -s --run webpack-dev-server" clientPath ]
+      "client", dotnet "fable watch -o output -s --run webpack-dev-server --config ../../webpack.config.js" clientPath ]
     |> runParallel
 )
 
diff --git a/Content/default/package.json b/Content/default/package.json
index ec372af9..19415ffb 100644
--- a/Content/default/package.json
+++ b/Content/default/package.json
@@ -6,20 +6,20 @@
         "test:live": "webpack-dev-server --config webpack.tests.config.js"
     },
     "devDependencies": {
-        "copy-webpack-plugin": "^6.1.0",
-        "css-loader": "^5.2.6",
-        "file-loader": "^4.2.0",
-        "html-webpack-plugin": "^3.2.0",
-        "mini-css-extract-plugin": "^0.10.0",
-        "react": "^16.10.2",
-        "react-dom": "^16.10.2",
+        "copy-webpack-plugin": "^9.1.0",
+        "css-loader": "^6.5.1",
+        "file-loader": "^6.2.0",
+        "html-webpack-plugin": "^5.5.0",
+        "mini-css-extract-plugin": "^2.4.5",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
         "remotedev": "^0.2.9",
-        "sass": "^1.34.0",
-        "sass-loader": "^9.0.3",
-        "source-map-loader": "^1.1.3",
-        "style-loader": "^1.2.1",
-        "webpack": "^4.41.2",
-        "webpack-cli": "^3.3.9",
-        "webpack-dev-server": "^3.8.2"
+        "sass": "^1.43.4",
+        "sass-loader": "^12.3.0",
+        "source-map-loader": "^3.0.0",
+        "style-loader": "^3.3.1",
+        "webpack": "^5.64.2",
+        "webpack-cli": "^4.9.1",
+        "webpack-dev-server": "^4.5.0"
     }
 }
diff --git a/Content/default/webpack.config.js b/Content/default/webpack.config.js
index 9677fa02..4a828150 100644
--- a/Content/default/webpack.config.js
+++ b/Content/default/webpack.config.js
@@ -10,6 +10,11 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 var MiniCssExtractPlugin = require('mini-css-extract-plugin')
 
+// If we're running the webpack-dev-server, assume we're in development mode
+var isProduction = !process.argv.find(v => v.indexOf('webpack-dev-server') !== -1);
+var mode = isProduction ? 'production' : 'development';
+process.env.NODE_ENV = mode;
+
 var CONFIG = {
     // The tags to include the generated JS and CSS will be automatically injected in the HTML template
     // See https://github.com/jantimon/html-webpack-plugin
@@ -24,21 +29,17 @@ var CONFIG = {
         // redirect requests that start with /api/ to the server on port 8085
         '/api/**': {
             target: 'http://localhost:' + (process.env.SERVER_PROXY_PORT || "8085"),
-               changeOrigin: true
-           },
+            changeOrigin: true
+        },
         // redirect websocket requests that start with /socket/ to the server on the port 8085
         '/socket/**': {
             target: 'http://localhost:' + (process.env.SERVER_PROXY_PORT || "8085"),
             ws: true
-           }
-       }
+        }
+    }
 }
 
-// If we're running the webpack-dev-server, assume we're in development mode
-var isProduction = !process.argv.find(v => v.indexOf('webpack-dev-server') !== -1);
-var environment = isProduction ? 'production' : 'development';
-process.env.NODE_ENV = environment;
-console.log('Bundling for ' + environment + '...');
+console.log('Bundling for ' + mode + '...');
 
 // The HtmlWebpackPlugin allows us to use a template for the index.html page
 // and automatically injects <script> or <link> tags for generated bundles.
@@ -61,13 +62,25 @@ module.exports = {
     // to prevent browser caching if code changes
     output: {
         path: resolve(CONFIG.outputDir),
+        publicPath: '/',
         filename: isProduction ? '[name].[hash].js' : '[name].js'
     },
-    mode: isProduction ? 'production' : 'development',
+    mode: mode,
     devtool: isProduction ? 'source-map' : 'eval-source-map',
     optimization: {
+        runtimeChunk: "single",
+        moduleIds: 'deterministic',
+        // Split the code coming from npm packages into a different file.
+        // 3rd party dependencies change less often, let the browser cache them.
         splitChunks: {
-            chunks: 'all'
+            cacheGroups: {
+                commons: {
+                    test: /node_modules/,
+                    name: "vendors",
+                    chunks: "all",
+                    enforce: true
+                }
+            }
         },
     },
     // Besides the HtmlPlugin, we use the following plugins:
@@ -80,7 +93,7 @@ module.exports = {
     plugins: isProduction ?
         commonPlugins.concat([
             new MiniCssExtractPlugin({ filename: 'style.[name].[hash].css' }),
-            new CopyWebpackPlugin({ patterns: [{ from: resolve(CONFIG.assetsDir) }]}),
+            new CopyWebpackPlugin({ patterns: [{ from: resolve(CONFIG.assetsDir) }] }),
         ])
         : commonPlugins.concat([
             new webpack.HotModuleReplacementPlugin(),
@@ -91,13 +104,15 @@ module.exports = {
     },
     // Configuration for webpack-dev-server
     devServer: {
-        publicPath: '/',
-        contentBase: resolve(CONFIG.assetsDir),
+        static: {
+            directory: resolve(CONFIG.assetsDir),
+            publicPath: '/'
+        },
         host: '0.0.0.0',
         port: CONFIG.devServerPort,
         proxy: CONFIG.devServerProxy,
         hot: true,
-        inline: true
+        historyApiFallback: true
     },
     // - sass-loaders: transforms SASS/SCSS into JS
     // - file-loader: Moves files referenced in the code (fonts, images) into output folder

From be13b37e166b785681fba985e0564817de620ef1 Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Mon, 22 Nov 2021 18:00:33 +0000
Subject: [PATCH 2/9] Keep split chunks simple as per docs

---
 Content/default/webpack.config.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Content/default/webpack.config.js b/Content/default/webpack.config.js
index 4a828150..e10814ff 100644
--- a/Content/default/webpack.config.js
+++ b/Content/default/webpack.config.js
@@ -73,15 +73,8 @@ module.exports = {
         // Split the code coming from npm packages into a different file.
         // 3rd party dependencies change less often, let the browser cache them.
         splitChunks: {
-            cacheGroups: {
-                commons: {
-                    test: /node_modules/,
-                    name: "vendors",
-                    chunks: "all",
-                    enforce: true
-                }
-            }
-        },
+            chunks: 'all'
+        }
     },
     // Besides the HtmlPlugin, we use the following plugins:
     // PRODUCTION

From ecbdd1ac03331206d5b63751753cca60b3e3a2e8 Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Tue, 23 Nov 2021 12:06:03 +0000
Subject: [PATCH 3/9] Updated minimal template deps and webpack config

---
 Content/minimal/package.json      | 10 ++++-----
 Content/minimal/webpack.config.js | 36 ++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/Content/minimal/package.json b/Content/minimal/package.json
index fc9217b8..0207b6b1 100644
--- a/Content/minimal/package.json
+++ b/Content/minimal/package.json
@@ -1,10 +1,10 @@
 {
     "private": true,
     "devDependencies": {
-        "copy-webpack-plugin": "^6.4.0",
-        "html-webpack-plugin": "^3.2.0",
-        "webpack": "^4.44.2",
-        "webpack-cli": "^3.3.12",
-        "webpack-dev-server": "^3.11.0"
+        "copy-webpack-plugin": "^9.1.0",
+        "html-webpack-plugin": "^5.5.0",
+        "webpack": "^5.64.2",
+        "webpack-cli": "^4.9.1",
+        "webpack-dev-server": "^4.5.0"
     }
 }
diff --git a/Content/minimal/webpack.config.js b/Content/minimal/webpack.config.js
index 889c98e0..e47da8e4 100644
--- a/Content/minimal/webpack.config.js
+++ b/Content/minimal/webpack.config.js
@@ -2,6 +2,11 @@ var path = require('path');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 
+// If we're running the webpack-dev-server, assume we're in development mode
+var isProduction = !process.argv.find(v => v.indexOf('webpack-dev-server') !== -1);
+var mode = isProduction ? 'production' : 'development';
+process.env.NODE_ENV = mode;
+
 function resolve(filePath) {
     return path.join(__dirname, filePath);
 }
@@ -25,32 +30,39 @@ var copyPlugin =
 
 // Configuration for webpack-dev-server
 var devServer = {
-    publicPath: '/',
-    contentBase: resolve('./src/Client/public'),
+    static: {
+        directory: resolve('./src/Client/public'),
+        publicPath: '/'
+    },
     host: '0.0.0.0',
     port: 8080,
-    inline: true,
     proxy: {
         // Redirect requests that start with /api/ to the server on port 8085
         '/api/**': {
             target: 'http://localhost:8085',
             changeOrigin: true
         }
-    }
+    },
+    hot: true,
+    historyApiFallback: true
 };
 
-// If we're running the webpack-dev-server, assume we're in development mode
-var isProduction = !process.argv.find(v => v.indexOf('webpack-dev-server') !== -1);
-var environment = isProduction ? 'production' : 'development';
-process.env.NODE_ENV = environment;
-console.log('Bundling for ' + environment + '...');
+console.log('Bundling for ' + mode + '...');
 
 module.exports = {
     entry: { app: resolve('./src/Client/Client.fs.js') },
     output: { path: resolve('./deploy/public') },
     resolve: { symlinks: false }, // See https://github.com/fable-compiler/Fable/issues/1490
-    mode: isProduction ? 'production' : 'development',
+    mode: mode,
     plugins: isProduction ? [htmlPlugin, copyPlugin] : [htmlPlugin],
-    optimization: { splitChunks: { chunks: 'all' } },
-    devServer: devServer,
+    optimization: {
+        runtimeChunk: "single",
+        moduleIds: 'deterministic',
+        // Split the code coming from npm packages into a different file.
+        // 3rd party dependencies change less often, let the browser cache them.
+        splitChunks: {
+            chunks: 'all'
+        }
+    },
+    devServer: devServer
 };
\ No newline at end of file

From 6effceab778685d5e3f661732e88cf6a904b5beb Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Tue, 23 Nov 2021 12:18:15 +0000
Subject: [PATCH 4/9] Updated webpack tests config

---
 Content/default/webpack.tests.config.js | 28 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/Content/default/webpack.tests.config.js b/Content/default/webpack.tests.config.js
index 434131b9..1921267a 100644
--- a/Content/default/webpack.tests.config.js
+++ b/Content/default/webpack.tests.config.js
@@ -10,6 +10,11 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 var MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
+// If we're running the webpack-dev-server, assume we're in development mode
+var isProduction = !process.argv.find(v => v.indexOf('webpack-dev-server') !== -1);
+var mode = isProduction ? 'production' : 'development';
+process.env.NODE_ENV = mode;
+
 var CONFIG = {
     // The tags to include the generated JS and CSS will be automatically injected in the HTML template
     // See https://github.com/jantimon/html-webpack-plugin
@@ -23,11 +28,7 @@ var CONFIG = {
     devServerProxy: undefined,
 }
 
-// If we're running the webpack-dev-server, assume we're in development mode
-var isProduction = !process.argv.find(v => v.indexOf('webpack-dev-server') !== -1);
-var environment = isProduction ? 'production' : 'development';
-process.env.NODE_ENV = environment;
-console.log('Bundling for ' + environment + '...');
+console.log('Bundling for ' + mode + '...');
 
 // The HtmlWebpackPlugin allows us to use a template for the index.html page
 // and automatically injects <script> or <link> tags for generated bundles.
@@ -50,14 +51,19 @@ module.exports = {
     // to prevent browser caching if code changes
     output: {
         path: resolve(CONFIG.outputDir),
+        publicPath: '/',
         filename: isProduction ? '[name].[hash].js' : '[name].js'
     },
-    mode: isProduction ? 'production' : 'development',
+    mode: mode,
     devtool: isProduction ? 'source-map' : 'eval-source-map',
     optimization: {
+        runtimeChunk: "single",
+        moduleIds: 'deterministic',
+        // Split the code coming from npm packages into a different file.
+        // 3rd party dependencies change less often, let the browser cache them.
         splitChunks: {
             chunks: 'all'
-        },
+        }
     },
     // Besides the HtmlPlugin, we use the following plugins:
     // PRODUCTION
@@ -80,13 +86,15 @@ module.exports = {
     },
     // Configuration for webpack-dev-server
     devServer: {
-        publicPath: '/',
-        contentBase: resolve(CONFIG.assetsDir),
+        static: {
+            directory: resolve(CONFIG.assetsDir),
+            publicPath: '/'
+        },
         host: '0.0.0.0',
         port: CONFIG.devServerPort,
         proxy: CONFIG.devServerProxy,
         hot: true,
-        inline: true
+        historyApiFallback: true
     },
     // - sass-loaders: transforms SASS/SCSS into JS
     // - file-loader: Moves files referenced in the code (fonts, images) into output folder

From 2e610636415404cae06ab27e90fbe5f18c3a957d Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Wed, 1 Dec 2021 11:56:31 +0000
Subject: [PATCH 5/9] Updated webpack success phrase to match new format

---
 .paket/Paket.Restore.targets | 76 ++++++++++++++++++++++++++++++++----
 tests/Tests.fs               |  2 +-
 2 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index f959215a..4deb15bc 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -159,7 +159,7 @@
 		This value should match the version in the props generated by paket
 		If they differ, this means we need to do a restore in order to ensure correct dependencies
 	-->
-    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '6.0.0' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
     </PropertyGroup>
 
@@ -236,13 +236,16 @@
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
         <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
-        <CopyLocal Condition="'%(PaketReferencesFileLinesInfo.Splits)' == '6'">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
+        <CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
+        <OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
+        <ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
         <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
-        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
-        <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
+        <ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.ImportTargets) == 'false'">$(ExcludeAssets);build;buildMultitargeting;buildTransitive</ExcludeAssets>
         <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
         <AllowExplicitVersion>true</AllowExplicitVersion>
       </PackageReference>
@@ -289,14 +292,16 @@
     <PropertyGroup>
       <PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
       <ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
+      <UseMSBuild16_10_Pack>false</UseMSBuild16_10_Pack>
+      <UseMSBuild16_10_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND '@(MSBuildMinorVersion)' > '10' ">true</UseMSBuild16_10_Pack>
       <UseMSBuild16_0_Pack>false</UseMSBuild16_0_Pack>
-      <UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' ">true</UseMSBuild16_0_Pack>
+      <UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild16_0_Pack>
       <UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack>
       <UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8' ">true</UseMSBuild15_9_Pack>
       <UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
-      <UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack>
+      <UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseMSBuild15_8_Pack>
       <UseNuGet4_Pack>false</UseNuGet4_Pack>
-      <UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseNuGet4_Pack>
+      <UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) AND (! $(UseMSBuild16_10_Pack)) ">true</UseNuGet4_Pack>
       <AdjustedNuspecOutputPath>$(PaketIntermediateOutputPath)\$(Configuration)</AdjustedNuspecOutputPath>
       <AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(PaketIntermediateOutputPath)</AdjustedNuspecOutputPath>
     </PropertyGroup>
@@ -314,6 +319,55 @@
     </ConvertToAbsolutePath>
 
     <!-- Call Pack -->
+    <PackTask Condition="$(UseMSBuild16_10_Pack)"
+              PackItem="$(PackProjectInputFile)"
+              PackageFiles="@(_PackageFiles)"
+              PackageFilesToExclude="@(_PackageFilesToExclude)"
+              PackageVersion="$(PackageVersion)"
+              PackageId="$(PackageId)"
+              Title="$(Title)"
+              Authors="$(Authors)"
+              Description="$(Description)"
+              Copyright="$(Copyright)"
+              RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
+              LicenseUrl="$(PackageLicenseUrl)"
+              ProjectUrl="$(PackageProjectUrl)"
+              IconUrl="$(PackageIconUrl)"
+              ReleaseNotes="$(PackageReleaseNotes)"
+              Tags="$(PackageTags)"
+              DevelopmentDependency="$(DevelopmentDependency)"
+              BuildOutputInPackage="@(_BuildOutputInPackage)"
+              TargetPathsToSymbols="@(_TargetPathsToSymbols)"
+              SymbolPackageFormat="$(SymbolPackageFormat)"
+              TargetFrameworks="@(_TargetFrameworks)"
+              AssemblyName="$(AssemblyName)"
+              PackageOutputPath="$(PackageOutputAbsolutePath)"
+              IncludeSymbols="$(IncludeSymbols)"
+              IncludeSource="$(IncludeSource)"
+              PackageTypes="$(PackageType)"
+              IsTool="$(IsTool)"
+              RepositoryUrl="$(RepositoryUrl)"
+              RepositoryType="$(RepositoryType)"
+              SourceFiles="@(_SourceFiles->Distinct())"
+              NoPackageAnalysis="$(NoPackageAnalysis)"
+              MinClientVersion="$(MinClientVersion)"
+              Serviceable="$(Serviceable)"
+              FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
+              ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
+              NuspecOutputPath="$(AdjustedNuspecOutputPath)"
+              IncludeBuildOutput="$(IncludeBuildOutput)"
+              BuildOutputFolders="$(BuildOutputTargetFolder)"
+              ContentTargetFolders="$(ContentTargetFolders)"
+              RestoreOutputPath="$(RestoreOutputAbsolutePath)"
+              NuspecFile="$(NuspecFileAbsolutePath)"
+              NuspecBasePath="$(NuspecBasePath)"
+              NuspecProperties="$(NuspecProperties)"
+              PackageLicenseFile="$(PackageLicenseFile)"
+              PackageLicenseExpression="$(PackageLicenseExpression)"
+              PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
+              Readme="$(PackageReadmeFile)"
+              NoDefaultExcludes="$(NoDefaultExcludes)"/>
+
     <PackTask Condition="$(UseMSBuild16_0_Pack)"
               PackItem="$(PackProjectInputFile)"
               PackageFiles="@(_PackageFiles)"
@@ -343,6 +397,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -391,6 +447,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -434,6 +492,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
@@ -476,6 +536,8 @@
               IsTool="$(IsTool)"
               RepositoryUrl="$(RepositoryUrl)"
               RepositoryType="$(RepositoryType)"
+              RepositoryBranch="$(RepositoryBranch)"
+              RepositoryCommit="$(RepositoryCommit)"
               SourceFiles="@(_SourceFiles->Distinct())"
               NoPackageAnalysis="$(NoPackageAnalysis)"
               MinClientVersion="$(MinClientVersion)"
diff --git a/tests/Tests.fs b/tests/Tests.fs
index 0bf1e24d..5a1d7a55 100644
--- a/tests/Tests.fs
+++ b/tests/Tests.fs
@@ -166,7 +166,7 @@ let testTemplateBuild templateType =
         if templateType = Normal then None
         else start dotnet "run" (dir </> "src" </> "Server") |> Some
 
-    let stdOutPhrase = ": Compiled successfully."
+    let stdOutPhrase = "compiled successfully"
     let htmlSearchPhrase = """<title>SAFE Template</title>"""
     try
         let timeout = TimeSpan.FromMinutes 5.

From 346d46d0e9a63be010dd0e8b29347ae33010e0f5 Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Wed, 1 Dec 2021 12:09:04 +0000
Subject: [PATCH 6/9] Bump node version to allow static variables syntax

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b73fcad..7487aa57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ os:
   - osx
 
 before_install:
-  - nvm install 10.12.0
-  - nvm use 10.12.0
+  - nvm install 16.13.0
+  - nvm use 16.13.0
 
 script:
   - dotnet tool restore

From c0d19c488f6eab05d52c8d40447fe5581cdb8e39 Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Wed, 1 Dec 2021 12:46:42 +0000
Subject: [PATCH 7/9] Removing -p flag from webpack as cli no longer supports
 it. According to the docs it was a shortcut for '--optimize-minimize --define
 process.env.NODE_ENV="production"'. We already set the node env in our
 webpack file, and webpack minimises prod code by default since v4.

---
 Content/default/Build.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index ecbf888a..7a659be7 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -24,7 +24,7 @@ Target.create "InstallClient" (fun _ -> run npm "install" ".")
 
 Target.create "Bundle" (fun _ ->
     [ "server", dotnet $"publish -c Release -o \"{deployPath}\"" serverPath
-      "client", dotnet "fable -o output -s --run webpack -p" clientPath ]
+      "client", dotnet "fable -o output -s --run webpack" clientPath ]
     |> runParallel
 )
 

From cf00354be2fdff34273077c624e200c5db9225f2 Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Wed, 1 Dec 2021 13:00:50 +0000
Subject: [PATCH 8/9] Passing config to bundle command explicitly (as we had to
 with run target)

---
 Content/default/Build.fs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content/default/Build.fs b/Content/default/Build.fs
index 7a659be7..30464a76 100644
--- a/Content/default/Build.fs
+++ b/Content/default/Build.fs
@@ -24,7 +24,7 @@ Target.create "InstallClient" (fun _ -> run npm "install" ".")
 
 Target.create "Bundle" (fun _ ->
     [ "server", dotnet $"publish -c Release -o \"{deployPath}\"" serverPath
-      "client", dotnet "fable -o output -s --run webpack" clientPath ]
+      "client", dotnet "fable -o output -s --run webpack --config ../../webpack.config.js" clientPath ]
     |> runParallel
 )
 

From e48ebe1c405fb01f3fd9aeb87183c984fdbaa47a Mon Sep 17 00:00:00 2001
From: Ryan Palmer <ryan@compositional-it.com>
Date: Wed, 1 Dec 2021 13:07:37 +0000
Subject: [PATCH 9/9] Remove explicit hmr plugin as now automatically added
 when dev server options have hot:true

---
 Content/default/webpack.config.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Content/default/webpack.config.js b/Content/default/webpack.config.js
index e10814ff..93c55035 100644
--- a/Content/default/webpack.config.js
+++ b/Content/default/webpack.config.js
@@ -88,9 +88,7 @@ module.exports = {
             new MiniCssExtractPlugin({ filename: 'style.[name].[hash].css' }),
             new CopyWebpackPlugin({ patterns: [{ from: resolve(CONFIG.assetsDir) }] }),
         ])
-        : commonPlugins.concat([
-            new webpack.HotModuleReplacementPlugin(),
-        ]),
+        : commonPlugins,
     resolve: {
         // See https://github.com/fable-compiler/Fable/issues/1490
         symlinks: false