@baic/yolk-cli 2.1.0-alpha.272 → 2.1.0-alpha.274

package/es/_util.js

@@ -1 +1 @@
-import{spawn as r,spawnSync as o}from"node:child_process";import{existsSync as t,readFileSync as e}from"node:fs";import{join as n}from"node:path";import c from"chalk";import s from"exit-x";import{globSync as i}from"glob";import{rimrafSync as a,windowsSync as m}from"rimraf";import{program as p}from"../compiled/commander";export const cwd=process.cwd();const g=console;export const ENCODING="utf-8";export const warn=r=>r&&g.log(c.yellow("warn  -"),r);export const error=r=>r&&g.log(c.red("error -"),c.red(r));export const ready=r=>r&&g.log(c.green("ready -"),r);export const info=r=>r&&g.log(c.blue("info  -"),r);const f=()=>"win32"===process.platform;export const transformCommand=r=>f()?`${r}.cmd`:r;export const rimrafSync=r=>f()?m(r):a(r);export const breakExit=()=>{warn("yolk break!"),s(0)};export const spawnCommand=({command:o,args:t,complete:e,exit:n=!0,options:c})=>{const i=r(transformCommand(o),t||[],{stdio:"inherit",...c}).on("close",r=>{r?s(r):(e?.(),n&&s(0))});process.on("SIGINT",()=>{p.exitOverride(),i.kill(),s(0)})};export const spawnSyncCommand=({command:r,args:t,complete:e,options:n})=>{try{const{status:c}=o(transformCommand(r),t||[],{stdio:"inherit",...n});e?.(),c&&s(c)}catch(c){error(c?.message),s(1)}process.on("SIGINT",()=>{p.exitOverride(),s(0)})};export const getYolkConfig=()=>{const r=i("*.yolkrc*",{cwd:cwd,dot:!0});if(!r.length)return{};const o=n(cwd,r[0]);if(!t(o))return{};try{return JSON.parse(e(o,ENCODING))||{}}catch(error){return error(error.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}};export const getProjectConfigJSON=()=>{const r=n(cwd,"project.config.json");if(!t(r))return{};try{return JSON.parse(e(r,ENCODING))||{}}catch(error){return error(error.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}};export const getPackageJSON=()=>{const r=n(cwd,"package.json");if(!t(r))return{};try{return JSON.parse(e(r,ENCODING))||{}}catch(error){return error(error.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}};export const getConfigFilePath=r=>{const o=getYolkConfig();let e="";try{e=require.resolve(`@baic/${r}-config-yolk`)}catch(error){}const n=i(`*.${r}rc*`,{cwd:cwd,dot:!0}),c=n?.[0];return!1===o.strict&&c&&t(c)?c:t(e)?e:c};export const getEsLintConfigPath=()=>getConfigFilePath("eslint");export const getStyleLintConfigPath=()=>getConfigFilePath("stylelint");export const getPrettierConfigPath=()=>getConfigFilePath("prettier");export const getBiomeConfigPath=()=>getConfigFilePath("biome");
+import{spawn as o,spawnSync as r}from"node:child_process";import{existsSync as t,readFileSync as e}from"node:fs";import{join as n}from"node:path";import c from"chalk";import s from"exit-x";import{globSync as i}from"glob";import{rimrafSync as a,windowsSync as m}from"rimraf";import{program as p}from"../compiled/commander";export const cwd=process.cwd();const g=console;export const ENCODING="utf-8";export const warn=o=>o&&g.log(c.yellow("warn  -"),o);export const error=o=>o&&g.log(c.red("error -"),c.red(o));export const ready=o=>o&&g.log(c.green("ready -"),o);export const info=o=>o&&g.log(c.blue("info  -"),o);const l=()=>"win32"===process.platform;export const transformCommand=o=>l()?`${o}.cmd`:o;export const rimrafSync=o=>l()?m(o):a(o);export const breakExit=()=>{warn("yolk break!"),s(0)};export const spawnCommand=({command:r,args:t,complete:e,exit:n=!0,options:c})=>{const i=o(transformCommand(r),t||[],{stdio:"inherit",shell:!0,windowsHide:!0,...c}).on("close",o=>{o?s(o):(e?.(),n&&s(0))});process.on("SIGINT",()=>{p.exitOverride(),i.kill(),s(0)})};export const spawnSyncCommand=({command:o,args:t,complete:e,options:n})=>{try{const{status:c}=r(transformCommand(o),t||[],{stdio:"inherit",shell:!0,windowsHide:!0,...n});e?.(),c&&s(c)}catch(c){error(c?.message),s(1)}process.on("SIGINT",()=>{p.exitOverride(),s(0)})};export const getYolkConfig=()=>{const o=i("*.yolkrc*",{cwd:cwd,dot:!0});if(!o.length)return{};const r=n(cwd,o[0]);if(!t(r))return{};try{return JSON.parse(e(r,ENCODING))||{}}catch(error){return error(error.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}};export const getProjectConfigJSON=()=>{const o=n(cwd,"project.config.json");if(!t(o))return{};try{return JSON.parse(e(o,ENCODING))||{}}catch(error){return error(error.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}};export const getPackageJSON=()=>{const o=n(cwd,"package.json");if(!t(o))return{};try{return JSON.parse(e(o,ENCODING))||{}}catch(error){return error(error.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}};export const getConfigFilePath=o=>{const r=getYolkConfig();let e="";try{e=require.resolve(`@baic/${o}-config-yolk`)}catch(error){}const n=i(`*.${o}rc*`,{cwd:cwd,dot:!0}),c=n?.[0];return!1===r.strict&&c&&t(c)?c:t(e)?e:c};export const getEsLintConfigPath=()=>getConfigFilePath("eslint");export const getStyleLintConfigPath=()=>getConfigFilePath("stylelint");export const getPrettierConfigPath=()=>getConfigFilePath("prettier");export const getBiomeConfigPath=()=>getConfigFilePath("biome");

package/lib/_util.js

@@ -1 +1 @@
-"use strict";var e=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:!0}),exports.warn=exports.transformCommand=exports.spawnSyncCommand=exports.spawnCommand=exports.rimrafSync=exports.ready=exports.info=exports.getYolkConfig=exports.getStyleLintConfigPath=exports.getProjectConfigJSON=exports.getPrettierConfigPath=exports.getPackageJSON=exports.getEsLintConfigPath=exports.getConfigFilePath=exports.getBiomeConfigPath=exports.error=exports.cwd=exports.breakExit=exports.ENCODING=void 0;var t=require("node:child_process"),r=require("node:fs"),o=require("node:path"),s=e(require("chalk")),n=e(require("exit-x")),i=require("glob"),c=require("rimraf"),a=require("../compiled/commander");const p=exports.cwd=process.cwd(),l=console,g=exports.ENCODING="utf-8",x=e=>e&&l.log(s.default.yellow("warn  -"),e);exports.warn=x;const d=e=>e&&l.log(s.default.red("error -"),s.default.red(e));exports.error=d;const f=e=>e&&l.log(s.default.green("ready -"),e);exports.ready=f;const u=e=>e&&l.log(s.default.blue("info  -"),e);exports.info=u;const m=()=>"win32"===process.platform,y=e=>m()?`${e}.cmd`:e;exports.transformCommand=y;const S=e=>m()?(0,c.windowsSync)(e):(0,c.rimrafSync)(e);exports.rimrafSync=S;const h=()=>{x("yolk break!"),(0,n.default)(0)};exports.breakExit=h;const C=({command:e,args:r,complete:o,exit:s=!0,options:i})=>{const c=(0,t.spawn)(y(e),r||[],{stdio:"inherit",...i}).on("close",e=>{e?(0,n.default)(e):(o?.(),s&&(0,n.default)(0))});process.on("SIGINT",()=>{a.program.exitOverride(),c.kill(),(0,n.default)(0)})};exports.spawnCommand=C;const w=({command:e,args:r,complete:o,options:s})=>{try{const{status:i}=(0,t.spawnSync)(y(e),r||[],{stdio:"inherit",...s});o?.(),i&&(0,n.default)(i)}catch(i){d(i?.message),(0,n.default)(1)}process.on("SIGINT",()=>{a.program.exitOverride(),(0,n.default)(0)})};exports.spawnSyncCommand=w;const P=()=>{const e=(0,i.globSync)("*.yolkrc*",{cwd:p,dot:!0});if(!e.length)return{};const t=(0,o.join)(p,e[0]);if(!(0,r.existsSync)(t))return{};try{return JSON.parse((0,r.readFileSync)(t,g))||{}}catch(d){return d(d.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}};exports.getYolkConfig=P;const k=()=>{const e=(0,o.join)(p,"project.config.json");if(!(0,r.existsSync)(e))return{};try{return JSON.parse((0,r.readFileSync)(e,g))||{}}catch(d){return d(d.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}};exports.getProjectConfigJSON=k;const N=()=>{const e=(0,o.join)(p,"package.json");if(!(0,r.existsSync)(e))return{};try{return JSON.parse((0,r.readFileSync)(e,g))||{}}catch(d){return d(d.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}};exports.getPackageJSON=N;const b=e=>{const t=P();let o="";try{o=require.resolve(`@baic/${e}-config-yolk`)}catch(d){}const s=(0,i.globSync)(`*.${e}rc*`,{cwd:p,dot:!0}),n=s?.[0];return!1===t.strict&&n&&(0,r.existsSync)(n)?n:(0,r.existsSync)(o)?o:n};exports.getConfigFilePath=b;const j=()=>b("eslint");exports.getEsLintConfigPath=j;const O=()=>b("stylelint");exports.getStyleLintConfigPath=O;const q=()=>b("prettier");exports.getPrettierConfigPath=q;const v=()=>b("biome");exports.getBiomeConfigPath=v;
+"use strict";var e=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:!0}),exports.warn=exports.transformCommand=exports.spawnSyncCommand=exports.spawnCommand=exports.rimrafSync=exports.ready=exports.info=exports.getYolkConfig=exports.getStyleLintConfigPath=exports.getProjectConfigJSON=exports.getPrettierConfigPath=exports.getPackageJSON=exports.getEsLintConfigPath=exports.getConfigFilePath=exports.getBiomeConfigPath=exports.error=exports.cwd=exports.breakExit=exports.ENCODING=void 0;var t=require("node:child_process"),r=require("node:fs"),o=require("node:path"),s=e(require("chalk")),n=e(require("exit-x")),i=require("glob"),c=require("rimraf"),a=require("../compiled/commander");const p=exports.cwd=process.cwd(),l=console,d=exports.ENCODING="utf-8",g=e=>e&&l.log(s.default.yellow("warn  -"),e);exports.warn=g;const x=e=>e&&l.log(s.default.red("error -"),s.default.red(e));exports.error=x;const f=e=>e&&l.log(s.default.green("ready -"),e);exports.ready=f;const u=e=>e&&l.log(s.default.blue("info  -"),e);exports.info=u;const m=()=>"win32"===process.platform,y=e=>m()?`${e}.cmd`:e;exports.transformCommand=y;const S=e=>m()?(0,c.windowsSync)(e):(0,c.rimrafSync)(e);exports.rimrafSync=S;const h=()=>{g("yolk break!"),(0,n.default)(0)};exports.breakExit=h;const w=({command:e,args:r,complete:o,exit:s=!0,options:i})=>{const c=(0,t.spawn)(y(e),r||[],{stdio:"inherit",shell:!0,windowsHide:!0,...i}).on("close",e=>{e?(0,n.default)(e):(o?.(),s&&(0,n.default)(0))});process.on("SIGINT",()=>{a.program.exitOverride(),c.kill(),(0,n.default)(0)})};exports.spawnCommand=w;const C=({command:e,args:r,complete:o,options:s})=>{try{const{status:i}=(0,t.spawnSync)(y(e),r||[],{stdio:"inherit",shell:!0,windowsHide:!0,...s});o?.(),i&&(0,n.default)(i)}catch(i){x(i?.message),(0,n.default)(1)}process.on("SIGINT",()=>{a.program.exitOverride(),(0,n.default)(0)})};exports.spawnSyncCommand=C;const P=()=>{const e=(0,i.globSync)("*.yolkrc*",{cwd:p,dot:!0});if(!e.length)return{};const t=(0,o.join)(p,e[0]);if(!(0,r.existsSync)(t))return{};try{return JSON.parse((0,r.readFileSync)(t,d))||{}}catch(x){return x(x.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}};exports.getYolkConfig=P;const k=()=>{const e=(0,o.join)(p,"project.config.json");if(!(0,r.existsSync)(e))return{};try{return JSON.parse((0,r.readFileSync)(e,d))||{}}catch(x){return x(x.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}};exports.getProjectConfigJSON=k;const N=()=>{const e=(0,o.join)(p,"package.json");if(!(0,r.existsSync)(e))return{};try{return JSON.parse((0,r.readFileSync)(e,d))||{}}catch(x){return x(x.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}};exports.getPackageJSON=N;const b=e=>{const t=P();let o="";try{o=require.resolve(`@baic/${e}-config-yolk`)}catch(x){}const s=(0,i.globSync)(`*.${e}rc*`,{cwd:p,dot:!0}),n=s?.[0];return!1===t.strict&&n&&(0,r.existsSync)(n)?n:(0,r.existsSync)(o)?o:n};exports.getConfigFilePath=b;const j=()=>b("eslint");exports.getEsLintConfigPath=j;const O=()=>b("stylelint");exports.getStyleLintConfigPath=O;const q=()=>b("prettier");exports.getPrettierConfigPath=q;const v=()=>b("biome");exports.getBiomeConfigPath=v;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baic/yolk-cli",
-  "version": "2.1.0-alpha.272",
+  "version": "2.1.0-alpha.274",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/303394539/yolk.git"
@@ -25,22 +25,21 @@
     "prebundle": "father prebundle"
   },
   "dependencies": {
-    "@baic/biome-config-yolk": "2.1.0-alpha.272",
-    "@baic/eslint-config-yolk": "2.1.0-alpha.272",
-    "@baic/prettier-config-yolk": "2.1.0-alpha.272",
-    "@baic/stylelint-config-yolk": "2.1.0-alpha.272",
-    "@baic/yolk-test": "2.1.0-alpha.272",
-    "@democrance/imagemin-lint-staged": "5.0.x",
-    "@types/lodash": "4.x",
+    "@baic/biome-config-yolk": "2.1.0-alpha.274",
+    "@baic/eslint-config-yolk": "2.1.0-alpha.274",
+    "@baic/prettier-config-yolk": "2.1.0-alpha.274",
+    "@baic/stylelint-config-yolk": "2.1.0-alpha.274",
+    "@baic/yolk-test": "2.1.0-alpha.274",
+    "@democrance/imagemin-lint-staged": "5.1.x",
     "chalk": "4.x",
     "eslint": "8.x",
     "exit-x": "0.2.x",
     "glob": "10.4.x",
     "husky": "9.1.x",
     "inquirer": "8.x",
-    "lint-staged": "16.1.x",
+    "lint-staged": "16.2.x",
     "lodash": "4.x",
-    "miniprogram-ci": "2.1.14",
+    "miniprogram-ci": "2.1.26",
     "mkdirp": "3.0.x",
     "postcss": "8.5.x",
     "postcss-less": "6.0.x",
@@ -54,11 +53,12 @@
     "@types/inquirer": "8.x",
     "@types/js-yaml": "4.x",
     "@types/lint-staged": "14.x",
+    "@types/lodash": "4.x",
     "@types/mustache": "4.x",
     "commander": "12.1.x",
     "js-yaml": "4.1.x",
     "mustache": "4.2.x",
-    "type-fest": "4.41.x"
+    "type-fest": "5.1.x"
   },
   "engines": {
     "node": ">=18"
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "542bfb060ed6db64e2b99b06de68df76e98109e9"
+  "gitHead": "a4ce2f0237b8cb1801f1c7cdbad2a292b5771609"
 }

package/templates/umi-mobile/src/pages/demo/index.tsx

@@ -1,4 +1,4 @@
-import { isFunction, isObject } from 'lodash';
+import { isFunction, isObject } from 'lodash-es';
 
 import type { FunctionComponent } from 'react';
 import { createElement } from 'react';

package/templates/umi-mobile-h5+app/src/pages/demo/index.tsx

@@ -1,7 +1,7 @@
 import type { FunctionComponent } from 'react';
 import { createElement } from 'react';
 
-import { isFunction, isObject } from 'lodash';
+import { isFunction, isObject } from 'lodash-es';
 
 import { Tabs, Collapse } from 'antd-mobile';
 

package/templates/umi-mobile-native/src/common/bluetooth.ts

@@ -1,4 +1,4 @@
-import { isFunction, unionBy } from 'lodash';
+import { isFunction, unionBy } from 'lodash-es';
 
 import { Toast } from 'antd-mobile';
 

package/templates/umi-mobile-native/src/common/bridge.ts

@@ -1,4 +1,4 @@
-import { isFunction } from 'lodash';
+import { isFunction } from 'lodash-es';
 
 type Result<T = object> = {
   code: number;

package/templates/umi-mobile-native/src/pages/demo/examples/Xprinter/index.tsx

@@ -1,9 +1,7 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { Toast } from 'antd-mobile';
 
-import { useMount } from 'ahooks';
-
 import type { BondedDevice } from '@/common/Xprinter';
 
 import Xprinter from '@/common/Xprinter';
@@ -39,9 +37,12 @@ export default () => {
       },
     [],
   );
-  useMount(async () => {
+  const initBondList = useCallback(async () => {
     setBondList((await Xprinter.getBondedDevices()) || []);
-  });
+  }, []);
+  useEffect(() => {
+    initBondList();
+  }, []);
   return (
     <>
       <div className={style.title}>蓝牙设备</div>

package/templates/umi-mobile-native/src/pages/demo/index.tsx

@@ -1,7 +1,7 @@
 import type { FunctionComponent } from 'react';
 import { createElement } from 'react';
 
-import { isFunction, isObject } from 'lodash';
+import { isFunction, isObject } from 'lodash-es';
 
 import { Tabs, Collapse } from 'antd-mobile';
 

package/templates/umi-mobile-uni-app/src/pages/demo/index.tsx

@@ -1,4 +1,4 @@
-import { isFunction, isObject } from 'lodash';
+import { isFunction, isObject } from 'lodash-es';
 
 import type { FunctionComponent } from 'react';
 import { createElement } from 'react';

package/templates/umi-web/src/pages/demo/index.tsx

@@ -1,4 +1,4 @@
-import { isFunction, isObject } from 'lodash';
+import { isFunction, isObject } from 'lodash-es';
 
 import type { FunctionComponent } from 'react';
 import { createElement } from 'react';

package/templates/umi-web-screen/src/components/resize-container/index.tsx

@@ -1,4 +1,4 @@
-import { isFunction, isNumber } from 'lodash';
+import { isFunction, isNumber } from 'lodash-es';
 import classnames from 'classnames';
 
 import type { ReactNode, RefObject } from 'react';

package/templates/umi-web-screen/src/pages/template/controller/index.tsx

@@ -1,7 +1,5 @@
 import type { PropsWithChildren } from 'react';
-import { createContext, useCallback, useEffect,useRef, useState } from 'react';
-
-import { useMount, useUnmount } from 'ahooks';
+import { createContext, useCallback, useEffect, useRef, useState } from 'react';
 
 import useSize from '@/hooks/use-size';
 
@@ -54,12 +52,14 @@ const Component = ({ children }: Props) => {
     },
   });
 
-  useMount(initDataHandler);
-  useUnmount(() => {
-    if (timeoutID.current) {
-      clearTimeout(timeoutID.current);
-    }
-  });
+  useEffect(() => {
+    initDataHandler();
+    return () => {
+      if (timeoutID.current) {
+        clearTimeout(timeoutID.current);
+      }
+    };
+  }, []);
 
   useEffect(() => {
     setLayout({