@tarojs/service 3.5.0-beta.4 → 3.5.0-theta.0

package/dist/Kernel.js

@@ -115,6 +115,7 @@ class Kernel extends events_1.EventEmitter {
         if (typeof pluginCtx.optsSchema !== 'function') {
             return;
         }
+        this.debugger('checkPluginOpts', pluginCtx);
         const joi = require('joi');
         const schema = pluginCtx.optsSchema(joi);
         if (!joi.isSchema(schema)) {
@@ -127,6 +128,7 @@ class Kernel extends events_1.EventEmitter {
         }
     }
     registerPlugin(plugin) {
+        this.debugger('registerPlugin', plugin);
         if (this.plugins.has(plugin.id)) {
             throw new Error(`插件 ${plugin.id} 已被注册`);
         }

package/dist/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { PluginItem } from '@tarojs/taro/types/compile';
+import type { PluginItem } from '@tarojs/taro/types/compile';
 import { PluginType } from './constants';
 import { IPlugin, IPluginsObject } from './types';
 export declare const isNpmPkg: (name: string) => boolean;

package/dist/utils/index.js

@@ -67,7 +67,13 @@ function resolvePresetsOrPlugins(root, args, type) {
             type,
             opts: args[item] || {},
             apply() {
-                return (0, helper_1.getModuleDefaultExport)(require(fPath));
+                try {
+                    return (0, helper_1.getModuleDefaultExport)(require(fPath));
+                }
+                catch (error) {
+                    console.error(error);
+                    throw new Error(`插件依赖 "${item}" 加载失败，请检查插件配置`);
+                }
             }
         };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/service",
-  "version": "3.5.0-beta.4",
+  "version": "3.5.0-theta.0",
   "description": "Taro Service",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -9,7 +9,7 @@
     "dev": "tsc -w",
     "prod": "tsc",
     "clean": "rimraf dist",
-    "prepack": "npm run build",
+    "prepack": "pnpm run build",
     "test": "jest",
     "test:dev": "jest --watch"
   },
@@ -33,15 +33,14 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@tarojs/helper": "3.5.0-beta.4",
-    "@tarojs/shared": "3.5.0-beta.4",
-    "@tarojs/taro": "3.5.0-beta.4",
+    "@tarojs/helper": "workspace:*",
+    "@tarojs/shared": "workspace:*",
+    "@tarojs/taro": "workspace:*",
     "fs-extra": "^8.1.0",
     "joi": "^17.6.0",
     "lodash": "^4.17.21",
     "resolve": "^1.22.0",
     "tapable": "^1.1.3",
     "webpack-merge": "^4.2.2"
-  },
-  "gitHead": "7aca7841ed7e2af1b182ff5d24e91f44730ce783"
+  }
 }

package/src/Kernel.ts

@@ -160,6 +160,7 @@ export default class Kernel extends EventEmitter {
     if (typeof pluginCtx.optsSchema !== 'function') {
       return
     }
+    this.debugger('checkPluginOpts', pluginCtx)
     const joi = require('joi')
     const schema = pluginCtx.optsSchema(joi)
     if (!joi.isSchema(schema)) {
@@ -173,6 +174,7 @@ export default class Kernel extends EventEmitter {
   }
 
   registerPlugin (plugin: IPlugin) {
+    this.debugger('registerPlugin', plugin)
     if (this.plugins.has(plugin.id)) {
       throw new Error(`插件 ${plugin.id} 已被注册`)
     }

package/src/utils/index.ts

@@ -1,5 +1,5 @@
 import { chalk, getModuleDefaultExport } from '@tarojs/helper'
-import { PluginItem } from '@tarojs/taro/types/compile'
+import type { PluginItem } from '@tarojs/taro/types/compile'
 import { merge } from 'lodash'
 import * as path from 'path'
 import * as resolve from 'resolve'
@@ -64,7 +64,12 @@ export function resolvePresetsOrPlugins (root: string, args, type: PluginType):
       type,
       opts: args[item] || {},
       apply () {
-        return getModuleDefaultExport(require(fPath))
+        try {
+          return getModuleDefaultExport(require(fPath))
+        } catch (error) {
+          console.error(error)
+          throw new Error(`插件依赖 "${item}" 加载失败，请检查插件配置`)
+        }
       }
     }
   })

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.