@dcloudio/uni-push 0.0.1-nvue3.3040020220228001 → 3.0.0-3060520221121001

package/lib/uni.plugin.js

@@ -1,18 +1,16 @@
 'use strict';
 
 var path = require('path');
-var debug = require('debug');
 var uniCliShared = require('@dcloudio/uni-cli-shared');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug);
 
-const debugPush = debug__default["default"]('uni:push');
 var index = () => [
     uniCliShared.defineUniMainJsPlugin((opts) => {
-        let isEnable = false;
+        let isEnableV1 = false;
+        let isEnableV2 = false;
         let isOffline = false;
         return {
             name: 'uni:push',
@@ -23,36 +21,40 @@ var index = () => [
                 }
                 const inputDir = process.env.UNI_INPUT_DIR;
                 const platform = process.env.UNI_PLATFORM;
-                isOffline = platform === 'app' && uniCliShared.isUniPushOffline(inputDir);
-                if (isOffline) {
-                    isEnable = true;
+                isEnableV1 = uniCliShared.isEnableUniPushV1(inputDir, platform);
+                isEnableV2 = uniCliShared.isEnableUniPushV2(inputDir, platform);
+                // v1
+                if (isEnableV1) {
+                    return;
+                }
+                if (!isEnableV2) {
                     return;
                 }
-                const { appid, enable, debug } = uniCliShared.getUniPush(inputDir, platform);
-                isEnable = appid && enable === true;
-                if (!isEnable) {
+                // v2
+                isOffline = platform === 'app' && uniCliShared.isUniPushOffline(inputDir);
+                if (isOffline) {
                     return;
                 }
-                debugPush('appid', appid, 'deubg', debug);
                 return {
                     define: {
-                        'process.env.UNI_PUSH_APP_ID': JSON.stringify(appid),
-                        'process.env.UNI_PUSH_DEBUG': !!debug,
+                        'process.env.UNI_PUSH_DEBUG': false,
                     },
                 };
             },
             resolveId(id) {
                 if (id === '@dcloudio/uni-push') {
-                    return uniCliShared.resolveBuiltIn(path__default["default"].join('@dcloudio/uni-push', isOffline ? 'dist/uni-push.plus.es.js' : 'dist/uni-push.es.js'));
+                    return uniCliShared.resolveBuiltIn(path__default["default"].join('@dcloudio/uni-push', isOffline || isEnableV1
+                        ? 'dist/uni-push.plus.es.js'
+                        : 'dist/uni-push.es.js'));
                 }
             },
             transform(code, id) {
                 if (!opts.filter(id)) {
                     return;
                 }
-                if (isEnable) {
+                if (isEnableV1 || isEnableV2) {
                     return {
-                        code: code + `;import '@dcloudio/uni-push';`,
+                        code: `import '@dcloudio/uni-push';` + code,
                         map: null,
                     };
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-push",
-  "version": "0.0.1-nvue3.3040020220228001",
+  "version": "3.0.0-3060520221121001",
   "description": "@dcloudio/uni-push",
   "main": "lib/uni-push.js",
   "module": "lib/uni-push.js",
@@ -20,10 +20,6 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
-    "@dcloudio/uni-cli-shared": "0.0.1-nvue3.3040020220228001",
-    "debug": "^4.3.3"
-  },
-  "devDependencies": {
-    "@types/debug": "^4.1.7"
+    "@dcloudio/uni-cli-shared": "3.0.0-3060520221121001"
   }
 }