@baic/yolk-cli 2.1.0-alpha.130 → 2.1.0-alpha.132

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baic/yolk-cli",
-  "version": "2.1.0-alpha.130",
+  "version": "2.1.0-alpha.132",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/303394539/yolk.git"
@@ -27,31 +27,29 @@
   "dependencies": {
     "@babel/runtime": "~7.x",
     "@types/inquirer": "~8.x",
+    "@types/lint-staged": "~13.2.x",
     "@types/lodash": "~4.x",
-    "@types/prettier": "~2.x",
+    "glob": "~10.x",
     "inquirer": "~8.x",
+    "lint-staged": "~13.2.x",
     "lodash": "~4.x",
+    "minimatch": "~9.0.x",
     "miniprogram-ci": "~1.9.x",
+    "mkdirp": "~3.0.x",
     "ora": "5.4.1",
-    "prettier": "~2.x",
+    "rimraf": "~5.0.x",
     "v8-compile-cache": "~2.3.x"
   },
   "devDependencies": {
-    "@types/glob": "~8.x",
-    "@types/minimatch": "~5.1.x",
-    "@types/mkdirp": "~1.0.x",
     "@types/mustache": "~4.2.x",
-    "@types/rimraf": "~3.0.x",
+    "@types/prettier": "~2.x",
     "commander": "~6.x",
-    "glob": "~8.x",
-    "minimatch": "~5.1.x",
-    "mkdirp": "~1.0.x",
     "mustache": "~4.2.x",
-    "rimraf": "~3.0.x",
+    "prettier": "~2.x",
     "staged-git-files": "~1.3.x"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "982aa053fb24b10a7f4777fa97604d04463084de"
+  "gitHead": "45e55017fb356466b21cc6664eb0e4366a58e4f4"
 }

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

@@ -49,7 +49,7 @@
   "compileType": "miniprogram",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
-  "libVersion": "2.30.0",
+  "libVersion": "2.32.0",
   "condition": {},
   "srcMiniprogramRoot": "dist/",
   "packOptions": {

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

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isFunction, isObject } from 'lodash';
 
 import type { FunctionComponent } from 'react';
 import { createElement } from 'react';
@@ -56,14 +56,14 @@ export default () => {
     <Tabs defaultActiveKey={keys[0]}>
       {keys.map((key) => {
         const tab = tabs[key];
-        if (_.isFunction(tab)) {
+        if (isFunction(tab)) {
           return (
             <Tab key={key} title={key}>
               {createElement(tab)}
             </Tab>
           );
         }
-        if (_.isObject(tab)) {
+        if (isObject(tab)) {
           const keys2 = Object.keys(tab);
           return (
             <Tab key={key} title={key}>

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import _ from 'lodash';
+import { isFunction, isObject } from 'lodash';
 
 import { Tabs, Collapse } from 'antd-mobile';
 
@@ -55,14 +55,14 @@ export default () => {
     <Tabs defaultActiveKey={keys[0]}>
       {keys.map((key) => {
         const tab = tabs[key];
-        if (_.isFunction(tab)) {
+        if (isFunction(tab)) {
           return (
             <Tab key={key} title={key}>
               {React.createElement(tab)}
             </Tab>
           );
         }
-        if (_.isObject(tab)) {
+        if (isObject(tab)) {
           const keys2 = Object.keys(tab);
           return (
             <Tab key={key} title={key}>

package/templates/umi-mobile-native/android/app/build.gradle

@@ -7,13 +7,13 @@ android {
 
   defaultConfig {
     applicationId "plus.H5ECA1DEE"
-    minSdk 21
-    targetSdk 25
+    minSdkVersion 21
+    targetSdkVersion 25
     versionCode 100
     versionName '1.0.0'
     multiDexEnabled true
     ndk {
-      abiFilters 'armeabi-v7a'
+      abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
     }
   }
 
@@ -51,16 +51,31 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  packagingOptions {
+    exclude 'resources.arsc'
+    exclude 'AndroidManifest.xml'
+  }
+
+  aaptOptions {
+    additionalParameters '--auto-add-overlay'
+    ignoreAssetsPattern "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
+  }
+
+  lint {
+    checkReleaseBuilds false
+  }
 }
 
 dependencies {
   // base
   implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
-  implementation 'androidx.appcompat:appcompat:1.3.0'
+  implementation 'androidx.appcompat:appcompat:1.4.1'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
   implementation 'androidx.recyclerview:recyclerview:1.2.1'
   implementation 'com.facebook.fresco:fresco:2.6.0'
   implementation 'com.facebook.fresco:animated-gif:2.6.0'
   implementation 'com.github.bumptech.glide:glide:4.13.1'
   implementation 'com.alibaba:fastjson:1.1.46.android'
+  implementation 'androidx.webkit:webkit:1.4.0'
 }

package/templates/umi-mobile-native/android/gradle.properties

@@ -15,8 +15,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.enableJetifier=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.useNewApkCreator=false

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

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isFunction, unionBy } from 'lodash';
 
 import { Toast } from 'antd-mobile';
 
@@ -112,7 +112,7 @@ class Bluetooth {
           content: '蓝牙设备断开',
         });
       }
-      if (_.isFunction(e)) {
+      if (isFunction(e)) {
         e({ connected, deviceId });
       }
     });
@@ -123,7 +123,7 @@ class Bluetooth {
   ) {
     const { bluetooth } = window.plus || {};
     bluetooth.onBluetoothDeviceFound(({ devices = [] }) => {
-      this.devices = _.unionBy(
+      this.devices = unionBy(
         this.devices.concat(
           devices.filter(
             ({ name }: plus.Bluetooth.BluetoothDeviceInfo) =>
@@ -132,7 +132,7 @@ class Bluetooth {
         ),
         'deviceId',
       );
-      if (_.isFunction(e)) {
+      if (isFunction(e)) {
         e({ devices: this.devices });
       }
     });
@@ -142,7 +142,7 @@ class Bluetooth {
     const { bluetooth } = window.plus || {};
     const { notifyInterval = 200 } = this.options;
     bluetooth.onBLECharacteristicValueChange(({ value }) => {
-      if (_.isFunction(onChange)) {
+      if (isFunction(onChange)) {
         if (notifyInterval > 0) {
           if (!this.isNotifyInterval) {
             onChange(value);
@@ -222,7 +222,7 @@ class Bluetooth {
       deviceId,
       serviceId,
       characteristicId,
-      value: _.isFunction(onWriteValue) ? onWriteValue() : new ArrayBuffer(0),
+      value: isFunction(onWriteValue) ? onWriteValue() : new ArrayBuffer(0),
     });
     if (writeInterval > 0) {
       this.writeTimeoutId = setTimeout(

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

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isFunction } from 'lodash';
 
 type Result<T = object> = {
   code: number;
@@ -17,24 +17,24 @@ const bridge = {
   ) {
     return new Promise<T | undefined>((resolve, reject) => {
       const successCallback = (event: Result<T>) => {
-        if (_.isFunction(complete)) {
+        if (isFunction(complete)) {
           complete(event);
         }
         if (event) {
           const { code, data } = event;
           if (0 === code) {
-            if (_.isFunction(success)) {
+            if (isFunction(success)) {
               success(data);
             }
             resolve(data);
           } else {
-            if (_.isFunction(fail)) {
+            if (isFunction(fail)) {
               fail(event);
             }
             reject(event);
           }
         } else {
-          if (_.isFunction(fail)) {
+          if (isFunction(fail)) {
             fail({
               code: -1,
             });
@@ -45,7 +45,7 @@ const bridge = {
         }
       };
       const failCallback = (event?: Result<T>) => {
-        if (_.isFunction(fail)) {
+        if (isFunction(fail)) {
           fail(event);
         }
         reject(event);

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import _ from 'lodash';
+import { isFunction, isObject } from 'lodash';
 
 import { Tabs, Collapse } from 'antd-mobile';
 
@@ -57,14 +57,14 @@ export default () => {
     <Tabs defaultActiveKey={keys[0]}>
       {keys.map((key) => {
         const tab = tabs[key];
-        if (_.isFunction(tab)) {
+        if (isFunction(tab)) {
           return (
             <Tab key={key} title={key}>
               {React.createElement(tab)}
             </Tab>
           );
         }
-        if (_.isObject(tab)) {
+        if (isObject(tab)) {
           const keys2 = Object.keys(tab);
           return (
             <Tab key={key} title={key}>

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

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isFunction, isObject } from 'lodash';
 
 import * as React from 'react';
 
@@ -105,14 +105,14 @@ export default () => {
     <Tabs defaultActiveKey={keys[0]}>
       {keys.map((key) => {
         const tab = tabs[key];
-        if (_.isFunction(tab)) {
+        if (isFunction(tab)) {
           return (
             <TabPane key={key} tab={key}>
               {React.createElement(tab)}
             </TabPane>
           );
         }
-        if (_.isObject(tab)) {
+        if (isObject(tab)) {
           const keys2 = Object.keys(tab);
           return (
             <TabPane key={key} tab={key}>

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

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isFunction, isNumber } from 'lodash';
 import classnames from 'classnames';
 
 import type { ReactNode, RefObject } from 'react';
@@ -38,7 +38,7 @@ const Component = forwardRef<ContainerInstance, ResizeContainerProps>(
   ) => {
     const containerRef = useRef<HTMLDivElement>(null);
     const { width = 0, height = 0 } = useSize(
-      _.isFunction(getContainer)
+      isFunction(getContainer)
         ? getContainer()
         : () => containerRef.current?.parentElement || null,
     ) || { width: 0, height: 0 };
@@ -50,7 +50,7 @@ const Component = forwardRef<ContainerInstance, ResizeContainerProps>(
         container: containerRef.current,
       };
       if (containerRef.current) {
-        const $zoom = _.isNumber(containerParentElementZoom)
+        const $zoom = isNumber(containerParentElementZoom)
           ? containerParentElementZoom
           : containerParentElementZoom
           ? Number(document.body.getAttribute('data-zoom') || 1)
@@ -68,7 +68,7 @@ const Component = forwardRef<ContainerInstance, ResizeContainerProps>(
           containerRef.current.style.zoom = 1 / $zoom;
         }
       }
-      if (_.isFunction(onResize)) {
+      if (isFunction(onResize)) {
         onResize(res);
       }
       return res;
@@ -79,7 +79,7 @@ const Component = forwardRef<ContainerInstance, ResizeContainerProps>(
       if (0 === containerWidth || 0 === containerHeight) {
         return null;
       }
-      return _.isFunction(children) ? children(instance) : children;
+      return isFunction(children) ? children(instance) : children;
     }, [children, instance]);
     return (
       <div

package/compiled/glob/index.d.ts

@@ -1,102 +0,0 @@
-/// <reference types="node" />
-
-import events = require('events');
-import fs = require('fs');
-import minimatch = require('minimatch');
-
-export declare type ___promisify__ = G.___promisify__;
-
-declare function G(pattern: string, cb: (err: Error | null, matches: string[]) => void): G.IGlob;
-
-declare function G(pattern: string, options: G.IOptions, cb: (err: Error | null, matches: string[]) => void): G.IGlob;
-
-declare namespace G {
-    function __promisify__(pattern: string, options?: IOptions): Promise<string[]>;
-
-    function sync(pattern: string, options?: IOptions): string[];
-
-    function hasMagic(pattern: string, options?: IOptions): boolean;
-
-    let glob: typeof G;
-    let Glob: IGlobStatic;
-    let GlobSync: IGlobSyncStatic;
-
-    interface IOptions extends minimatch.IOptions {
-        cwd?: string | undefined;
-        root?: string | undefined;
-        dot?: boolean | undefined;
-        nomount?: boolean | undefined;
-        mark?: boolean | undefined;
-        nosort?: boolean | undefined;
-        stat?: boolean | undefined;
-        silent?: boolean | undefined;
-        strict?: boolean | undefined;
-        cache?: { [path: string]: boolean | 'DIR' | 'FILE' | ReadonlyArray<string> } | undefined;
-        statCache?: { [path: string]: false | { isDirectory(): boolean} | undefined } | undefined;
-        symlinks?: { [path: string]: boolean | undefined } | undefined;
-        realpathCache?: { [path: string]: string } | undefined;
-        sync?: boolean | undefined;
-        nounique?: boolean | undefined;
-        nonull?: boolean | undefined;
-        debug?: boolean | undefined;
-        nobrace?: boolean | undefined;
-        noglobstar?: boolean | undefined;
-        noext?: boolean | undefined;
-        nocase?: boolean | undefined;
-        matchBase?: any;
-        nodir?: boolean | undefined;
-        ignore?: string | ReadonlyArray<string> | undefined;
-        follow?: boolean | undefined;
-        realpath?: boolean | undefined;
-        nonegate?: boolean | undefined;
-        nocomment?: boolean | undefined;
-        absolute?: boolean | undefined;
-        allowWindowsEscape?: boolean | undefined;
-        fs?: typeof fs;
-    }
-
-    interface IGlobStatic extends events.EventEmitter {
-        new (pattern: string, cb?: (err: Error | null, matches: string[]) => void): IGlob;
-        new (pattern: string, options: IOptions, cb?: (err: Error | null, matches: string[]) => void): IGlob;
-        prototype: IGlob;
-    }
-
-    interface IGlobSyncStatic {
-        new (pattern: string, options?: IOptions): IGlobBase;
-        prototype: IGlobBase;
-    }
-
-    interface IGlobBase {
-        minimatch: minimatch.IMinimatch;
-        options: IOptions;
-        aborted: boolean;
-        cache: { [path: string]: boolean | 'DIR' | 'FILE' | ReadonlyArray<string> };
-        statCache: { [path: string]: false | { isDirectory(): boolean; } | undefined };
-        symlinks: { [path: string]: boolean | undefined };
-        realpathCache: { [path: string]: string };
-        found: string[];
-    }
-
-    interface IGlob extends IGlobBase, events.EventEmitter {
-        pause(): void;
-        resume(): void;
-        abort(): void;
-    }
-}
-export default G;
-
-export declare type hasMagic = G.hasMagic;
-
-export declare type IGlob = G.IGlob;
-
-export declare type IGlobBase = G.IGlobBase;
-
-export declare type IGlobStatic = G.IGlobStatic;
-
-export declare type IGlobSyncStatic = G.IGlobSyncStatic;
-
-export declare type IOptions = G.IOptions;
-
-export declare type sync = G.sync;
-
-export { }