@baic/yolk-cli 2.1.0-alpha.12 → 2.1.0-alpha.121

package/templates/miniprogram/.gitignore.tpl

@@ -2,15 +2,13 @@
 
 # dependencies
 /node_modules
-/.pnp
-.pnp.js
-.prettierrc.js
 npm-debug.log*
 npm-error.log*
-/package-lock.json
-/yarn.lock
+package-lock.json
+yarn.lock
 yarn-debug.log*
 yarn-error.log*
+pnpm-lock.yaml
 
 # testing
 /coverage
@@ -27,6 +25,7 @@ dist/
 .env.production.local
 
 # temp
+.swc/
 .temp/
 .rn_temp/
 deploy_versions/
@@ -36,4 +35,7 @@ deploy_versions/
 .eslintcache
 .stylelintcache
 .vscode
-project.private.config.json
+project.private.config.json
+
+# ide
+.vscode

package/templates/miniprogram/.npmrc.tpl

@@ -0,0 +1,2 @@
+strict-peer-dependencies=false
+shamefully-hoist=true

package/templates/miniprogram/.prettierignore

@@ -2,4 +2,8 @@
 **/*.svg
 **/*.ejs
 **/*.html
-package.json
+package-lock.json
+yarn.lock
+yarn-debug.log
+yarn-error.log
+pnpm-lock.yaml

package/templates/miniprogram/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('@baic/yolk-cli/lib/.prettierrc');

package/templates/miniprogram/README.md.tpl

@@ -1,4 +1,4 @@
-# {{ projectName }}
+# web
 
 ## Getting Started
 
@@ -14,7 +14,7 @@ $ {{ dependenciesInstallType }} install
 {{ ^dependenciesInstallType }}
 
 ```bash
-$ yarn install
+$ pnpm install
 ```
 
 {{ /dependenciesInstallType }}

package/templates/miniprogram/global.d.ts

@@ -1,33 +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';
-
-// @ts-ignore
-declare const process: NodeJS.Process & {
-  env: {
-    TARO_ENV:
-      | 'weapp'
-      | 'swan'
-      | 'alipay'
-      | 'h5'
-      | 'rn'
-      | 'tt'
-      | 'quickapp'
-      | 'qq'
-      | 'jd';
-    [key: string]: any;
-  };
-};
+import "@baic/yolk-taro/typings";

package/templates/miniprogram/package.json.tpl

@@ -17,5 +17,10 @@
   ],
   "dependencies": {
     "@baic/preset-yolk-taro-miniprogram": "~{{ yolkVersion }}"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": "*"
+    }
   }
 }

package/templates/miniprogram/project.config.json.tpl

@@ -5,7 +5,7 @@
   "appid": "touristappid",
   "setting": {
     "urlCheck": true,
-    "es6": true,
+    "es6": false,
     "enhance": false,
     "postcss": true,
     "preloadBackgroundData": false,
@@ -47,7 +47,7 @@
   "compileType": "miniprogram",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
-  "libVersion": "2.13.0",
+  "libVersion": "2.30.0",
   "condition": {},
   "srcMiniprogramRoot": "dist/",
   "packOptions": {

package/templates/miniprogram/src/app.scss

@@ -1,2 +1 @@
-@import "./theme.scss";
 @import "~taro-ui/dist/style/index.scss";

package/templates/miniprogram/src/app.tsx

@@ -1,14 +1,12 @@
-import * as React from 'react';
+import './app.scss';
+
+import React, { PropsWithChildren } from 'react';
 
 import { Provider } from '@baic/yolk-miniprogram';
 
 import request from '@/common/request';
 
-import './app.scss';
-
-interface Props {
-  children: React.ReactNode;
-}
+type Props = PropsWithChildren<Record<string, unknown>>;
 
 export default ({ children }: Props) => (
   <Provider request={request} inputMaxLength={40}>

package/templates/miniprogram/src/pages/demo/examples/Input.tsx

@@ -1,3 +1,12 @@
+import { Form, FormItem, Input, useForm } from '@baic/yolk-miniprogram';
 import * as React from 'react';
-import { Input } from '@baic/yolk-miniprogram';
-export default () => <Input />;
+export default () => {
+  const [form] = useForm();
+  return (
+    <Form form={form}>
+      <FormItem name="input" rules="required">
+        <Input />
+      </FormItem>
+    </Form>
+  );
+};

package/templates/miniprogram/src/pages/demo/examples/Textarea.tsx

@@ -1,3 +1,14 @@
 import * as React from 'react';
-import { Textarea } from '@baic/yolk-miniprogram';
-export default () => <Textarea />;
+
+import { Form, FormItem, Textarea, useForm } from '@baic/yolk-miniprogram';
+
+export default () => {
+  const [form] = useForm();
+  return (
+    <Form form={form}>
+      <FormItem name="textarea" rules="required">
+        <Textarea />
+      </FormItem>
+    </Form>
+  );
+};

package/templates/miniprogram/src/pages/index/index.tsx

@@ -1,5 +1,7 @@
+import * as React from 'react';
+
 import { View } from '@tarojs/components';
 
-import style from './index.module.scss';
+import style from './style.scss';
 
 export default () => <View className={style.page}>Hello world</View>;

package/templates/miniprogram/src/types/user.d.ts

@@ -1,3 +1,5 @@
-export default interface User {
+type User = {
   id?: string;
-}
+};
+
+export default User;

package/templates/umi-mobile/.eslintrc

@@ -1,5 +1,5 @@
 {
-  "extends": "@baic/eslint-config-yolk-mobile",
+  "extends": "@baic/eslint-config-yolk",
   "parserOptions": {
     "project": "./tsconfig.json"
   }

package/templates/umi-mobile/.gitignore.tpl

@@ -4,10 +4,11 @@
 node_modules/
 npm-debug.log*
 npm-error.log*
-/package-lock.json
-/yarn.lock
+package-lock.json
+yarn.lock
 yarn-debug.log*
 yarn-error.log*
+pnpm-lock.yaml
 
 # production
 /dist

package/templates/umi-mobile/.npmrc.tpl

@@ -0,0 +1,2 @@
+strict-peer-dependencies=false
+shamefully-hoist=true

package/templates/umi-mobile/.prettierignore

@@ -2,7 +2,11 @@
 **/*.svg
 **/*.ejs
 **/*.html
-package.json
+package-lock.json
+yarn.lock
+yarn-debug.log
+yarn-error.log
+pnpm-lock.yaml
 .umi
 .umi-production
-.umi-test
+.umi-test

package/templates/umi-mobile/.prettierrc.js

@@ -0,0 +1 @@
+module.exports = require('@baic/yolk-cli/lib/.prettierrc');

package/templates/umi-mobile/.umirc.ts.tpl

@@ -1,6 +1,6 @@
-import { defineConfig } from '@baic/yolk-umi-mobile';
+import { defineConfig } from '@baic/yolk-umi';
 
 export default defineConfig({
   title: '{{ projectName }}',
-  publicPath: '/',
+  hd: {},
 });

package/templates/umi-mobile/README.md.tpl

@@ -1,4 +1,4 @@
-# mobile
+# web
 
 ## Getting Started
 
@@ -14,7 +14,7 @@ $ {{ dependenciesInstallType }} install
 {{ ^dependenciesInstallType }}
 
 ```bash
-$ yarn install
+$ pnpm install
 ```
 
 {{ /dependenciesInstallType }}

package/templates/umi-mobile/package.json.tpl

@@ -7,5 +7,10 @@
   },
   "dependencies": {
     "@baic/preset-yolk-umi-mobile": "~{{ yolkVersion }}"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": "*"
+    }
   }
 }

package/templates/umi-mobile/src/.umi/core/EmptyRoute.tsx

@@ -0,0 +1,8 @@
+// @ts-nocheck
+// This file is generated by Umi automatically
+// DO NOT CHANGE IT MANUALLY!
+import { Outlet, useOutletContext } from 'umi';
+export default function EmptyRoute() {
+  const context = useOutletContext();
+  return <Outlet context={context} />;
+}

package/templates/umi-mobile/src/.umi/core/defineApp.ts

@@ -0,0 +1,21 @@
+// @ts-nocheck
+// This file is generated by Umi automatically
+// DO NOT CHANGE IT MANUALLY!
+interface IDefaultRuntimeConfig {
+  onRouteChange?: (props: {
+    routes: any;
+    clientRoutes: any;
+    location: any;
+    action: any;
+  }) => void;
+  patchRoutes?: (props: { routes: any }) => void;
+  patchClientRoutes?: (props: { routes: any }) => void;
+  render?: (oldRender: () => void) => void;
+  rootContainer?: (lastRootContainer: JSX.Element, args?: any) => void;
+  [key: string]: any;
+}
+export type RuntimeConfig = IDefaultRuntimeConfig;
+
+export function defineApp(config: RuntimeConfig): RuntimeConfig {
+  return config;
+}

package/templates/umi-mobile/src/.umi/core/history.ts

@@ -0,0 +1,70 @@
+// @ts-nocheck
+// This file is generated by Umi automatically
+// DO NOT CHANGE IT MANUALLY!
+import type { UmiHistory } from './historyIntelli';
+import {
+  createBrowserHistory,
+  createHashHistory,
+  createMemoryHistory,
+} from '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/node_modules/.pnpm/@umijs+renderer-react@4.0.53_ef5jwxihqo6n7gxfmzogljlgcm/node_modules/@umijs/renderer-react';
+
+let history: UmiHistory;
+let basename: string = '/';
+export function createHistory(opts: any) {
+  let h;
+  if (opts.type === 'hash') {
+    h = createHashHistory();
+  } else if (opts.type === 'memory') {
+    h = createMemoryHistory(opts);
+  } else {
+    h = createBrowserHistory();
+  }
+  if (opts.basename) {
+    basename = opts.basename;
+  }
+
+  history = {
+    ...h,
+    push(to, state) {
+      h.push(patchTo(to, h), state);
+    },
+    replace(to, state) {
+      h.replace(patchTo(to, h), state);
+    },
+    get location() {
+      return h.location;
+    },
+    get action() {
+      return h.action;
+    },
+  };
+
+  return h;
+}
+
+// Patch `to` to support basename
+// Refs:
+// https://github.com/remix-run/history/blob/3e9dab4/packages/history/index.ts#L484
+// https://github.com/remix-run/history/blob/dev/docs/api-reference.md#to
+function patchTo(to: any, h: History) {
+  if (typeof to === 'string') {
+    return `${stripLastSlash(basename)}${to}`;
+  } else if (typeof to === 'object') {
+    const currentPathname = h.location.pathname;
+
+    return {
+      ...to,
+      pathname: to.pathname
+        ? `${stripLastSlash(basename)}${to.pathname}`
+        : currentPathname,
+    };
+  } else {
+    throw new Error(`Unexpected to: ${to}`);
+  }
+}
+
+function stripLastSlash(path) {
+  return path.slice(-1) === '/' ? path.slice(0, -1) : path;
+}
+
+export { history };

package/templates/umi-mobile/src/.umi/core/historyIntelli.ts

@@ -0,0 +1,132 @@
+// @ts-nocheck
+// This file is generated by Umi automatically
+// DO NOT CHANGE IT MANUALLY!
+import { getRoutes } from './route';
+import type { History } from '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/node_modules/.pnpm/@umijs+renderer-react@4.0.53_ef5jwxihqo6n7gxfmzogljlgcm/node_modules/@umijs/renderer-react';
+
+type Routes = Awaited<ReturnType<typeof getRoutes>>['routes'];
+type AllRoute = Routes[keyof Routes];
+type IsRoot<T extends any> = 'parentId' extends keyof T ? false : true;
+
+// show `/` in not `layout / wrapper` only
+type GetAllRouteWithoutLayout<Item extends AllRoute> = Item extends any
+  ? 'isWrapper' extends keyof Item
+    ? never
+    : 'isLayout' extends keyof Item
+    ? never
+    : Item
+  : never;
+type AllRouteWithoutLayout = GetAllRouteWithoutLayout<AllRoute>;
+type IndexRoutePathname = '/' extends AllRouteWithoutLayout['path']
+  ? '/'
+  : never;
+
+type GetChildrens<T extends any> = T extends any
+  ? IsRoot<T> extends true
+    ? never
+    : T
+  : never;
+type Childrens = GetChildrens<AllRoute>;
+type Root = Exclude<AllRoute, Childrens>;
+type AllIds = AllRoute['id'];
+
+type GetChildrensByParentId<
+  Id extends AllIds,
+  Item = AllRoute,
+> = Item extends any
+  ? 'parentId' extends keyof Item
+    ? Item['parentId'] extends Id
+      ? Item
+      : never
+    : never
+  : never;
+
+type RouteObject<
+  Id extends AllIds,
+  Item = GetChildrensByParentId<Id>,
+> = IsNever<Item> extends true
+  ? ''
+  : Item extends AllRoute
+  ? {
+      [Key in Item['path'] as TrimSlash<Key>]: UnionMerge<
+        RouteObject<Item['id']>
+      >;
+    }
+  : never;
+
+type GetRootRouteObject<Item extends Root> = Item extends Root
+  ? {
+      [K in Item['path'] as TrimSlash<K>]: UnionMerge<RouteObject<Item['id']>>;
+    }
+  : never;
+type MergedResult = UnionMerge<GetRootRouteObject<Root>>;
+
+// --- patch history types ---
+
+type HistoryTo = Parameters<History['push']>['0'];
+type HistoryPath = Exclude<HistoryTo, string>;
+
+type UmiPathname = Path<MergedResult> | (string & {});
+interface UmiPath extends HistoryPath {
+  pathname: UmiPathname;
+}
+type UmiTo = UmiPathname | UmiPath;
+
+type UmiPush = (to: UmiTo, state?: any) => void;
+type UmiReplace = (to: UmiTo, state?: any) => void;
+export interface UmiHistory extends History {
+  push: UmiPush;
+  replace: UmiReplace;
+}
+
+// --- type utils ---
+type TrimLeftSlash<T extends string> = T extends `/${infer R}`
+  ? TrimLeftSlash<R>
+  : T;
+type TrimRightSlash<T extends string> = T extends `${infer R}/`
+  ? TrimRightSlash<R>
+  : T;
+type TrimSlash<T extends string> = TrimLeftSlash<TrimRightSlash<T>>;
+
+type IsNever<T> = [T] extends [never] ? true : false;
+type IsEqual<A, B> = (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B
+  ? 1
+  : 2
+  ? true
+  : false;
+
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
+  k: infer I,
+) => void
+  ? I
+  : never;
+type UnionMerge<U> = UnionToIntersection<U> extends infer O
+  ? { [K in keyof O]: O[K] }
+  : never;
+
+type ExcludeEmptyKey<T> = IsEqual<T, ''> extends true ? never : T;
+
+type PathConcat<
+  TKey extends string,
+  TValue,
+  N = TrimSlash<TKey>,
+> = TValue extends string
+  ? ExcludeEmptyKey<N>
+  :
+      | ExcludeEmptyKey<N>
+      | `${N & string}${IsNever<ExcludeEmptyKey<N>> extends true
+          ? ''
+          : '/'}${UnionPath<TValue>}`;
+
+type UnionPath<T> = {
+  [K in keyof T]-?: PathConcat<K & string, T[K]>;
+}[keyof T];
+
+type MakeSureLeftSlash<T> = T extends any
+  ? `/${TrimRightSlash<T & string>}`
+  : never;
+
+// exclude `/*`, because it always at the top of the IDE tip list
+type Path<T, K = UnionPath<T>> =
+  | Exclude<MakeSureLeftSlash<K>, '/*'>
+  | IndexRoutePathname;

package/templates/umi-mobile/src/.umi/core/plugin.ts

@@ -0,0 +1,83 @@
+// @ts-nocheck
+// This file is generated by Umi automatically
+// DO NOT CHANGE IT MANUALLY!
+import { PluginManager } from 'umi';
+import * as Plugin_1 from '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/.umi/plugin-clickToComponent/runtime.tsx';
+import * as Plugin_2 from '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/.umi/plugin-errorBoundary/runtime';
+import * as Plugin_3 from '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/.umi/plugin-hd/runtime';
+import * as Plugin_0 from '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/app.tsx';
+
+function __defaultExport(obj) {
+  if (obj.default) {
+    return typeof obj.default === 'function' ? obj.default() : obj.default;
+  }
+  return obj;
+}
+export function getPlugins() {
+  return [
+    {
+      apply: __defaultExport(Plugin_0),
+      path:
+        process.env.NODE_ENV === 'production'
+          ? void 0
+          : '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/app.tsx',
+    },
+    {
+      apply: Plugin_1,
+      path:
+        process.env.NODE_ENV === 'production'
+          ? void 0
+          : '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/.umi/plugin-clickToComponent/runtime.tsx',
+    },
+    {
+      apply: Plugin_2,
+      path:
+        process.env.NODE_ENV === 'production'
+          ? void 0
+          : '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/.umi/plugin-errorBoundary/runtime',
+    },
+    {
+      apply: Plugin_3,
+      path:
+        process.env.NODE_ENV === 'production'
+          ? void 0
+          : '/Users/baicheng/Desktop/git.zdhrsoft.com/agricultural-cow-trading-mobile/src/.umi/plugin-hd/runtime',
+    },
+  ];
+}
+
+export function getValidKeys() {
+  return [
+    'patchRoutes',
+    'patchClientRoutes',
+    'modifyContextOpts',
+    'modifyClientRenderOpts',
+    'rootContainer',
+    'innerProvider',
+    'i18nProvider',
+    'accessProvider',
+    'dataflowProvider',
+    'outerProvider',
+    'render',
+    'onRouteChange',
+    'antd',
+    'qiankun',
+    'errorBoundary',
+    'hd',
+  ];
+}
+
+let pluginManager = null;
+
+export function createPluginManager() {
+  pluginManager = PluginManager.create({
+    plugins: getPlugins(),
+    validKeys: getValidKeys(),
+  });
+
+  return pluginManager;
+}
+
+export function getPluginManager() {
+  return pluginManager;
+}