fix(deps): upgrade to pre-releases of the project and js plugins

example.js

@@ -5,7 +5,7 @@ import stubbedFs from 'mock-fs';
 import * as td from 'testdouble';
 import any from '@travi/any';
 
-// remark-usage-ignore-next 12
+// remark-usage-ignore-next 13
 const stubbedNodeModules = stubbedFs.load(resolve('node_modules'));
 const error = new Error('Command failed with exit code 1: npm ls husky --json');
 error.exitCode = 1;
@@ -18,6 +18,7 @@ td.when(execa('. ~/.nvm/nvm.sh && nvm install', {shell: true})).thenReturn({stdo
 td.when(execa('npm', ['ls', 'husky', '--json'])).thenReject(error);
 td.when(execa('npm run generate:md && npm test', {shell: true})).thenReturn({stdout: {pipe: () => undefined}});
 td.when(execa('npm', ['whoami'])).thenResolve({stdout: any.word()});
+td.when(execa('npm', ['--version'])).thenResolve({stdout: any.word()});
 
 const {packageManagers} = await import('@form8ion/javascript-core');
 const githubPlugin = await import('@form8ion/github');

package.json

@@ -57,9 +57,9 @@
   "dependencies": {
     "@form8ion/config-file": "^1.1.2",
     "@form8ion/core": "^4.7.1",
-    "@form8ion/javascript": "^13.0.2",
+    "@form8ion/javascript": "^14.0.0-beta.1",
     "@form8ion/javascript-core": "^12.0.0",
-    "@form8ion/project": "^20.0.0",
+    "@form8ion/project": "^21.0.0-beta.1",
     "deepmerge": "^4.2.2"
   },
   "devDependencies": {

src/scaffold.js

@@ -30,8 +30,7 @@ export default async function ({projectRoot, scope, projectName}) {
 
   return {
     scripts: {'lint:js': 'eslint .'},
-    dependencies: [`@form8ion/${projectName}`],
-    devDependencies: [`@${scope}/eslint-config`],
+    dependencies: {javascript: {production: [`@form8ion/${projectName}`], development: [`@${scope}/eslint-config`]}},
     nextSteps: [
       {summary: 'Save the extended `@form8ion` eslint-config as an exact version'},
       {summary: 'Document saving this config using the dev flag'},

src/scaffold.test.js

@@ -24,7 +24,7 @@ describe('scaffold', () => {
     const configShortName = any.word();
     const projectName = `eslint-config-${configShortName}`;
 
-    const {scripts, dependencies, devDependencies, nextSteps} = await scaffold({projectRoot, projectName, scope});
+    const {scripts, dependencies, nextSteps} = await scaffold({projectRoot, projectName, scope});
 
     expect(write).toHaveBeenCalledWith({
       path: projectRoot,
@@ -47,8 +47,8 @@ describe('scaffold', () => {
 `
     );
     expect(scripts).toEqual({'lint:js': 'eslint .'});
-    expect(dependencies).toEqual([`@form8ion/${projectName}`]);
-    expect(devDependencies).toEqual([`@${scope}/eslint-config`]);
+    expect(dependencies.javascript.production).toEqual([`@form8ion/${projectName}`]);
+    expect(dependencies.javascript.development).toEqual([`@${scope}/eslint-config`]);
     expect(nextSteps).toEqual([
       {summary: 'Save the extended `@form8ion` eslint-config as an exact version'},
       {summary: 'Document saving this config using the dev flag'},

test/integration/features/step_definitions/common-steps.js

@@ -9,7 +9,14 @@ import any from '@travi/any';
 import {After, Before, When} from '@cucumber/cucumber';
 import testDebug from 'debug';
 
-let pluginName, extendEslintConfig, scaffoldEslintConfig, projectQuestionNames, jsQuestionNames, scaffoldJs;
+let pluginName,
+  extendEslintConfig,
+  scaffoldEslintConfig,
+  projectQuestionNames,
+  jsQuestionNames,
+  scaffoldJs,
+  testForJs,
+  liftJs;
 const __dirname = dirname(fileURLToPath(import.meta.url));        // eslint-disable-line no-underscore-dangle
 const debug = testDebug('test');
 
@@ -35,7 +42,7 @@ Before(async function () {
   pluginName = configExtender.PLUGIN_NAME;
   projectQuestionNames = projectScaffolder.questionNames;
   jsQuestionNames = jsPlugin.questionNames;
-  scaffoldJs = jsPlugin.scaffold;
+  ({scaffold: scaffoldJs, test: testForJs, lift: liftJs} = jsPlugin);
 
   stubbedFs({
     node_modules: stubbedFs.load(resolve(__dirname, '../../../../', 'node_modules'))
@@ -101,7 +108,9 @@ When('the high-level scaffolder is executed', async function () {
           },
           configs: {eslint: {scope: `@${any.word()}`}},
           decisions
-        })
+        }),
+        lift: liftJs,
+        test: testForJs
       })
     );
   } catch (e) {

test/integration/features/step_definitions/dependencies-steps.js

@@ -0,0 +1,31 @@
+import {DEV_DEPENDENCY_TYPE, PROD_DEPENDENCY_TYPE} from '@form8ion/javascript-core';
+
+import * as td from 'testdouble';
+import {Then} from '@cucumber/cucumber';
+
+function escapeSpecialCharacters(string) {
+  return string.replace(/[.*+?^$\-{}()|[\]\\]/g, '\\$&');
+}
+
+function assertDevDependencyIsInstalled(execa, dependencyName) {
+  td.verify(
+    execa(td.matchers.contains(
+      new RegExp(`(npm install|yarn add).*${escapeSpecialCharacters(dependencyName)}.*${DEV_DEPENDENCY_TYPE}`)
+    )),
+    {ignoreExtraArgs: true}
+  );
+}
+
+function assertProdDependencyIsInstalled(execa, dependencyName) {
+  td.verify(
+    execa(td.matchers.contains(
+      new RegExp(`(npm install|yarn add).*${escapeSpecialCharacters(dependencyName)}.*${PROD_DEPENDENCY_TYPE}`)
+    )),
+    {ignoreExtraArgs: true}
+  );
+}
+
+Then('dependencies are installed', async function () {
+  assertProdDependencyIsInstalled(this.execa, `@form8ion/${this.projectName}`);
+  assertDevDependencyIsInstalled(this.execa, `@${this.scope}/eslint-config`);
+});

test/integration/features/step_definitions/npm-steps.js

@@ -7,4 +7,5 @@ Given(/^the npm cli is logged in$/, function () {
 
   td.when(this.execa('npm run generate:md && npm test', {shell: true})).thenReturn({stdout: {pipe: () => undefined}});
   td.when(this.execa('npm', ['whoami'])).thenResolve({stdout: this.npmAccount});
+  td.when(this.execa('npm', ['--version'])).thenResolve({stdout: any.word()});
 });

test/integration/features/wrapper.feature

@@ -5,3 +5,4 @@ Feature: wrapper
     And the npm cli is logged in
     When the high-level scaffolder is executed
     Then the proper form8ion config is extended
+    And dependencies are installed