@nice-move/init 0.3.1 → 0.3.5

package/action/git-file.mjs

@@ -1,6 +1,7 @@
+import { type } from 'os';
+
 import { Text } from 'fs-chain';
 import ora from 'ora';
-import { type } from 'os';
 
 import { cyan, green, red } from '../lib/color.mjs';
 import { download } from '../lib/utils.mjs';
@@ -54,9 +55,10 @@ export async function GitFile() {
         .then((newText) => {
           const [match] = oldText.match(regexp) || [];
 
-          return `${(match
-            ? oldText.replace(regexp, newText)
-            : `${oldText.trim()}\n\n${newText}`
+          const io = (
+            match
+              ? oldText.replace(regexp, newText)
+              : `${oldText.trim()}\n\n${newText}`
           )
             .replace(
               /(www\.)?toptal\.com\/developers\/gitignore/g,
@@ -65,7 +67,9 @@ export async function GitFile() {
             .trim()
             .split(/\n\n\+/g)
             .filter((item) => item.trim())
-            .join('\n\n')}\n`;
+            .join('\n\n');
+
+          return `${io}\n`;
         })
         .catch(() => oldText || 'node_modules\n');
     })

package/action/license.mjs

@@ -3,12 +3,14 @@ import { Text } from 'fs-chain';
 import { cyan } from '../lib/color.mjs';
 import { getAuthorName, pkgCwd } from '../lib/utils.mjs';
 
-export function License() {
+export async function License() {
   const { license, author = '' } = pkgCwd();
 
   const isMIT = license === 'MIT';
 
   if (isMIT || license === 'Unlicense') {
+    const holder = await getAuthorName(author);
+
     return new Text()
       .source(
         isMIT ? '../../template/mit.tpl' : '../../template/unlicense.tpl',
@@ -18,7 +20,7 @@ export function License() {
         isMIT
           ? text
               .replace('{{year}}', new Date().getFullYear())
-              .replace('{{holder}}', getAuthorName(author))
+              .replace('{{holder}}', holder)
           : text,
       )
       .output('LICENSE')

package/action/package.mjs

@@ -6,17 +6,6 @@ import latest from '../lib/latest.mjs';
 
 const pkg = 'package.json';
 
-function formatter(data) {
-  // eslint-disable-next-line import/no-extraneous-dependencies
-  return import('prettier')
-    .then(({ default: { format, resolveConfig } }) => ({
-      options: resolveConfig(pkg),
-      format,
-    }))
-    .then(({ options, format }) => format(data, { ...options, filepath: pkg }))
-    .catch(() => data);
-}
-
 export function Package(info) {
   return new Json()
     .config({ pretty: true })
@@ -40,9 +29,6 @@ export function Package(info) {
         info,
       ]),
     )
-    .onDone(JSON.stringify)
-    .onDone(formatter)
-    .onDone(JSON.parse)
     .output()
     .logger('Add project info to', cyan(pkg))
     .catch(console.warn);

package/action/registry.mjs

@@ -1,5 +1,5 @@
 import { Text } from 'fs-chain';
-import osLocale from 'os-locale';
+import { osLocale } from 'os-locale';
 
 import { cyan } from '../lib/color.mjs';
 

package/lib/latest.mjs

@@ -1 +1,20 @@
-export default {"ava":"^3.15.0","commitlint":"^12.1.4","eslint":"^7.29.0","eslint-plugin-ava":"^12.0.0","garou":"^0.1.29","prettier":"^2.3.1","stylelint":"^13.13.1","typescript":"^4.3.4","@types/react":"^16.14.8","react":"~16.14.0","react-dom":"~16.14.0","vue":"~2.6.14","eslint-config-base":"^0.5.44","stylelint-config":"^0.5.8","prettier-config":"^0.4.7","commitlint-config":"^0.1.3","cli":"^0.5.26","lts":"^12.22.0 || ^14.17.0"}
+export default {
+  ava: '^3.15.0',
+  commitlint: '^13.1.0',
+  eslint: '^7.32.0',
+  'eslint-plugin-ava': '^12.0.0',
+  garou: '^0.1.40',
+  prettier: '^2.3.2',
+  stylelint: '^13.13.1',
+  typescript: '^4.4.3',
+  '@types/react': '^16.14.11',
+  react: '~16.14.0',
+  'react-dom': '~16.14.0',
+  vue: '~2.6.14',
+  'eslint-config-base': '^0.5.62',
+  'stylelint-config': '^0.5.11',
+  'prettier-config': '^0.4.14',
+  'commitlint-config': '^0.2.0',
+  cli: '^0.5.29',
+  lts: '^12.22.0 || ^14.17.0',
+};

package/lib/utils.mjs

@@ -1,10 +1,9 @@
-import centra from 'centra';
-import execa from 'execa';
 import { readdirSync } from 'fs';
 import { createRequire } from 'module';
-import { sep } from 'path';
+
+import centra from 'centra';
+import execa from 'execa';
 import stringify from 'stringify-author';
-import meta from 'user-meta';
 
 export function download(url) {
   return centra(url)
@@ -50,22 +49,22 @@ export function trim(value) {
   return value ? value.trim() : undefined;
 }
 
-export function getAuthorName(author = {}) {
-  return (typeof author === 'string' ? author : author.name)
-    ? meta.name
-    : 'Unknown';
+function getUser() {
+  return import('user-meta')
+    .then(({ default: meta }) => meta)
+    .catch(() => ({}));
 }
 
-export function dirname(path) {
-  return path.split(sep).slice(-1)[0].trim();
-}
+export async function getAuthor(author) {
+  if (author) {
+    return author;
+  }
 
-export function getAuthor(author = {}) {
-  const io = meta.name ? stringify(meta) : undefined;
+  const meta = await getUser();
 
-  if (typeof author === 'string') {
-    return author || io || 'Unknown';
-  }
+  return meta.name ? stringify(meta) : 'Unknown';
+}
 
-  return (author.name ? stringify(author) : io) || 'Unknown';
+export async function getAuthorName(author) {
+  return (await getAuthor(author)).name || 'Unknown';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nice-move/init",
-  "version": "0.3.1",
+  "version": "0.3.5",
   "description": "Initialize your frontend workspaces",
   "license": "MIT",
   "author": {
@@ -40,18 +40,18 @@
   },
   "main": "index.mjs",
   "dependencies": {
-    "centra": "^2.4.2",
-    "chalk": "^4.1.1",
+    "centra": "^2.5.0",
+    "chalk": "^4.1.2",
     "deepmerge": "^4.2.2",
     "execa": "^5.1.1",
-    "fs-chain": "8.0.1",
+    "fs-chain": "8.1.0",
     "is-git-dirty": "^2.0.1",
     "is-git-repository": "^2.0.0",
-    "ora": "^5.4.1",
-    "os-locale": "^5.0.0",
+    "ora": "^6.0.1",
+    "os-locale": "^6.0.0",
     "parse-author": "^2.0.0",
     "prompts": "^2.4.1",
-    "semver-regex": "^4.0.0",
+    "semver-regex": "^3.1.3",
     "stringify-author": "^0.1.3",
     "user-meta": "^1.0.0",
     "validate-npm-package-name": "^3.0.0",

package/prompt/index.mjs

@@ -26,7 +26,7 @@ export async function Prompt() {
     cwd,
   };
 
-  const PackagePrompts = Package(options);
+  const PackagePrompts = await Package(options);
 
   return prompts(
     [

package/prompt/package.mjs

@@ -1,12 +1,18 @@
+import { parse as parsePath } from 'path';
+
 import parse from 'parse-author';
 import semverRegex from 'semver-regex';
 import validate from 'validate-npm-package-name';
 
-import { dirname, getAuthor, trim } from '../lib/utils.mjs';
+import { getAuthor, trim } from '../lib/utils.mjs';
 
 const semver = semverRegex();
 
-export function Package({
+function arrayLength(data) {
+  return Array.isArray(data) && data.length > 0;
+}
+
+export async function Package({
   cwd,
   pkg: {
     author,
@@ -21,7 +27,7 @@ export function Package({
   return [
     {
       format: trim,
-      initial: dirname(cwd),
+      initial: parsePath(cwd).base,
       message: 'package.json » name',
       name: 'name',
       type: (first) => (first === false || name ? null : 'text'),
@@ -57,7 +63,7 @@ export function Package({
           ? null
           : 'text',
       format: parse,
-      initial: getAuthor(author),
+      initial: await getAuthor(author),
       message: 'package.json » author',
       name: 'author',
     },
@@ -80,9 +86,9 @@ export function Package({
       format: (value) => (value ? ['packages/*', 'tools/*'] : undefined),
       type: (first, feedback) =>
         first === false ||
-        (workspaces && workspaces.length > 0) ||
         isPrivate === false ||
-        feedback.private === false
+        feedback.private === false ||
+        arrayLength(workspaces ? workspaces.packages : workspaces)
           ? null
           : 'toggle',
     },