@dcloudio/uni-cli-shared 2.0.2-3080720230630001 → 2.0.2-3081220230814001

package/lib/manifest.js

@@ -158,6 +158,14 @@ function isUniPushOffline (manifestJson) {
   return unipush && unipush.offline === true
 }
 
+function hasPushModule (manifestJson) {
+  if (!manifestJson) {
+    manifestJson = getManifestJson()
+  }
+  const platformOptions = manifestJson['app-plus']
+  return platformOptions && platformOptions.modules && platformOptions.modules.Push
+}
+
 module.exports = {
   getManifestJson,
   parseManifestJson,
@@ -166,5 +174,6 @@ module.exports = {
   isEnableUniPushV1,
   isEnableUniPushV2,
   isUniPushOffline,
+  hasPushModule,
   isEnableSecureNetwork
 }

package/lib/platform.js

@@ -168,8 +168,14 @@ module.exports = {
       : 'import \'@dcloudio/uni-stat/dist/uni-stat.es.js\';'
   },
   getPlatformPush () {
-    if (process.env.UNI_PUSH_V2_OFFLINE || process.env.UNI_PUSH_V1) {
-      return ';import \'@dcloudio/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js\';'
+    if (process.env.UNI_PUSH_V1) {
+      if (process.env.UNI_PUSH_MODULE) {
+        return ';import \'@dcloudio/vue-cli-plugin-uni/packages/uni-push/dist/uni-push-v1.plus.es.js\';'
+      }
+    } else if (process.env.UNI_PUSH_V2_OFFLINE) {
+      if (process.env.UNI_PUSH_MODULE) {
+        return ';import \'@dcloudio/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js\';'
+      }
     } else if (process.env.UNI_PUSH_V2) {
       return ';import \'@dcloudio/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.es.js\';'
     }
@@ -199,4 +205,4 @@ module.exports = {
       ]
     }
   }
-}
+}

package/lib/uni_modules/uni_modules.js

@@ -7,6 +7,9 @@ exports.parseInjects = exports.parseUniExtApis = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 function parseUniExtApis(vite = true, platform, language = 'javascript') {
+    if (!process.env.UNI_INPUT_DIR) {
+        return {};
+    }
     const uniModulesDir = path_1.default.resolve(process.env.UNI_INPUT_DIR, 'uni_modules');
     if (!fs_extra_1.default.existsSync(uniModulesDir)) {
         return {};
@@ -23,8 +26,11 @@ function parseUniExtApis(vite = true, platform, language = 'javascript') {
             return;
         }
         try {
-            const exports = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))
-                ?.uni_modules?.['uni-ext-api'];
+            let exports;
+            const pkg = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'));
+            if (pkg && pkg.uni_modules && pkg.uni_modules['uni-ext-api']) {
+                exports = pkg.uni_modules['uni-ext-api'];
+            }
             if (exports) {
                 const curInjects = parseInjects(vite, platform, language, `@/uni_modules/${uniModuleDir}`, uniModuleRootDir, exports);
                 Object.assign(injects, curInjects);
@@ -98,7 +104,9 @@ function parseInject(vite = true, platform, language, source, globalObject, defi
         const keys = Object.keys(define);
         keys.forEach((d) => {
             if (typeof define[d] === 'string') {
-                injects[globalObject + '.' + d] = [source, define[d]];
+                if (hasPlatformFile) {
+                    injects[globalObject + '.' + d] = [source, define[d]];
+                }
             }
             else {
                 const defineOptions = define[d];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-3080720230630001",
+  "version": "2.0.2-3081220230814001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -26,5 +26,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "3270825d23dfede1b8534dbfb60e4246e98f6edc"
+  "gitHead": "d5467845de45fc9e954d6b6ad269ea831773e15c"
 }