Merge branch 'upgrade-webpack-5-karma' into staging

CruGlobal · Nov 11, 2024 · d20b0b6 · d20b0b6
2 parents 6a56fd3 + 90bbae1
commit d20b0b6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v4
         with:
-          node-version-file: .tool-versions
+          node-version-file: .node-version
       - name: 📦 Install Dependencies
         run: yarn install --immutable --immutable-cache
       - name: 🧪 Run Tests
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v4
         with:
-          node-version-file: .tool-versions
+          node-version-file: .node-version
       - name: 📦 Install Dependencies
         run: yarn install --immutable --immutable-cache
       - name: 💨 ESLint
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v4
         with:
-          node-version-file: .tool-versions
+          node-version-file: .node-version
       - name: 📦 Install Dependencies
         run: yarn install --immutable --immutable-cache
       - name: ✅ TypeScript lint
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v4
         with:
-          node-version-file: .tool-versions
+          node-version-file: .node-version
       - name: 📦 Install Dependencies
         run: yarn install --immutable --immutable-cache
       - name: 💅 Prettier Check
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v4
         with:
-          node-version-file: .tool-versions
+          node-version-file: .node-version
       - name: 📦 Install Dependencies
         run: yarn install --immutable --immutable-cache --check-cache
   deploy:
@@ -82,7 +82,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v4
         with:
-          node-version-file: .tool-versions
+          node-version-file: .node-version
       - name: 📦 Install Dependencies
         run: yarn install --immutable --immutable-cache
       - name: 🔨 Build

diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+18.20.4
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1 @@
-nodejs 18.20.4
 yarn 1.22.17
diff --git a/webpack.config.js b/webpack.config.js
@@ -96,14 +96,12 @@ module.exports = (env = {}) => {
               filename: 'browserUnsupported.html',
               excludeAssets: /.*\.js/, // Only import CSS
               minify: htmlMinDefaults,
-              chunks: ['manifest'],
             }),
             new HtmlWebpackPlugin({
               template: 'app/maintenanceMode.ejs',
               filename: 'maintenanceMode.html',
               excludeAssets: /.*\.js/, // Only import CSS
               minify: htmlMinDefaults,
-              chunks: ['manifest'],
             }),
             new HtmlWebpackSkipAssetsPlugin(),
             new FaviconsWebpackPlugin('./app/img/favicon.png'),