@tarojs/service 3.3.20 → 3.4.0-beta.3

package/dist/Kernel.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 import { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile';
-import { IPreset, IPlugin, IPaths, IHook, ICommand, IPlatform } from './utils/types';
+import { IPreset, IPluginsObject, IPlugin, IPaths, IHook, ICommand, IPlatform } from './utils/types';
 import Plugin from './Plugin';
 import Config from './Config';
 interface IKernelOptions {
@@ -17,7 +17,7 @@ export default class Kernel extends EventEmitter {
     optsPlugins: PluginItem[] | void;
     plugins: Map<string, IPlugin>;
     paths: IPaths;
-    extraPlugins: IPlugin[];
+    extraPlugins: IPluginsObject;
     config: Config;
     initialConfig: IProjectConfig;
     hooks: Map<string, IHook[]>;
@@ -51,6 +51,7 @@ export default class Kernel extends EventEmitter {
     }): Promise<any>;
     runWithPlatform(platform: any): any;
     setRunOpts(opts: any): void;
+    runHelp(name: string): void;
     run(args: string | {
         name: string;
         opts?: any;

package/dist/Kernel.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const events_1 = require("events");
+const lodash_1 = require("lodash");
 const tapable_1 = require("tapable");
 const helper_1 = require("@tarojs/helper");
 const helper = require("@tarojs/helper");
@@ -76,7 +77,7 @@ class Kernel extends events_1.EventEmitter {
                 only: [...Object.keys(allConfigPresets), ...Object.keys(allConfigPlugins)]
             });
         this.plugins = new Map();
-        this.extraPlugins = [];
+        this.extraPlugins = {};
         this.resolvePresets(allConfigPresets);
         this.resolvePlugins(allConfigPlugins);
     }
@@ -87,12 +88,12 @@ class Kernel extends events_1.EventEmitter {
         }
     }
     resolvePlugins(plugins) {
+        plugins = lodash_1.merge(this.extraPlugins, plugins);
         const allPlugins = utils_1.resolvePresetsOrPlugins(this.appPath, plugins, constants_1.PluginType.Plugin);
-        const _plugins = [...this.extraPlugins, ...allPlugins];
-        while (_plugins.length) {
-            this.initPlugin(_plugins.shift());
+        while (allPlugins.length) {
+            this.initPlugin(allPlugins.shift());
         }
-        this.extraPlugins = [];
+        this.extraPlugins = {};
     }
     initPreset(preset) {
         this.debugger('initPreset', preset);
@@ -107,7 +108,7 @@ class Kernel extends events_1.EventEmitter {
             }
         }
         if (Array.isArray(plugins)) {
-            this.extraPlugins.push(...utils_1.resolvePresetsOrPlugins(this.appPath, utils_1.convertPluginsToObject(plugins)(), constants_1.PluginType.Plugin));
+            this.extraPlugins = lodash_1.merge(this.extraPlugins, utils_1.convertPluginsToObject(plugins)());
         }
     }
     initPlugin(plugin) {
@@ -232,6 +233,17 @@ class Kernel extends events_1.EventEmitter {
     setRunOpts(opts) {
         this.runOpts = opts;
     }
+    runHelp(name) {
+        const command = this.commands.get(name);
+        const defaultOptionsMap = new Map();
+        defaultOptionsMap.set('-h, --help', 'output usage information');
+        let customOptionsMap = new Map();
+        if (command === null || command === void 0 ? void 0 : command.optionsMap) {
+            customOptionsMap = new Map(Object.entries(command === null || command === void 0 ? void 0 : command.optionsMap));
+        }
+        const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap]);
+        utils_1.printHelpLog(name, optionsMap, (command === null || command === void 0 ? void 0 : command.synopsisList) ? new Set(command === null || command === void 0 ? void 0 : command.synopsisList) : new Set());
+    }
     run(args) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -256,16 +268,7 @@ class Kernel extends events_1.EventEmitter {
                 throw new Error(`${name} 命令不存在`);
             }
             if (opts === null || opts === void 0 ? void 0 : opts.isHelp) {
-                const command = this.commands.get(name);
-                const defaultOptionsMap = new Map();
-                defaultOptionsMap.set('-h, --help', 'output usage information');
-                let customOptionsMap = new Map();
-                if (command === null || command === void 0 ? void 0 : command.optionsMap) {
-                    customOptionsMap = new Map(Object.entries(command === null || command === void 0 ? void 0 : command.optionsMap));
-                }
-                const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap]);
-                utils_1.printHelpLog(name, optionsMap, (command === null || command === void 0 ? void 0 : command.synopsisList) ? new Set(command === null || command === void 0 ? void 0 : command.synopsisList) : new Set());
-                return;
+                return this.runHelp(name);
             }
             if ((_a = opts === null || opts === void 0 ? void 0 : opts.options) === null || _a === void 0 ? void 0 : _a.platform) {
                 opts.config = this.runWithPlatform(opts.options.platform);

package/dist/utils/index.d.ts

@@ -1,9 +1,9 @@
 import { PluginItem } from '@tarojs/taro/types/compile';
 import { PluginType } from './constants';
-import { IPlugin } from './types';
+import { IPluginsObject, IPlugin } from './types';
 export declare const isNpmPkg: (name: string) => boolean;
 export declare function getPluginPath(pluginPath: string): string;
-export declare function convertPluginsToObject(items: PluginItem[]): () => {};
-export declare function mergePlugins(dist: PluginItem[], src: PluginItem[]): () => {};
+export declare function convertPluginsToObject(items: PluginItem[]): () => IPluginsObject;
+export declare function mergePlugins(dist: PluginItem[], src: PluginItem[]): () => IPluginsObject;
 export declare function resolvePresetsOrPlugins(root: string, args: any, type: PluginType): IPlugin[];
 export declare function printHelpLog(command: any, optionsList: Map<string, string>, synopsisList?: Set<string>): void;

package/dist/utils/index.js

@@ -43,10 +43,24 @@ exports.mergePlugins = mergePlugins;
 // getModuleDefaultExport
 function resolvePresetsOrPlugins(root, args, type) {
     return Object.keys(args).map(item => {
-        const fPath = resolve.sync(item, {
-            basedir: root,
-            extensions: ['.js', '.ts']
-        });
+        var _a;
+        let fPath;
+        try {
+            fPath = resolve.sync(item, {
+                basedir: root,
+                extensions: ['.js', '.ts']
+            });
+        }
+        catch (err) {
+            if ((_a = args[item]) === null || _a === void 0 ? void 0 : _a.backup) {
+                // 如果项目中没有，可以使用 CLI 中的插件
+                fPath = args[item].backup;
+            }
+            else {
+                console.log(helper_1.chalk.red(`找不到依赖 "${item}"，请先在项目中安装`));
+                process.exit(1);
+            }
+        }
         return {
             id: fPath,
             path: fPath,

package/dist/utils/types.d.ts

@@ -22,6 +22,7 @@ export interface IPaths {
     nodeModulesPath: string;
 }
 export declare type Func = (...args: any[]) => any;
+export declare type IPluginsObject = Record<string, Record<any, any> | null>;
 export interface IPlugin {
     id: string;
     path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/service",
-  "version": "3.3.20",
+  "version": "3.4.0-beta.3",
   "description": "Taro Service",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -34,13 +34,13 @@
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
     "@hapi/joi": "17.1.1",
-    "@tarojs/helper": "3.3.20",
-    "@tarojs/shared": "3.3.20",
-    "@tarojs/taro": "3.3.20",
-    "fs-extra": "8.1.0",
-    "lodash": "4.17.21",
-    "resolve": "1.15.1",
-    "tapable": "1.1.3"
+    "@tarojs/helper": "3.4.0-beta.3",
+    "@tarojs/shared": "3.4.0-beta.3",
+    "@tarojs/taro": "3.4.0-beta.3",
+    "fs-extra": "^8.0.1",
+    "lodash": "^4.17.21",
+    "resolve": "^1.6.0",
+    "tapable": "^1.1.3"
   },
-  "gitHead": "f98ceefaa3e419db5a6c3bcd3bf123ce5a0a0124"
+  "gitHead": "2ef7e8c10c9e5784e98bb1ad3a803d5fd6a46c8b"
 }

package/src/Kernel.ts

@@ -1,6 +1,6 @@
 import * as path from 'path'
 import { EventEmitter } from 'events'
-
+import { merge } from 'lodash'
 import { AsyncSeriesWaterfallHook } from 'tapable'
 import { IProjectConfig, PluginItem } from '@tarojs/taro/types/compile'
 import {
@@ -14,6 +14,7 @@ import * as joi from '@hapi/joi'
 
 import {
   IPreset,
+  IPluginsObject,
   IPlugin,
   IPaths,
   IHook,
@@ -44,7 +45,7 @@ export default class Kernel extends EventEmitter {
   optsPlugins: PluginItem[] | void
   plugins: Map<string, IPlugin>
   paths: IPaths
-  extraPlugins: IPlugin[]
+  extraPlugins: IPluginsObject
   config: Config
   initialConfig: IProjectConfig
   hooks: Map<string, IHook[]>
@@ -114,7 +115,7 @@ export default class Kernel extends EventEmitter {
       only: [...Object.keys(allConfigPresets), ...Object.keys(allConfigPlugins)]
     })
     this.plugins = new Map()
-    this.extraPlugins = []
+    this.extraPlugins = {}
     this.resolvePresets(allConfigPresets)
     this.resolvePlugins(allConfigPlugins)
   }
@@ -127,12 +128,13 @@ export default class Kernel extends EventEmitter {
   }
 
   resolvePlugins (plugins) {
+    plugins = merge(this.extraPlugins, plugins)
     const allPlugins = resolvePresetsOrPlugins(this.appPath, plugins, PluginType.Plugin)
-    const _plugins = [...this.extraPlugins, ...allPlugins]
-    while (_plugins.length) {
-      this.initPlugin(_plugins.shift()!)
+
+    while (allPlugins.length) {
+      this.initPlugin(allPlugins.shift()!)
     }
-    this.extraPlugins = []
+    this.extraPlugins = {}
   }
 
   initPreset (preset: IPreset) {
@@ -148,7 +150,7 @@ export default class Kernel extends EventEmitter {
       }
     }
     if (Array.isArray(plugins)) {
-      this.extraPlugins.push(...resolvePresetsOrPlugins(this.appPath, convertPluginsToObject(plugins)(), PluginType.Plugin))
+      this.extraPlugins = merge(this.extraPlugins, convertPluginsToObject(plugins)())
     }
   }
 
@@ -278,6 +280,18 @@ export default class Kernel extends EventEmitter {
     this.runOpts = opts
   }
 
+  runHelp (name: string) {
+    const command = this.commands.get(name)
+    const defaultOptionsMap = new Map()
+    defaultOptionsMap.set('-h, --help', 'output usage information')
+    let customOptionsMap = new Map()
+    if (command?.optionsMap) {
+      customOptionsMap = new Map(Object.entries(command?.optionsMap))
+    }
+    const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap])
+    printHelpLog(name, optionsMap, command?.synopsisList ? new Set(command?.synopsisList) : new Set())
+  }
+
   async run (args: string | { name: string, opts?: any }) {
     let name
     let opts
@@ -299,16 +313,7 @@ export default class Kernel extends EventEmitter {
       throw new Error(`${name} 命令不存在`)
     }
     if (opts?.isHelp) {
-      const command = this.commands.get(name)
-      const defaultOptionsMap = new Map()
-      defaultOptionsMap.set('-h, --help', 'output usage information')
-      let customOptionsMap = new Map()
-      if (command?.optionsMap) {
-        customOptionsMap = new Map(Object.entries(command?.optionsMap))
-      }
-      const optionsMap = new Map([...customOptionsMap, ...defaultOptionsMap])
-      printHelpLog(name, optionsMap, command?.synopsisList ? new Set(command?.synopsisList) : new Set())
-      return
+      return this.runHelp(name)
     }
     if (opts?.options?.platform) {
       opts.config = this.runWithPlatform(opts.options.platform)

package/src/utils/index.ts

@@ -2,12 +2,12 @@ import * as path from 'path'
 
 import { merge } from 'lodash'
 import * as resolve from 'resolve'
-import { getModuleDefaultExport } from '@tarojs/helper'
+import { getModuleDefaultExport, chalk } from '@tarojs/helper'
 
 import { PluginItem } from '@tarojs/taro/types/compile'
 
 import { PluginType } from './constants'
-import { IPlugin } from './types'
+import { IPluginsObject, IPlugin } from './types'
 
 export const isNpmPkg: (name: string) => boolean = name => !(/^(\.|\/)/.test(name))
 
@@ -16,9 +16,9 @@ export function getPluginPath (pluginPath: string) {
   throw new Error('plugin 和 preset 配置必须为绝对路径或者包名')
 }
 
-export function convertPluginsToObject (items: PluginItem[]) {
+export function convertPluginsToObject (items: PluginItem[]): () => IPluginsObject {
   return () => {
-    const obj = {}
+    const obj: IPluginsObject = {}
     if (Array.isArray(items)) {
       items.forEach(item => {
         if (typeof item === 'string') {
@@ -45,10 +45,21 @@ export function mergePlugins (dist: PluginItem[], src: PluginItem[]) {
 // getModuleDefaultExport
 export function resolvePresetsOrPlugins (root: string, args, type: PluginType): IPlugin[] {
   return Object.keys(args).map(item => {
-    const fPath = resolve.sync(item, {
-      basedir: root,
-      extensions: ['.js', '.ts']
-    })
+    let fPath
+    try {
+      fPath = resolve.sync(item, {
+        basedir: root,
+        extensions: ['.js', '.ts']
+      })
+    } catch (err) {
+      if (args[item]?.backup) {
+        // 如果项目中没有，可以使用 CLI 中的插件
+        fPath = args[item].backup
+      } else {
+        console.log(chalk.red(`找不到依赖 "${item}"，请先在项目中安装`))
+        process.exit(1)
+      }
+    }
     return {
       id: fPath,
       path: fPath,

package/src/utils/types.ts

@@ -25,6 +25,8 @@ export interface IPaths {
 
 export type Func = (...args: any[]) => any
 
+export type IPluginsObject = Record<string, Record<any, any> | null>
+
 export interface IPlugin {
   id: string
   path: string

package/types/index.d.ts

@@ -8,6 +8,15 @@ export { default as Kernel } from './Kernel'
 
 export { TaroPlatformBase } from './platform-plugin-base'
 
+interface IModifyWebpackChain {
+  componentConfig?: {
+    includes: Set<string>
+    exclude: Set<string>
+    thirdPartyComponents: Map<Tagname, Attrs>
+    includeAll: boolean
+  }
+}
+
 export declare interface IPluginContext {
   /**
    * 获取当前所有挂载的插件
@@ -72,7 +81,7 @@ export declare interface IPluginContext {
   /**
    * 编译中修改 webpack 配置，在这个钩子中，你可以对 webpackChain 作出想要的调整，等同于配置 [`webpackChain`](./config-detail.md#miniwebpackchain)
    */
-  modifyWebpackChain: (fn: (args: { chain: any }) => void) => void
+  modifyWebpackChain: (fn: (args: { chain: any, webpack: any, data?: IModifyWebpackChain }) => void) => void
   /**
    * 修改编译后的结果
    */