@form8ion/javascript 4.1.3 → 4.4.0

package/lib/index.es.js

@@ -223,14 +223,16 @@ async function scaffoldUnitTesting ({
   decisions,
   visibility,
   vcs,
-  pathWithinParent
+  pathWithinParent,
+  dialect
 }) {
   const validatedFrameworks = validateOptions(unitTestFrameworksSchema, frameworks);
   const [framework, coverage] = await Promise.all([chooseFramework({
     frameworks: validatedFrameworks,
     decisions
   }).then(chosenFramework => scaffoldChoice(validatedFrameworks, chosenFramework, {
-    projectRoot
+    projectRoot,
+    dialect
   })), scaffoldCoverage({
     projectRoot,
     vcs,
@@ -434,7 +436,7 @@ function validate(options) {
   }).keys({
     unitTestFrameworks: unitTestFrameworksSchema
   }).keys({
-    registries: joi.object().pattern(joi.string(), joi.string().uri())
+    registries: joi.object().pattern(joi.string(), joi.string().uri()).default({})
   });
   const {
     error,
@@ -762,7 +764,10 @@ async function scaffoldNpmConfig ({
     'update-notifier': false
   }, projectWillNotBeConsumed(projectType) && {
     'save-exact': true
-  }), registries && Object.fromEntries(Object.entries(registries).map(([scope, url]) => [`@${scope}:registry`, url])))));
+  }), Object.fromEntries(Object.entries(registries).filter(([scope]) => 'publish' !== scope).map(([scope, url]) => {
+    if ('registry' === scope) return ['registry', url];
+    return [`@${scope}:registry`, url];
+  })))));
   return {
     scripts: {
       'lint:peer': 'npm ls >/dev/null'
@@ -1065,7 +1070,8 @@ async function scaffoldPackageType ({
   packageTypes,
   tests,
   decisions,
-  dialect
+  dialect,
+  publishRegistry
 }) {
   info('Scaffolding Package Details');
   const detailsForBuild = await buildDetails({
@@ -1117,9 +1123,11 @@ async function scaffoldPackageType ({
   return deepmerge.all([{
     packageProperties: _objectSpread2({
       files: ['example.js'],
-      publishConfig: {
+      publishConfig: _objectSpread2({
         access: 'Public' === visibility ? 'public' : 'restricted'
-      }
+      }, publishRegistry && {
+        registry: publishRegistry
+      })
     }, 'Public' === visibility && {
       runkitExampleFilename: './example.js'
     }),
@@ -1218,7 +1226,8 @@ async function scaffoldCliType ({
   packageName,
   visibility,
   projectRoot,
-  dialect
+  dialect,
+  publishRegistry
 }) {
   const rollupResults = await scaffold$1({
     projectRoot,
@@ -1244,9 +1253,11 @@ async function scaffoldCliType ({
       version: '0.0.0-semantically-released',
       bin: {},
       files: [`${defaultBuildDirectory}/`],
-      publishConfig: {
+      publishConfig: _objectSpread2({
         access: 'Public' === visibility ? 'public' : 'restricted'
-      }
+      }, publishRegistry && {
+        registry: publishRegistry
+      })
     },
     eslintConfigs: [],
     nextSteps: []
@@ -1267,7 +1278,8 @@ async function scaffoldProjectType ({
   tests,
   vcs,
   decisions,
-  dialect
+  dialect,
+  publishRegistry
 }) {
   switch (projectType) {
     case projectTypes.PACKAGE:
@@ -1282,7 +1294,8 @@ async function scaffoldProjectType ({
         tests,
         vcs,
         decisions,
-        dialect
+        dialect,
+        publishRegistry
       });
 
     case projectTypes.APPLICATION:
@@ -1301,7 +1314,8 @@ async function scaffoldProjectType ({
         packageName,
         visibility,
         projectRoot,
-        dialect
+        dialect,
+        publishRegistry
       });
 
     case projectTypes.MONOREPO:
@@ -1422,10 +1436,25 @@ function scaffoldBanSensitiveFiles () {
   };
 }
 
+function buildAllowedHostsList ({
+  packageManager,
+  registries
+}) {
+  return [...(!registries || registries && !registries.registry ? [packageManager] : []), ...Object.values(Object.fromEntries(Object.entries(registries).filter(([scope]) => 'publish' !== scope)))];
+}
+
+const lockfileLintSupportedPackageManagers = [packageManagers.NPM, packageManagers.YARN];
+
 function determineLockfilePathFor(packageManager) {
-  if (packageManagers.NPM === packageManager) return 'package-lock.json';
-  if (packageManagers.YARN === packageManager) return 'yarn.lock';
-  throw new Error(`The ${packageManager} package manager is currently not supported. ` + `Only ${Object.values(packageManagers).join(' and ')} are currently supported.`);
+  const lockfilePaths = {
+    [packageManagers.NPM]: 'package-lock.json',
+    [packageManagers.YARN]: 'yarn.lock'
+  };
+  return lockfilePaths[packageManager];
+}
+
+function lockfileLintSupports(packageManager) {
+  return lockfileLintSupportedPackageManagers.includes(packageManager);
 }
 
 async function scaffoldLockfileLint ({
@@ -1433,11 +1462,18 @@ async function scaffoldLockfileLint ({
   packageManager,
   registries
 }) {
+  if (!lockfileLintSupports(packageManager)) {
+    throw new Error(`The ${packageManager} package manager is currently not supported by lockfile-lint. ` + `Only ${lockfileLintSupportedPackageManagers.join(' and ')} are currently supported.`);
+  }
+
   await promises.writeFile(`${projectRoot}/.lockfile-lintrc.json`, JSON.stringify({
     path: determineLockfilePathFor(packageManager),
     type: packageManager,
     'validate-https': true,
-    'allowed-hosts': [packageManager, ...(registries ? Object.values(registries) : [])]
+    'allowed-hosts': buildAllowedHostsList({
+      packageManager,
+      registries
+    })
   }));
   return {
     devDependencies: ['lockfile-lint'],
@@ -1577,7 +1613,8 @@ async function scaffolder (options) {
     tests,
     vcs,
     decisions,
-    dialect
+    dialect,
+    publishRegistry: registries.publish
   });
   const verificationResults = await scaffoldVerification({
     projectRoot,