Review feedback

index.js

@@ -1,4 +1,5 @@
 const fs = require('fs-extra');
+const internalLib = require('./lib/internals.js');
 
 module.exports = {
   before: '@apostrophecms/asset',
@@ -194,7 +195,7 @@ module.exports = {
         await fs.mkdir(self.buildRoot, { recursive: true });
       },
       // Internal implementation.
-      ...require('./lib/internals.js')(self)
+      ...internalLib(self)
     };
   }
 };

lib/internals.js

@@ -1,5 +1,9 @@
 const path = require('node:path');
 const fs = require('fs-extra');
+const viteBaseConfig = require('./vite-base-config');
+const viteAposConfig = require('./vite-apos-config');
+const vitePublicConfig = require('./vite-public-config');
+const viteServeConfig = require('./vite-serve-config');
 
 module.exports = (self) => {
   return {
@@ -436,7 +440,7 @@ module.exports = (self) => {
       self.viteDevInstance = instance;
 
       self.apos.util.log(
-          `HMR for "${options.devServer}" started`
+        `HMR for "${options.devServer}" started`
       );
     },
 
@@ -811,13 +815,13 @@ module.exports = (self) => {
      * @returns {Promise<import('vite').UserConfig>}
      */
     async getBaseViteConfig(id, options, env) {
-      return require('./vite-base-config')({
+      return viteBaseConfig({
         mode: env.mode,
         base: self.apos.asset.getAssetBaseUrl(),
         root: self.buildRoot,
         cacheDir: path.join(self.cacheDirBase, id),
         manifestRelPath: self.buildManifestPath[`${id}Rel`],
-        sourcemaps: options.sourcemaps
+        sourceMaps: options.sourcemaps
       });
     },
 
@@ -833,7 +837,7 @@ module.exports = (self) => {
      */
     async getAposViteConfig(baseConfig) {
       const vite = await import('vite');
-      const aposConfig = await require('./vite-apos-config')({
+      const aposConfig = await viteAposConfig({
         sourceRoot: self.buildRootSource,
         input: self.getBuildInputs('apos')
       });
@@ -863,7 +867,7 @@ module.exports = (self) => {
 
       const mergeConfigs = vite.defineConfig(async (configEnv) => {
         // The base public config
-        const publicConfig = await require('./vite-public-config')({
+        const publicConfig = await vitePublicConfig({
           input: self.getBuildInputs('public')
         });
 
@@ -917,7 +921,7 @@ module.exports = (self) => {
       }
 
       const { mergeConfig } = await import('vite');
-      const serveConfig = await require('./vite-serve-config')({
+      const serveConfig = await viteServeConfig({
         app: self.apos.app,
         httpServer: self.apos.modules['@apostrophecms/express'].server,
         hasHMR: buildOptions.hmr,

lib/vite-apos-config.js

@@ -17,7 +17,8 @@ module.exports = async ({
       }
     },
     plugins: [
-      apos.default({ sourceRoot }), vue.default()
+      apos.default({ sourceRoot }),
+      vue.default()
     ],
     build: {
       chunkSizeWarningLimit: 2000,

lib/vite-base-config.js

@@ -1,5 +1,5 @@
 module.exports = ({
-  mode, base, root, cacheDir, manifestRelPath, sourcemaps
+  mode, base, root, cacheDir, manifestRelPath, sourceMaps
 }) => {
   /** @type {import('vite').UserConfig} */
   const config = {
@@ -30,7 +30,7 @@ module.exports = ({
       outDir: 'dist',
       cssCodeSplit: true,
       manifest: manifestRelPath,
-      sourcemap: sourcemaps,
+      sourcemap: sourceMaps,
       emptyOutDir: false,
       assetDir: 'assets',
       rollupOptions: {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@apostrophecms/vite",
   "version": "1.0.0",
-  "description": "Vite build flow for Apostrophe CMS projects.",
+  "description": "Vite build flow for ApostropheCMS projects.",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

test/modules/admin-bar-component/ui/apos/components/TheAposAdminBar.vue

@@ -1,3 +1,3 @@
 <template>
   <h1>The Apos Admin Bar</h1>
-</template>;
+</template>

test/vite.test.js

@@ -40,12 +40,19 @@ describe('@apostrophecms/vite', function () {
       });
     });
     it('should have vite enabled', function () {
-      const actual = Object.keys(apos.modules).includes('@apostrophecms/vite');
-      const expected = true;
+      const actual = {
+        isViteEnabled: Object.keys(apos.modules).includes('@apostrophecms/vite'),
+        buildModuleAlias: apos.asset.getBuildModuleAlias(),
+        buildModuleConfigName: apos.asset.getBuildModuleConfig().name
+      };
+
+      const expected = {
+        isViteEnabled: true,
+        buildModuleAlias: 'vite',
+        buildModuleConfigName: '@apostrophecms/vite'
+      };
 
-      assert.equal(actual, expected);
-      assert.equal(apos.asset.getBuildModuleAlias(), 'vite');
-      assert.equal(apos.asset.getBuildModuleConfig().name, '@apostrophecms/vite');
+      assert.deepEqual(actual, expected);
     });
   });