@baic/yolk-cli 2.1.0-alpha.3 → 2.1.0-alpha.6

package/es/index.js

@@ -44,9 +44,9 @@ import l from "commander";
 
 import d from "inquirer";
 
-import { spawn as y, execSync as f } from "child_process";
+import { spawn as u, execSync as y } from "child_process";
 
-import u from "ora";
+import f from "ora";
 
 import g from "glob";
 
@@ -71,12 +71,12 @@ const w = require("staged-git-files"), $ = process.cwd(), P = "##### CREATED BY
     sass: "scss",
     scss: "scss",
     css: "css"
-}, E = "utf-8", F = 60, B = [ "**/node_modules/**", "**/.umi/**", "**/.umi-production/**", "**/build/**", "**/dist/**", "**/lib/**", "**/es/**", "**/public/**", "**/assets/**", "**/h5+app/**", "**/mock/**", "**/yolk/**", "**/yolk-web/**", "**/yolk-web-ui/**", "**/yolk-mobile/**", "**/yolk-mobile-ui/**", "**/yolk-miniprogram/**", "**/yolk-miniprogram-ui/**" ], D = u(), q = e => e && D.warn(Buffer.from(e, E).toString()), I = e => e && D.fail(Buffer.from(e, E).toString()), Q = e => e && D.succeed(Buffer.from(e, E).toString()), R = e => e && D.info(Buffer.from(e, E).toString()), T = e => "win32" === process.platform ? `${e}.cmd` : e, L = () => {
+}, E = "utf-8", F = 60, B = [ "**/node_modules/**", "**/.umi/**", "**/.umi-production/**", "**/build/**", "**/dist/**", "**/lib/**", "**/es/**", "**/public/**", "**/assets/**", "**/h5+app/**", "**/mock/**", "**/yolk/**", "**/yolk-web/**", "**/yolk-web-ui/**", "**/yolk-mobile/**", "**/yolk-mobile-ui/**", "**/yolk-miniprogram/**", "**/yolk-miniprogram-ui/**" ], D = f(), q = e => e && D.warn(Buffer.from(e, E).toString()), I = e => e && D.fail(Buffer.from(e, E).toString()), Q = e => e && D.succeed(Buffer.from(e, E).toString()), R = e => e && D.info(Buffer.from(e, E).toString()), T = e => "win32" === process.platform ? `${e}.cmd` : e, L = () => {
     Q("yolk complete!"), process.exit(0);
 }, N = () => {
     q("yolk break!"), process.exit(0);
 }, _ = ({command: e, args: t, complete: s, close: o, exit: r = !0}) => {
-    const i = y(T(e), t || [], {
+    const i = u(T(e), t || [], {
         stdio: "inherit"
     }).on("close", (e => {
         e ? (o && o(), I("yolk close!"), process.exit(e)) : (s && s(), r && L());
@@ -351,23 +351,23 @@ const w = require("staged-git-files"), $ = process.cwd(), P = "##### CREATED BY
         r.then(n);
     }));
 }, se = ({mProject: e, mPrivateKeyPath: t, mVersion: s, mDesc: o, mRobot: r, mQrcodeFormat: i, mQrcodeOutputDest: n, mPagePath: c, mSearchQuery: p}) => {
-    const l = a.existsSync(m.join($, ".git")) ? f("git log -1 --pretty=format:%H").toString() : "", d = M(), y = d.appid, u = e || m.join($, "dist"), g = t || m.join($, `private.${y}.key`);
-    if (a.existsSync(u)) {
+    const l = a.existsSync(m.join($, ".git")) ? y("git log -1 --pretty=format:%H").toString() : "", d = M(), u = d.appid, f = e || m.join($, "dist"), g = t || m.join($, `private.${u}.key`);
+    if (a.existsSync(f)) {
         if (a.existsSync(g)) {
             const e = U(), t = s || e.version || d.version || "1.0.0", a = o || e.description || d.description, m = `version: ${t};${l ? ` commit: ${l};` : ""}${a ? ` description: ${a};` : ""}`;
-            l && R(`commit: ${l}`), R(`dist: ${u}`), R(`key: ${g}`), R(`appid: ${y}`), R(`version: ${t}`), 
+            l && R(`commit: ${l}`), R(`dist: ${f}`), R(`key: ${g}`), R(`appid: ${u}`), R(`version: ${t}`), 
             R(`desc: ${m}`);
-            const f = new x.Project({
-                appid: y,
+            const y = new x.Project({
+                appid: u,
                 type: "miniProgram",
-                projectPath: u,
+                projectPath: f,
                 privateKeyPath: g,
                 ignores: [ "node_modules/**/*", "**/*.txt", "**/*.key", "**/*.less", "**/*.sass", "**/*.scss", "**/*.css", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.md" ]
             });
             return {
-                appid: y,
+                appid: u,
                 options: {
-                    project: f,
+                    project: y,
                     version: t,
                     desc: m,
                     setting: d.setting,
@@ -381,21 +381,21 @@ const w = require("staged-git-files"), $ = process.cwd(), P = "##### CREATED BY
         }
         throw Error(`\u6ca1\u6709\u627e\u5230\u4e0a\u4f20\u5bc6\u94a5(${g})`);
     }
-    throw Error(`\u6ca1\u6709\u627e\u5230dist\u76ee\u5f55(${u})`);
+    throw Error(`\u6ca1\u6709\u627e\u5230dist\u76ee\u5f55(${f})`);
 }, oe = () => {
     ee(), process.argv.length > 2 ? l.version(v.version).usage("[command] [options]").option("--clone", "\u901a\u8fc7git clone\u62c9\u53d6\u6a21\u7248").option("--template <template>", "\u6a21\u7248\u540d\u79f0\u6216\u8005clone\u6a21\u5f0f\u7684git\u5730\u5740").option("--docs", "\u542f\u52a8\u6587\u6863\u6a21\u5f0f").option("--mProject <project>", "\u5c0f\u7a0b\u5e8f\u4e0a\u4f20\u5de5\u7a0b\u76ee\u5f55").option("--mPrivateKeyPath <privateKeyPath>", "\u5c0f\u7a0b\u5e8f\u4e0a\u4f20key\u6587\u4ef6").option("--mVersion <version>", "\u5c0f\u7a0b\u5e8f\u4e0a\u4f20\u7248\u672c\u53f7").option("--mDesc <desc>", "\u5c0f\u7a0b\u5e8f\u4e0a\u4f20\u63cf\u8ff0").option("--mRobot <robot>", "\u5c0f\u7a0b\u5e8f\u4e0a\u4f20ci\u673a\u5668\u4eba1~30").option("--mQrcodeFormat <qrcodeFormat>", '\u5c0f\u7a0b\u5e8f\u9884\u89c8\u8fd4\u56de\u4e8c\u7ef4\u7801\u6587\u4ef6\u7684\u683c\u5f0f "image" \u6216 "base64"\uff0c \u9ed8\u8ba4\u503c "terminal" \u4f9b\u8c03\u8bd5\u7528').option("--mQrcodeOutputDest <qrcodeOutputDest>", "\u5c0f\u7a0b\u5e8f\u9884\u89c8\u4e8c\u7ef4\u7801\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84").option("--mPagePath <pagePath>", "\u5c0f\u7a0b\u5e8f\u9884\u89c8\u9884\u89c8\u9875\u9762\u8def\u5f84").option("--mSearchQuery <searchQuery>", "\u5c0f\u7a0b\u5e8f\u9884\u89c8\u9884\u89c8\u9875\u9762\u8def\u5f84\u542f\u52a8\u53c2\u6570").action(((t, i) => {
-        const n = e(i), l = n[0], d = n.slice(1), y = t.clone, f = t.template, u = t.docs;
+        const n = e(i), l = n[0], d = n.slice(1), u = t.clone, y = t.template, f = t.docs;
         if (l) switch (R(`yolk version: ${v.version}`), R(`node version: ${process.version}`), 
         R(`platform: ${p.platform()}`), R(`memory: ${r(p.freemem() / 1024 / 1024)} MB(${r(p.totalmem() / 1024 / 1024)} MB)`), 
         l) {
           case "init":
-            if (Q(`yolk ${l} \u5f00\u59cb`), y) if (f) {
+            if (Q(`yolk ${l} \u5f00\u59cb`), u) if (y) {
                 const e = ".yolk", t = m.join($, e);
                 a.existsSync(t) && S(t, (() => {
                     Q(`\u7f13\u5b58\u5220\u9664 success! ${t}`);
                 })), _({
                     command: "git",
-                    args: [ "clone", "-b", "master", "--depth", "1", f, e ].concat(d)
+                    args: [ "clone", "-b", "master", "--depth", "1", y, e ].concat(d)
                 }), K($, t);
             } else I("--clone \u6a21\u5f0f\u5fc5\u987b\u6709--template"); else A($);
             break;
@@ -410,14 +410,14 @@ const w = require("staged-git-files"), $ = process.cwd(), P = "##### CREATED BY
             }) : _({
                 command: "taro",
                 args: [ "build", "--type", "weapp", "--watch" ].concat(d)
-            }) : u ? _({
+            }) : f ? _({
                 command: "dumi",
                 args: [ "dev" ].concat(d)
             }) : G() ? _({
                 command: "icejs",
                 args: [ "start", "--config", H() ].concat(d)
             }) : _({
-                command: "max",
+                command: "umi",
                 args: [ "dev" ].concat(d)
             });
             break;
@@ -432,14 +432,14 @@ const w = require("staged-git-files"), $ = process.cwd(), P = "##### CREATED BY
             }) : _({
                 command: "taro",
                 args: [ "build", "--type", "weapp" ].concat(d)
-            }) : u ? _({
+            }) : f ? _({
                 command: "dumi",
                 args: [ "build" ].concat(d)
             }) : G() ? _({
                 command: "icejs",
                 args: [ "build", "--config", H() ].concat(d)
             }) : _({
-                command: "max",
+                command: "umi",
                 args: [ "build" ].concat(d)
             });
             break;

package/lib/index.js

@@ -137,7 +137,7 @@ function j() {
 }
 
 function S() {
-    const e = x(require("miniprogram-ci"));
+    const e = w(require("miniprogram-ci"));
     return S = function() {
         return e;
     }, e;
@@ -153,7 +153,7 @@ function v(e) {
     })(e);
 }
 
-function x(e, t) {
+function w(e, t) {
     if (!t && e && e.__esModule) return e;
     if (null === e || "object" !== typeof e && "function" !== typeof e) return {
         default: e
@@ -168,7 +168,7 @@ function x(e, t) {
     return r.default = e, n && n.set(e, r), r;
 }
 
-function w(e, t) {
+function x(e, t) {
     var n = Object.keys(e);
     if (Object.getOwnPropertySymbols) {
         var r = Object.getOwnPropertySymbols(e);
@@ -182,9 +182,9 @@ function w(e, t) {
 function $(e) {
     for (var t = 1; t < arguments.length; t++) {
         var r = null != arguments[t] ? arguments[t] : {};
-        t % 2 ? w(Object(r), !0).forEach((function(t) {
+        t % 2 ? x(Object(r), !0).forEach((function(t) {
             (0, n().default)(e, t, r[t]);
-        })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : w(Object(r)).forEach((function(t) {
+        })) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : x(Object(r)).forEach((function(t) {
             Object.defineProperty(e, t, Object.getOwnPropertyDescriptor(r, t));
         }));
     }
@@ -553,7 +553,7 @@ p().default)(), R = e => e && I.warn(Buffer.from(e, F).toString()), Q = e => e &
                 command: "icejs",
                 args: [ "start", "--config", Y() ].concat(f)
             }) : A({
-                command: "max",
+                command: "umi",
                 args: [ "dev" ].concat(f)
             });
             break;
@@ -575,7 +575,7 @@ p().default)(), R = e => e && I.warn(Buffer.from(e, F).toString()), Q = e => e &
                 command: "icejs",
                 args: [ "build", "--config", Y() ].concat(f)
             }) : A({
-                command: "max",
+                command: "umi",
                 args: [ "build" ].concat(f)
             });
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baic/yolk-cli",
-  "version": "2.1.0-alpha.3",
+  "version": "2.1.0-alpha.6",
   "author": "Baic <303394539@qq.com>",
   "license": "MIT",
   "bin": {
@@ -28,7 +28,7 @@
     "@types/rimraf": "~3.0.2",
     "commander": "6.x",
     "glob": "~8.0.3",
-    "inquirer": "~8.2.4",
+    "inquirer": "8.x",
     "lodash": "4.x",
     "miniprogram-ci": "~1.8.25",
     "mkdirp": "~1.0.4",
@@ -40,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "788e6138fc3495d280d1945fd3c3b6a6291ef7ba"
+  "gitHead": "bd5c443bd3f43d9a9fa7fc37eadb5891dec8e04c"
 }

package/templates/ice-mobile/tsconfig.json

@@ -1,26 +1,3 @@
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "jsx": "react-jsx",
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "baseUrl": "./",
-    "strict": true,
-    "paths": {
-      "@/*": ["./src/*"],
-      "ice": [".ice/"]
-    },
-    "allowSyntheticDefaultImports": true
-  },
-  "include": [
-    "mock/**/*",
-    "src/**/*",
-    "tests/**/*",
-    "config/**/*",
-    ".ice.ts",
-    "typings.d.ts"
-  ]
+  "extends": "./.ice/plugins/yolk/core/tsconfig.json"
 }

package/templates/ice-mobile/typings.d.ts

@@ -1,16 +1 @@
-declare module '*.png';
-declare module '*.gif';
-declare module '*.jpg';
-declare module '*.jpeg';
-declare module '*.svg' {
-  export function ReactComponent(
-    props: React.SVGProps<SVGSVGElement>,
-  ): React.ReactElement;
-  const url: string;
-  export default url;
-}
-declare module '*.css';
-declare module '*.less';
-declare module '*.scss';
-declare module '*.sass';
-declare module '*.styl';
+import "@@/plugins/yolk/core/typings";

package/templates/ice-web/tsconfig.json

@@ -1,26 +1,3 @@
 {
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "jsx": "react-jsx",
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "baseUrl": "./",
-    "strict": true,
-    "paths": {
-      "@/*": ["./src/*"],
-      "ice": [".ice/"]
-    },
-    "allowSyntheticDefaultImports": true
-  },
-  "include": [
-    "mock/**/*",
-    "src/**/*",
-    "tests/**/*",
-    "config/**/*",
-    ".ice.ts",
-    "typings.d.ts"
-  ]
+  "extends": "./.ice/plugins/yolk/core/tsconfig.json"
 }

package/templates/ice-web/typings.d.ts

@@ -1,16 +1 @@
-declare module '*.png';
-declare module '*.gif';
-declare module '*.jpg';
-declare module '*.jpeg';
-declare module '*.svg' {
-  export function ReactComponent(
-    props: React.SVGProps<SVGSVGElement>,
-  ): React.ReactElement;
-  const url: string;
-  export default url;
-}
-declare module '*.css';
-declare module '*.less';
-declare module '*.scss';
-declare module '*.sass';
-declare module '*.styl';
+import "@@/plugins/yolk/core/typings";

package/templates/ice-mobile/.editorconfig

@@ -1,16 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab

package/templates/ice-web/.editorconfig

@@ -1,16 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab