fix(dependencies): update additional internal modules to define depen…

…dencies using the modern format

src/code-style/remark/scaffolder.js

@@ -27,12 +27,12 @@ export default async function ({config, projectRoot, projectType, vcs}) {
 
   return deepmerge(
     {
-      devDependencies: [config, 'remark-cli', 'remark-toc'],
+      dependencies: {javascript: {development: [config, 'remark-cli', 'remark-toc']}},
       scripts: {
         'lint:md': 'remark . --frail',
         'generate:md': 'remark . --output'
       }
     },
-    {...projectTypes.PACKAGE === projectType && {devDependencies: ['remark-usage']}}
+    {...projectTypes.PACKAGE === projectType && {dependencies: {javascript: {development: ['remark-usage']}}}}
   );
 }

src/code-style/remark/scaffolder.test.js

@@ -20,7 +20,7 @@ describe('remark scaffolder', () => {
   it('should write the config and define dependencies', async () => {
     expect(await scaffoldRemark({config, projectRoot, vcs: any.simpleObject()}))
       .toEqual({
-        devDependencies: [config, 'remark-cli', 'remark-toc'],
+        dependencies: {javascript: {development: [config, 'remark-cli', 'remark-toc']}},
         scripts: {
           'lint:md': 'remark . --frail',
           'generate:md': 'remark . --output'
@@ -49,7 +49,7 @@ describe('remark scaffolder', () => {
   it('should configure the remark-usage plugin for package projects', async () => {
     expect(await scaffoldRemark({config, projectRoot, projectType: projectTypes.PACKAGE, vcs: any.simpleObject()}))
       .toEqual({
-        devDependencies: [config, 'remark-cli', 'remark-toc', 'remark-usage'],
+        dependencies: {javascript: {development: [config, 'remark-cli', 'remark-toc', 'remark-usage']}},
         scripts: {
           'lint:md': 'remark . --frail',
           'generate:md': 'remark . --output'

src/lockfile-lint/scaffolder.js

@@ -32,7 +32,7 @@ export default async function ({projectRoot, packageManager, registries}) {
   });
 
   return {
-    devDependencies: ['lockfile-lint'],
+    dependencies: {javascript: {development: ['lockfile-lint']}},
     scripts: {'lint:lockfile': 'lockfile-lint'}
   };
 }

src/lockfile-lint/scaffolder.test.js

@@ -26,7 +26,7 @@ describe('lockfile linting scaffolder', () => {
     const allowedHosts = any.listOf(any.url);
     when(buildAllowedHosts).calledWith({packageManager: packageManagers.NPM, registries}).mockReturnValue(allowedHosts);
 
-    const {devDependencies, scripts} = await scaffoldLockfileLint({
+    const {dependencies, scripts} = await scaffoldLockfileLint({
       projectRoot,
       packageManager: packageManagers.NPM,
       registries
@@ -43,7 +43,7 @@ describe('lockfile linting scaffolder', () => {
         'allowed-hosts': allowedHosts
       }
     });
-    expect(devDependencies).toEqual(['lockfile-lint']);
+    expect(dependencies.javascript.development).toEqual(['lockfile-lint']);
     expect(scripts['lint:lockfile']).toEqual('lockfile-lint');
   });
 
@@ -53,7 +53,7 @@ describe('lockfile linting scaffolder', () => {
       .calledWith({packageManager: packageManagers.YARN, registries})
       .mockReturnValue(allowedHosts);
 
-    const {devDependencies, scripts} = await scaffoldLockfileLint({
+    const {dependencies, scripts} = await scaffoldLockfileLint({
       projectRoot,
       packageManager: packageManagers.YARN,
       registries
@@ -70,7 +70,7 @@ describe('lockfile linting scaffolder', () => {
         'allowed-hosts': allowedHosts
       }
     });
-    expect(devDependencies).toEqual(['lockfile-lint']);
+    expect(dependencies.javascript.development).toEqual(['lockfile-lint']);
     expect(scripts['lint:lockfile']).toEqual('lockfile-lint');
   });
 

src/project-type/application/scaffolder.js

@@ -16,8 +16,7 @@ export default async function ({projectRoot}) {
       start: `node ./${buildDirectory}/index.js`,
       prebuild: 'run-s clean'
     },
-    dependencies: [],
-    devDependencies: ['rimraf'],
+    dependencies: {javascript: {development: ['rimraf']}},
     vcsIgnore: {files: ['.env'], directories: [`/${buildDirectory}/`]},
     buildDirectory,
     nextSteps: []

src/project-type/application/scaffolder.test.js

@@ -22,8 +22,7 @@ describe('application project-type scaffolder', () => {
         start: `node ./${buildDirectory}/index.js`,
         prebuild: 'run-s clean'
       },
-      dependencies: [],
-      devDependencies: ['rimraf'],
+      dependencies: {javascript: {development: ['rimraf']}},
       vcsIgnore: {
         files: ['.env'],
         directories: [`/${buildDirectory}/`]

src/project-type/cli/scaffolder.js

@@ -43,8 +43,7 @@ export default async function ({
         build: 'npm-run-all --print-label --parallel build:*',
         prepack: 'run-s build'
       },
-      dependencies: ['update-notifier'],
-      devDependencies: ['rimraf'],
+      dependencies: {javascript: {production: ['update-notifier'], development: ['rimraf']}},
       vcsIgnore: {files: [], directories: [`/${defaultBuildDirectory}/`]},
       buildDirectory: defaultBuildDirectory,
       nextSteps: [{summary: 'Define supported node.js versions as `engines.node` in the `package.json` file'}]

src/project-type/cli/scaffolder.test.js

@@ -60,8 +60,7 @@ describe('cli project-type scaffolder', () => {
         build: 'npm-run-all --print-label --parallel build:*',
         prepack: 'run-s build'
       },
-      dependencies: ['update-notifier'],
-      devDependencies: ['rimraf'],
+      dependencies: {javascript: {production: ['update-notifier'], development: ['rimraf']}},
       vcsIgnore: {
         files: [],
         directories: ['/bin/']

src/project-type/package/build-details.js

@@ -54,7 +54,7 @@ export default async function ({
   return deepmerge(
     bundlerResults,
     {
-      devDependencies: ['rimraf'],
+      dependencies: {javascript: {development: ['rimraf']}},
       scripts: {
         clean: `rimraf ./${defaultBuildDirectory}`,
         prebuild: 'run-s clean',

src/project-type/package/build-details.test.js

@@ -89,7 +89,7 @@ describe('package build details', () => {
 
     expect(results).toEqual({
       ...bundlerResults,
-      devDependencies: ['rimraf'],
+      dependencies: {javascript: {development: ['rimraf']}},
       scripts: {
         clean: 'rimraf ./lib',
         prebuild: 'run-s clean',
@@ -122,7 +122,7 @@ describe('package build details', () => {
 
     expect(results).toEqual({
       ...bundlerResults,
-      devDependencies: ['rimraf'],
+      dependencies: {javascript: {development: ['rimraf']}},
       scripts: {
         clean: 'rimraf ./lib',
         prebuild: 'run-s clean',

src/scaffolder/verification/testing/scaffolder.js

@@ -24,5 +24,8 @@ export default async function ({
     })
     : {};
 
-  return deepmerge({devDependencies: [...(unit || integration) ? ['@travi/any'] : []], eslint: {}}, unitResults);
+  return deepmerge(
+    {dependencies: {javascript: {development: [...(unit || integration) ? ['@travi/any'] : []]}}, eslint: {}},
+    unitResults
+  );
 }

src/scaffolder/verification/testing/scaffolder.test.js

@@ -25,7 +25,7 @@ describe('testing scaffolder', () => {
     when(scaffoldUnitTesting)
       .calledWith({projectRoot, visibility, vcs, frameworks: unitTestFrameworks, decisions, dialect, pathWithinParent})
       .mockResolvedValue({
-        devDependencies: unitTestingDevDependencies,
+        dependencies: {javascript: {development: unitTestingDevDependencies}},
         scripts: unitTestScripts,
         vcsIgnore: {files: unitTestFilesToIgnoreFromVcs, directories: unitTestDirectoriesToIgnoreFromVcs},
         nextSteps: unitTestNextSteps
@@ -43,7 +43,7 @@ describe('testing scaffolder', () => {
       dialect,
       pathWithinParent
     })).toEqual({
-      devDependencies: ['@travi/any', ...unitTestingDevDependencies],
+      dependencies: {javascript: {development: ['@travi/any', ...unitTestingDevDependencies]}},
       scripts: unitTestScripts,
       vcsIgnore: {files: unitTestFilesToIgnoreFromVcs, directories: unitTestDirectoriesToIgnoreFromVcs},
       eslint: {},
@@ -53,11 +53,11 @@ describe('testing scaffolder', () => {
 
   it('should not scaffold unit testing if the project will not be unit tested', async () => {
     expect(await scaffoldTesting({projectRoot, visibility, tests: {unit: false, integration: true}, pathWithinParent}))
-      .toEqual({devDependencies: ['@travi/any'], eslint: {}});
+      .toEqual({dependencies: {javascript: {development: ['@travi/any']}}, eslint: {}});
   });
 
   it('should not scaffold testing if the project will not be tested', async () => {
     expect(await scaffoldTesting({projectRoot, visibility, tests: {unit: false, integration: false}, pathWithinParent}))
-      .toEqual({devDependencies: [], eslint: {}});
+      .toEqual({dependencies: {javascript: {development: []}}, eslint: {}});
   });
 });