refactor(config-plugins): shifted the logic for including plugins to the config scaffolder

Author: travi

src/config-scaffolder.js

@@ -2,7 +2,7 @@ import {promises as fs} from 'node:fs';
 import {resolve} from 'node:path';
 import mustache from 'mustache';
 import filedirname from 'filedirname';
-import {dialects} from '@form8ion/javascript-core';
+import {dialects, projectTypes} from '@form8ion/javascript-core';
 
 const [, __dirname] = filedirname();
 
@@ -12,7 +12,7 @@ function determineExtensionFor({dialect}) {
   return 'mjs';
 }
 
-export default async function ({projectRoot, dialect}) {
+export default async function ({projectRoot, dialect, projectType}) {
   await fs.writeFile(
     `${projectRoot}/rollup.config.${(determineExtensionFor({dialect}))}`,
     mustache.render(
@@ -21,5 +21,9 @@ export default async function ({projectRoot, dialect}) {
     )
   );
 
-  return {};
+  return {
+    ...projectTypes.CLI === projectType && {
+      devDependencies: ['@rollup/plugin-json', 'rollup-plugin-executable']
+    }
+  };
 }

src/config-scaffolder.test.js

@@ -1,6 +1,6 @@
 import {promises as fs} from 'node:fs';
 import mustache from 'mustache';
-import {dialects} from '@form8ion/javascript-core';
+import {dialects, projectTypes} from '@form8ion/javascript-core';
 
 import any from '@travi/any';
 import {beforeEach, describe, expect, it, vi} from 'vitest';
@@ -38,4 +38,12 @@ describe('config scaffolder', () => {
 
     expect(fs.writeFile).toHaveBeenCalledWith(`${projectRoot}/rollup.config.js`, renderedTemplate);
   });
+
+  it('should adjust for CLI projects', async () => {
+    const dialect = any.word();
+
+    expect(await scaffoldConfig({projectRoot, dialect, projectType: projectTypes.CLI})).toEqual({
+      devDependencies: ['@rollup/plugin-json', 'rollup-plugin-executable']
+    });
+  });
 });

src/scaffolder.js

@@ -1,12 +1,9 @@
 import deepmerge from 'deepmerge';
-import {projectTypes} from '@form8ion/javascript-core';
 
 import scaffoldConfig from './config-scaffolder.js';
 import scaffoldDialect from './dialect.js';
 
 export async function scaffold({projectRoot, dialect, projectType}) {
-  await scaffoldConfig({projectRoot, dialect});
-
   return deepmerge.all([
     {
       devDependencies: ['rollup', 'rollup-plugin-auto-external'],
@@ -15,11 +12,7 @@ export async function scaffold({projectRoot, dialect, projectType}) {
         watch: "run-s 'build:js -- --watch'"
       }
     },
-    {
-      ...projectTypes.CLI === projectType && {
-        devDependencies: ['@rollup/plugin-json', 'rollup-plugin-executable']
-      }
-    },
+    await scaffoldConfig({projectRoot, dialect, projectType}),
     scaffoldDialect({dialect})
   ]);
 }

src/scaffolder.test.js

@@ -1,5 +1,4 @@
 import deepmerge from 'deepmerge';
-import {dialects, projectTypes} from '@form8ion/javascript-core';
 
 import any from '@travi/any';
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
@@ -27,8 +26,11 @@ describe('rollup scaffolder', () => {
 
   it('should configure rollup', async () => {
     const dialect = any.word();
+    const projectType = any.word();
     const dialectResults = any.simpleObject();
+    const configResults = any.simpleObject();
     when(scaffoldDialect).calledWith({dialect}).mockReturnValue(dialectResults);
+    when(scaffoldConfig).calledWith({projectRoot, dialect, projectType}).mockResolvedValue(configResults);
     when(deepmerge.all)
       .calledWith([
         {
@@ -38,35 +40,13 @@ describe('rollup scaffolder', () => {
             watch: 'run-s \'build:js -- --watch\''
           }
         },
-        {},
+        configResults,
         dialectResults
       ])
       .mockReturnValue(mergedResults);
 
-    const results = await scaffold({projectRoot, dialect});
+    const results = await scaffold({projectRoot, dialect, projectType});
 
     expect(results).toEqual(mergedResults);
-    expect(scaffoldConfig).toHaveBeenCalledWith({projectRoot, dialect});
-  });
-
-  it('should handle details for a CLI project', async () => {
-    when(deepmerge.all)
-      .calledWith([
-        {
-          devDependencies: ['rollup', 'rollup-plugin-auto-external'],
-          scripts: {
-            'build:js': 'rollup --config',
-            watch: 'run-s \'build:js -- --watch\''
-          }
-        },
-        {
-          devDependencies: ['@rollup/plugin-json', 'rollup-plugin-executable']
-        },
-        {}
-      ])
-      .mockReturnValue(mergedResults);
-
-    expect(await scaffold({projectRoot, dialect: dialects.BABEL, projectType: projectTypes.CLI}))
-      .toEqual(mergedResults);
   });
 });