@form8ion/javascript 16.0.0-beta.1 → 16.0.0-beta.3

package/README.md

@@ -65,7 +65,7 @@ const projectRoot = process.cwd();
 await scaffoldJavaScript({
   projectRoot,
   projectName: 'project-name',
-  visibility: 'Public',
+  visibility: 'OSS',
   license: 'MIT',
   configs: {
     eslint: {scope: `@${accountName}`},
@@ -121,7 +121,7 @@ await scaffoldUnitTesting({
     Mocha: {scaffold: options => options},
     Jest: {scaffold: options => options}
   },
-  visibility: 'Public',
+  visibility: 'OSS',
   vcs: {host: 'GitHub', owner: 'foo', name: 'bar'},
   decisions: {[questionNames.UNIT_TEST_FRAMEWORK]: 'Mocha'}
 });

package/example.js

@@ -34,7 +34,7 @@ const projectRoot = process.cwd();
 await scaffoldJavaScript({
   projectRoot,
   projectName: 'project-name',
-  visibility: 'Public',
+  visibility: 'OSS',
   license: 'MIT',
   configs: {
     eslint: {scope: `@${accountName}`},
@@ -90,7 +90,7 @@ await scaffoldUnitTesting({
     Mocha: {scaffold: options => options},
     Jest: {scaffold: options => options}
   },
-  visibility: 'Public',
+  visibility: 'OSS',
   vcs: {host: 'GitHub', owner: 'foo', name: 'bar'},
   decisions: {[questionNames.UNIT_TEST_FRAMEWORK]: 'Mocha'}
 });

package/lib/index.js

@@ -1,6 +1,6 @@
 import { questionNames as questionNames$2, questions } from '@travi/language-scaffolder-prompts';
 import deepmerge from 'deepmerge';
-import { scaffoldChoice, dialects as dialects$1, projectTypes as projectTypes$1, packageManagers as packageManagers$1, writePackageJson, PROD_DEPENDENCY_TYPE, DEV_DEPENDENCY_TYPE, mergeIntoExistingPackageJson } from '@form8ion/javascript-core';
+import { scaffoldChoice, dialects as dialects$1, projectTypes as projectTypes$1, packageManagers as packageManagers$1, writeNpmrc, loadNpmrc, writePackageJson, PROD_DEPENDENCY_TYPE, DEV_DEPENDENCY_TYPE, mergeIntoExistingPackageJson } from '@form8ion/javascript-core';
 import * as commitConventionPlugin from '@form8ion/commit-convention';
 import { scaffold as scaffold$5 } from '@form8ion/commit-convention';
 import joi from 'joi';
@@ -17,7 +17,6 @@ import { scaffold as scaffold$2 } from '@form8ion/husky';
 import { scaffold as scaffold$1, lift as lift$1 } from '@form8ion/codecov';
 import { scaffold, test } from '@form8ion/c8';
 import { write as write$1 } from '@form8ion/config-file';
-import { stringify, parse } from 'ini';
 import { scaffold as scaffold$4 } from '@form8ion/prettier';
 import * as eslintPlugin from '@form8ion/eslint';
 import { scaffold as scaffold$3, test as test$1 } from '@form8ion/eslint';
@@ -181,7 +180,8 @@ function validate(options) {
       packageTypes: pluginsSchema,
       monorepoTypes: pluginsSchema,
       hosts: pluginsSchema,
-      ciServices: pluginsSchema
+      ciServices: pluginsSchema,
+      registries: pluginsSchema
     }
   }).required();
 
@@ -210,7 +210,7 @@ function projectIsApplication$1(answers) {
 }
 
 function packageShouldBeScoped(visibility, answers) {
-  return 'Private' === visibility || answers[questionNames$1.SHOULD_BE_SCOPED];
+  return ['ISS', 'CS'].includes(visibility) || answers[questionNames$1.SHOULD_BE_SCOPED];
 }
 
 function willBePublishedToNpm(answers) {
@@ -234,8 +234,13 @@ function lintingPromptShouldBePresented({
 
 function scope(visibility) {
   return input => {
-    if (!input && 'Private' === visibility) {
-      return 'Private packages must be scoped (https://docs.npmjs.com/private-modules/intro#setting-up-your-package)';
+    if (!input) {
+      if ('CS' === visibility) {
+        return 'Closed source packages must be scoped';
+      }
+      if ('ISS' === visibility) {
+        return 'Inner source packages must be scoped';
+      }
     }
 
     return true;
@@ -328,7 +333,7 @@ async function prompt(
       choices: [...Object.values(projectTypes$1), 'Other'],
       default: projectTypes$1.PACKAGE
     },
-    ...'Private' === visibility ? [] : [{
+    ...['ISS', 'CS'].includes(visibility) ? [] : [{
       name: questionNames$1.SHOULD_BE_SCOPED,
       message: 'Should this package be scoped?',
       type: 'confirm',
@@ -470,16 +475,12 @@ var dialects = /*#__PURE__*/Object.freeze({
   test: babelIsInUse
 });
 
-async function writeNpmConfig({projectRoot, config}) {
-  await promises.writeFile(`${projectRoot}/.npmrc`, stringify(config));
-}
-
 function projectWillNotBeConsumed(projectType) {
   return projectTypes$1.APPLICATION === projectType || projectTypes$1.CLI === projectType;
 }
 
 async function scaffoldNpmConfiguration({projectRoot, projectType}) {
-  await writeNpmConfig({
+  await writeNpmrc({
     projectRoot,
     config: {'update-notifier': false, ...projectWillNotBeConsumed(projectType) && {'save-exact': true}}
   });
@@ -491,22 +492,14 @@ function npmConfigExists({projectRoot}) {
   return fileExists(`${projectRoot}/.npmrc`);
 }
 
-async function readNpmConfig({projectRoot}) {
-  const pathToConfig = `${projectRoot}/.npmrc`;
-
-  if (!(await fileExists(pathToConfig))) return {};
-
-  return parse(await promises.readFile(pathToConfig, 'utf-8'));
-}
-
 async function liftNpmConfig({projectRoot}) {
   const {
     provenance,
     'engines-strict': enginesStrict,
     ...remainingProperties
-  } = await readNpmConfig({projectRoot});
+  } = await loadNpmrc({projectRoot});
 
-  await writeNpmConfig({projectRoot, config: remainingProperties});
+  await writeNpmrc({projectRoot, config: remainingProperties});
 
   return {};
 }
@@ -514,10 +507,8 @@ async function liftNpmConfig({projectRoot}) {
 var npmConfigPlugin = /*#__PURE__*/Object.freeze({
   __proto__: null,
   lift: liftNpmConfig,
-  read: readNpmConfig,
   scaffold: scaffoldNpmConfiguration,
-  test: npmConfigExists,
-  write: writeNpmConfig
+  test: npmConfigExists
 });
 
 async function scaffoldNpmPackageManager({projectRoot}) {
@@ -1853,10 +1844,10 @@ function buildRegistriesList(registries = {}) {
 async function updateRegistriesInNpmConfig(registries, projectRoot) {
   const registriesForNpmConfig = buildRegistriesList(registries);
 
-  await writeNpmConfig({
+  await writeNpmrc({
     projectRoot,
     config: {
-      ...(await readNpmConfig({projectRoot})),
+      ...(await loadNpmrc({projectRoot})),
       ...registriesForNpmConfig
     }
   });