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

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

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

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

@@ -1,4 +1,4 @@
-import { isFunction, isObject } from 'lodash';
+import _ 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 { isFunction, isObject } from 'lodash';
+import _ 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"
-    minSdkVersion 21
-    targetSdkVersion 25
+    minSdk 21
+    targetSdk 25
     versionCode 100
     versionName '1.0.0'
     multiDexEnabled true
     ndk {
-      abiFilters 'x86', 'armeabi-v7a', 'arm64-v8a'
+      abiFilters 'armeabi-v7a'
     }
   }
 
@@ -51,31 +51,16 @@ 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.4.1'
+  implementation 'androidx.appcompat:appcompat:1.3.0'
   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 { isFunction, unionBy } from 'lodash';
+import _ 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 { isFunction } from 'lodash';
+import _ 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 { isFunction, isObject } from 'lodash';
+import _ 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 { isFunction, isObject } from 'lodash';
+import _ 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 { isFunction, isNumber } from 'lodash';
+import _ 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/es/.lintstagedrc.js

@@ -1,27 +0,0 @@
-const {
-  getYolkConfig,
-  getEsLintConfigPath,
-  getStyleLintConfigPath,
-} = require('./util');
-
-const yolkConfig = getYolkConfig();
-const isStrict = yolkConfig.strict !== false;
-
-const prettierCLI = 'prettier --write';
-const eslintCLI = `eslint --fix ${
-  isStrict ? '--no-inline-config --no-ignore' : ''
-} --no-error-on-unmatched-pattern --config ${getEsLintConfigPath()}`;
-const stylelintCLI = `stylelint --fix ${
-  isStrict ? '--ignore-disables' : ''
-} '--allow-empty-input' --config ${getStyleLintConfigPath()}`;
-
-module.exports = {
-  '*.{md,json}': [prettierCLI],
-  '*.less': [prettierCLI, `${stylelintCLI} --custom-syntax postcss-less`],
-  '*.{sass,scss}': [
-    prettierCLI,
-    `${stylelintCLI} --custom-syntax postcss-scss`,
-  ],
-  '*.{js,jsx}': [prettierCLI, eslintCLI],
-  '*.{ts,tsx}': [`${prettierCLI} --parser=typescript`, eslintCLI],
-};

package/es/index.d.ts

@@ -1,3 +0,0 @@
-#! /usr/bin/env node
-import 'v8-compile-cache';
-import './yolk';

package/es/util.d.ts

@@ -1,18 +0,0 @@
-import ora from 'ora';
-export declare type YolkConfig = {
-    strict?: boolean;
-    eslintIgnore?: string | string[] | RegExp | RegExp[];
-    stylelintIgnore?: string | string[] | RegExp | RegExp[];
-    lintStaged?: boolean;
-};
-export declare const ENCODING = "utf-8";
-export declare const warn: (text?: string) => "" | ora.Ora | undefined;
-export declare const fail: (text?: string) => "" | ora.Ora | undefined;
-export declare const succeed: (text?: string) => "" | ora.Ora | undefined;
-export declare const info: (text?: string) => "" | ora.Ora | undefined;
-export declare const getYolkConfig: () => YolkConfig;
-export declare const getPrettierConfig: () => any;
-export declare const getProjectConfigJSON: () => any;
-export declare const getPackageJSON: () => any;
-export declare const getEsLintConfigPath: () => string;
-export declare const getStyleLintConfigPath: () => string;

package/es/util.js

@@ -1 +0,0 @@
-import r from"fs";import t from"path";import{globSync as e}from"glob";import n from"ora";var o=process.cwd();export var ENCODING="utf-8";var i=n();export var warn=function(r){return r&&i.warn(Buffer.from(r,ENCODING).toString())};export var fail=function(r){return r&&i.fail(Buffer.from(r,ENCODING).toString())};export var succeed=function(r){return r&&i.succeed(Buffer.from(r,ENCODING).toString())};export var info=function(r){return r&&i.info(Buffer.from(r,ENCODING).toString())};export var getYolkConfig=function(){var n=e("*.yolkrc*",{cwd:o,dot:!0});if(!n.length)return{};var i=t.join(o,n[0]);if(!r.existsSync(i))return{};try{return JSON.parse(r.readFileSync(i,ENCODING))||{}}catch(c){return fail(c.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}};export var getPrettierConfig=function(){var e=t.join(o,".prettierrc");if(r.existsSync(e))try{return JSON.parse(r.readFileSync(e,ENCODING))||{}}catch(n){return fail(n.message||".prettierrc\u8f6c\u6362\u9519\u8bef"),{}}return require("./.prettierrc")};export var getProjectConfigJSON=function(){var e=t.join(o,"project.config.json");if(!r.existsSync(e))return{};try{return JSON.parse(r.readFileSync(e,ENCODING))||{}}catch(n){return fail(n.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}};export var getPackageJSON=function(){var e=t.join(o,"package.json");if(!r.existsSync(e))return{};try{return JSON.parse(r.readFileSync(e,ENCODING))||{}}catch(n){return fail(n.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}};export var getEsLintConfigPath=function(){var t=getYolkConfig(),n="";try{n=require.resolve("@baic/eslint-config-yolk")}catch(a){}var i=e("*.eslintrc*",{cwd:o,dot:!0}),c=i[0];return!1===t.strict&&c&&r.existsSync(c)?c:r.existsSync(n)?n:c};export var getStyleLintConfigPath=function(){var t=getYolkConfig(),n="";try{n=require.resolve("@baic/stylelint-config-yolk")}catch(a){}var i=e("*.stylelintrc*",{cwd:o,dot:!0}),c=i[0];return!1===t.strict&&c&&r.existsSync(c)?c:r.existsSync(n)?n:c};

package/es/yolk.d.ts

@@ -1,2 +0,0 @@
-#! /usr/bin/env node
-export {};

package/lib/.lintstagedrc.js

@@ -1,27 +0,0 @@
-const {
-  getYolkConfig,
-  getEsLintConfigPath,
-  getStyleLintConfigPath,
-} = require('./util');
-
-const yolkConfig = getYolkConfig();
-const isStrict = yolkConfig.strict !== false;
-
-const prettierCLI = 'prettier --write';
-const eslintCLI = `eslint --fix ${
-  isStrict ? '--no-inline-config --no-ignore' : ''
-} --no-error-on-unmatched-pattern --config ${getEsLintConfigPath()}`;
-const stylelintCLI = `stylelint --fix ${
-  isStrict ? '--ignore-disables' : ''
-} '--allow-empty-input' --config ${getStyleLintConfigPath()}`;
-
-module.exports = {
-  '*.{md,json}': [prettierCLI],
-  '*.less': [prettierCLI, `${stylelintCLI} --custom-syntax postcss-less`],
-  '*.{sass,scss}': [
-    prettierCLI,
-    `${stylelintCLI} --custom-syntax postcss-scss`,
-  ],
-  '*.{js,jsx}': [prettierCLI, eslintCLI],
-  '*.{ts,tsx}': [`${prettierCLI} --parser=typescript`, eslintCLI],
-};

package/lib/index.d.ts

@@ -1,3 +0,0 @@
-#! /usr/bin/env node
-import 'v8-compile-cache';
-import './yolk';

package/lib/util.d.ts

@@ -1,18 +0,0 @@
-import ora from 'ora';
-export declare type YolkConfig = {
-    strict?: boolean;
-    eslintIgnore?: string | string[] | RegExp | RegExp[];
-    stylelintIgnore?: string | string[] | RegExp | RegExp[];
-    lintStaged?: boolean;
-};
-export declare const ENCODING = "utf-8";
-export declare const warn: (text?: string) => "" | ora.Ora | undefined;
-export declare const fail: (text?: string) => "" | ora.Ora | undefined;
-export declare const succeed: (text?: string) => "" | ora.Ora | undefined;
-export declare const info: (text?: string) => "" | ora.Ora | undefined;
-export declare const getYolkConfig: () => YolkConfig;
-export declare const getPrettierConfig: () => any;
-export declare const getProjectConfigJSON: () => any;
-export declare const getPackageJSON: () => any;
-export declare const getEsLintConfigPath: () => string;
-export declare const getStyleLintConfigPath: () => string;

package/lib/util.js

@@ -1 +0,0 @@
-var e=Object.create,t=Object.defineProperty,r=Object.getOwnPropertyDescriptor,n=Object.getOwnPropertyNames,c=Object.getPrototypeOf,o=Object.prototype.hasOwnProperty,a=(e,r)=>{for(var n in r)t(e,n,{get:r[n],enumerable:!0})},i=(e,c,a,i)=>{if(c&&"object"===typeof c||"function"===typeof c)for(let s of n(c))o.call(e,s)||s===a||t(e,s,{get:()=>c[s],enumerable:!(i=r(c,s))||i.enumerable});return e},s=(r,n,o)=>(o=null!=r?e(c(r)):{},i(!n&&r&&r.__esModule?o:t(o,"default",{value:r,enumerable:!0}),r)),f=e=>i(t({},"__esModule",{value:!0}),e),l={};a(l,{ENCODING:()=>p,fail:()=>O,getEsLintConfigPath:()=>k,getPackageJSON:()=>N,getPrettierConfig:()=>w,getProjectConfigJSON:()=>x,getStyleLintConfigPath:()=>q,getYolkConfig:()=>P,info:()=>h,succeed:()=>m,warn:()=>b}),module.exports=f(l);var u=s(require("fs")),g=s(require("path")),y=require("glob"),d=s(require("ora")),S=process.cwd(),p="utf-8",j=(0,d.default)(),b=e=>e&&j.warn(Buffer.from(e,p).toString()),O=e=>e&&j.fail(Buffer.from(e,p).toString()),m=e=>e&&j.succeed(Buffer.from(e,p).toString()),h=e=>e&&j.info(Buffer.from(e,p).toString()),P=()=>{const e=(0,y.globSync)("*.yolkrc*",{cwd:S,dot:!0});if(!e.length)return{};const t=g.default.join(S,e[0]);if(!u.default.existsSync(t))return{};try{return JSON.parse(u.default.readFileSync(t,p))||{}}catch(r){return O(r.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}},w=()=>{const e=g.default.join(S,".prettierrc");if(u.default.existsSync(e))try{return JSON.parse(u.default.readFileSync(e,p))||{}}catch(t){return O(t.message||".prettierrc\u8f6c\u6362\u9519\u8bef"),{}}return require("./.prettierrc")},x=()=>{const e=g.default.join(S,"project.config.json");if(!u.default.existsSync(e))return{};try{return JSON.parse(u.default.readFileSync(e,p))||{}}catch(t){return O(t.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}},N=()=>{const e=g.default.join(S,"package.json");if(!u.default.existsSync(e))return{};try{return JSON.parse(u.default.readFileSync(e,p))||{}}catch(t){return O(t.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}},k=()=>{const e=P();let t="";try{t=require.resolve("@baic/eslint-config-yolk")}catch(c){}const r=(0,y.globSync)("*.eslintrc*",{cwd:S,dot:!0}),n=r[0];return!1===e.strict&&n&&u.default.existsSync(n)?n:u.default.existsSync(t)?t:n},q=()=>{const e=P();let t="";try{t=require.resolve("@baic/stylelint-config-yolk")}catch(c){}const r=(0,y.globSync)("*.stylelintrc*",{cwd:S,dot:!0}),n=r[0];return!1===e.strict&&n&&u.default.existsSync(n)?n:u.default.existsSync(t)?t:n};

package/lib/yolk.d.ts

@@ -1,2 +0,0 @@
-#! /usr/bin/env node
-export {};