@form8ion/javascript 8.0.0 → 8.1.0

package/README.md

@@ -98,7 +98,7 @@ const {
         dependencies: [],
         devDependencies: [],
         scripts: {},
-        eslintConfigs: [],
+        eslint: {configs: [], ignore: {directories: []}},
         packageManager: 'npm'
       }
     });

package/example.js

@@ -68,7 +68,7 @@ const {
         dependencies: [],
         devDependencies: [],
         scripts: {},
-        eslintConfigs: [],
+        eslint: {configs: [], ignore: {directories: []}},
         packageManager: 'npm'
       }
     });

package/lib/index.js

@@ -29,6 +29,7 @@ var filedirname = require('filedirname');
 var huskyPlugin = require('@form8ion/husky');
 var prettier = require('@form8ion/prettier');
 var eslint = require('@form8ion/eslint');
+var sortObjectKeys = require('sort-object-keys');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -63,6 +64,7 @@ var makeDir__default = /*#__PURE__*/_interopDefaultLegacy(makeDir);
 var touch__default = /*#__PURE__*/_interopDefaultLegacy(touch);
 var filedirname__default = /*#__PURE__*/_interopDefaultLegacy(filedirname);
 var huskyPlugin__namespace = /*#__PURE__*/_interopNamespace(huskyPlugin);
+var sortObjectKeys__default = /*#__PURE__*/_interopDefaultLegacy(sortObjectKeys);
 
 const questionNames$1 = {
   UNIT_TEST_FRAMEWORK: 'unitTestFramework',
@@ -320,7 +322,6 @@ function predicate ({projectRoot}) {
 }
 
 async function scaffoldTypescript ({config, projectType, projectRoot, testFilenamePattern}) {
-  const eslintConfigs = ['typescript'];
   const shareableTsConfigPackage = `${config.scope}/tsconfig`;
 
   await core.writeConfigFile({
@@ -343,8 +344,7 @@ async function scaffoldTypescript ({config, projectType, projectRoot, testFilena
   });
 
   return {
-    eslint: {configs: eslintConfigs},
-    eslintConfigs,
+    eslint: {configs: ['typescript']},
     devDependencies: ['typescript', shareableTsConfigPackage],
     vcsIgnore: {files: ['tsconfig.tsbuildinfo']}
   };
@@ -461,6 +461,13 @@ async function scaffoldPackage ({
   return {homepage: packageData.homepage};
 }
 
+function sortPackageProperties (packageContents) {
+  return sortObjectKeys__default["default"](
+    packageContents,
+    ['name', 'keywords', 'engines', 'scripts', 'dependencies', 'devDependencies', 'peerDependencies']
+  );
+}
+
 const details = {
   [javascriptCore.packageManagers.NPM]: {
     installationCommand: 'install',
@@ -524,13 +531,13 @@ async function liftPackage ({
 
     await javascriptCore.writePackageJson({
       projectRoot,
-      config: {
+      config: sortPackageProperties({
         ...existingPackageJsonContents,
         scripts: liftScripts({existingScripts: existingPackageJsonContents.scripts, scripts}),
         ...tags && {
           keywords: existingPackageJsonContents.keywords ? [...existingPackageJsonContents.keywords, ...tags] : tags
         }
-      }
+      })
     });
   }
 
@@ -1161,7 +1168,6 @@ async function scaffoldPackageType ({
   return deepmerge__default["default"].all([
     {
       documentation: scaffoldPackageDocumentation({packageName, visibility, scope, packageManager}),
-      eslintConfigs: [],
       nextSteps: [
         {summary: 'Add the appropriate `save` flag to the installation instructions in the README'},
         {summary: 'Publish pre-release versions to npm until package is stable enough to publish v1.0.0'}
@@ -1192,7 +1198,6 @@ async function scaffoldApplicationType ({projectRoot}) {
     devDependencies: ['rimraf'],
     vcsIgnore: {files: ['.env'], directories: [`/${buildDirectory}/`]},
     buildDirectory,
-    eslintConfigs: [],
     nextSteps: []
   };
 }
@@ -1203,7 +1208,6 @@ async function scaffoldMonorepoType ({projectRoot}) {
   await javascriptCore.mergeIntoExistingPackageJson({projectRoot, config: {private: true}});
 
   return {
-    eslintConfigs: [],
     nextSteps: [{
       summary: 'Add packages to your new monorepo',
       description: 'Leverage [@form8ion/add-package-to-monorepo](https://npm.im/@form8ion/add-package-to-monorepo)'
@@ -1244,7 +1248,6 @@ async function scaffoldCliType ({packageName, visibility, projectRoot, dialect,
       vcsIgnore: {files: [], directories: [`/${defaultBuildDirectory}/`]},
       buildDirectory: defaultBuildDirectory,
       badges: defineBadges(packageName, visibility),
-      eslintConfigs: [],
       nextSteps: []
     }
   );
@@ -1286,9 +1289,7 @@ async function scaffoldProjectType ({
     case javascriptCore.projectTypes.MONOREPO:
       return scaffoldMonorepoType({projectRoot});
     case 'Other':
-      return {
-        eslintConfigs: []
-      };
+      return {};
     default:
       throw new Error(`The project-type of ${projectType} is invalid`);
   }
@@ -1529,7 +1530,7 @@ async function scaffolder (options) {
     decisions,
     pathWithinParent
   });
-  const [nodeVersion, npmResults, dialectResults, codeStyleResults, projectTypePluginResults] = await Promise.all([
+  const [nodeVersion, npmResults, dialectResults, codeStyleResults] = await Promise.all([
     scaffoldNodeVersion({projectRoot, nodeVersionCategory}),
     scaffoldNpmConfig({projectType, projectRoot, registries}),
     scaffoldDialect({
@@ -1539,24 +1540,24 @@ async function scaffolder (options) {
       projectType,
       testFilenamePattern: verificationResults.testFilenamePattern
     }),
-    scaffoldCodeStyle({projectRoot, projectType, dialect, configs, vcs, configureLinting}),
-    scaffoldProjectTypePlugin({
-      projectRoot,
-      projectType,
-      projectName,
-      packageName,
-      packageManager,
-      scope,
-      dialect,
-      tests,
-      decisions,
-      plugins: {
-        [javascriptCore.projectTypes.PACKAGE]: packageTypes,
-        [javascriptCore.projectTypes.APPLICATION]: applicationTypes,
-        [javascriptCore.projectTypes.MONOREPO]: monorepoTypes
-      }
-    })
+    scaffoldCodeStyle({projectRoot, projectType, dialect, configs, vcs, configureLinting})
   ]);
+  const projectTypePluginResults = await scaffoldProjectTypePlugin({
+    projectRoot,
+    projectType,
+    projectName,
+    packageName,
+    packageManager,
+    scope,
+    dialect,
+    tests,
+    decisions,
+    plugins: {
+      [javascriptCore.projectTypes.PACKAGE]: packageTypes,
+      [javascriptCore.projectTypes.APPLICATION]: applicationTypes,
+      [javascriptCore.projectTypes.MONOREPO]: monorepoTypes
+    }
+  });
   const mergedContributions = deepmerge__default["default"].all([
     ...(await Promise.all([
       javascriptCore.scaffoldChoice(