hof 24.0.0-vite-beta.5 → 24.0.0-vite-beta.6

package/build/tasks/vite/vite.config.js

@@ -2,39 +2,36 @@
 'use strict';
 
 import { defineConfig } from 'vite';
-import {resolve} from 'path';
-const __dirname = import.meta.dirname;
+import { resolve } from 'path';
+import fs from 'fs';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+const projectRoot = process.cwd();
+const publicDir = resolve(projectRoot, 'public');
+
+const entryFile = (() => {
+  const src = resolve(process.cwd(), 'assets/js/index.js');
+  if (fs.existsSync(src)) return src;
+
+  throw new Error(`vite: entry file not found. Checked: ${src}`);
+})();
 
 export default defineConfig({
-  root: '../../../frontend',
-  build: {
-    outDir: resolve(__dirname, '../../../../public/assets'),
-    emptyOutDir: true,
-    rollupOptions: {
-      input: {
-        index: resolve(__dirname, '../../../../hof/frontend/themes/gov-uk/client-js/index.js'),
-        styles: resolve(__dirname, '../../../../hof/frontend/themes/gov-uk/styles/govuk.scss')
-      }
-    },
-    css: {
-      preprocessorOptions: {
-        scss: {
-          includes: ['node_modules']
-        }
-      }
-    }
-  },
-  // Custom plugin to suppress specific resolve warnings.
-  // Vite does not process and optimise static images and assets files, it uses a src/ folder.
-  // the images and assets folders are therefore loaded at runtime from the public/ folder.
-  // This should be resolved with the v5/nunjucks work so we can ignore these warnings for now.
-  // TO DO: Remove this when v5/nunjucks is implemented.
   plugins: [
+    commonjs({
+      include: [/node_modules/, /assets\/js/, /frontend/]
+    }),
+    nodeResolve({ browser: true, preferBuiltins: false }),
+    // Intercept all console warnings printed during build
+    // Custom plugin to suppress specific resolve warnings.
+    // Vite does not process and optimise static images and assets files, it uses a src/ folder.
+    // the images and assets folders are therefore loaded at runtime from the public/ folder.
+    // This should be resolved with the v5/nunjucks work so we can ignore these warnings for now.
+    // TO DO: Remove this when v5/nunjucks is implemented.
     {
       name: 'suppress-resolve-warnings',
       apply: 'build',
       configResolved() {
-        // Intercept all console warnings printed during build
         const originalWarning = console.warn;
         console.warn = (...args) => {
           if (
@@ -49,5 +46,34 @@ export default defineConfig({
         };
       }
     }
-  ]
+  ],
+  target: 'es2018', // ensures browser-compatible output
+  base: '/assets/',
+  build: {
+    outDir: publicDir,
+    emptyOutDir: false,
+    rollupOptions: {
+      input: {
+        index: entryFile
+      },
+      output: {
+        entryFileNames: 'js/bundle.js',
+        chunkFileNames: 'js/[name]-[hash].js',
+        assetFileNames: assetInfo => {
+          const ext = assetInfo.name && assetInfo.name.split('.').pop();
+          if (/css/i.test(ext)) return 'css/[name]-[hash][extname]';
+          if (/svg|png|jpg|jpeg|gif|webp|ico/i.test(ext)) return 'images/[name]-[hash][extname]';
+          return 'assets/[name]-[hash][extname]';
+        },
+        format: 'iife'
+      }
+    },
+    css: {
+      preprocessorOptions: {
+        scss: {
+          includes: ['node_modules']
+        }
+      }
+    }
+  }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "24.0.0-vite-beta.5",
+  "version": "24.0.0-vite-beta.6",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -100,6 +100,8 @@
   "devDependencies": {
     "@cucumber/cucumber": "^7.3.2",
     "@cucumber/pretty-formatter": "^1.0.1",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@types/jest": "^26.0.24",
     "@xmldom/xmldom": "~0.8.11",
     "chai": "^3.5.0",