@dcloudio/uni-cli-shared 2.0.1-alpha-36720221018002 → 2.0.1-alpha-36820221027001

package/components/ad.mixin.mp.js

@@ -111,8 +111,7 @@ export default {
     },
 
     _hasCallback () {
-      return false
-      // return (typeof this.urlCallback === 'object' && Object.keys(this.urlCallback).length > 0)
+      return (typeof this.urlCallback === 'object' && Object.keys(this.urlCallback).length > 0)
     },
 
     _onmpload (e) {

package/lib/index.js

@@ -63,7 +63,10 @@ const {
   getPlatformUniCloud
 } = require('./platform')
 
+const uts = require('./uts')
+
 module.exports = {
+  uts,
   md5,
   tags,
   hasOwn,

package/lib/uni_modules/uni_modules.js

@@ -25,10 +25,7 @@ function parseUniExtApis(vite = true) {
         }
         const exports = (_b = (_a = JSON.parse(fs_extra_1.default.readFileSync(pkgPath, 'utf8'))) === null || _a === void 0 ? void 0 : _a.uni_modules) === null || _b === void 0 ? void 0 : _b['uni-ext-api'];
         if (exports) {
-            Object.assign(injects, parseInjects(vite, process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}` +
-                (vite || !process.env.UNI_UTS_PLATFORM
-                    ? ''
-                    : `/utssdk/${process.env.UNI_UTS_PLATFORM}/index`), exports));
+            Object.assign(injects, parseInjects(vite, process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, `@/uni_modules/${uniModuleDir}`, exports));
         }
     });
     return injects;

package/lib/uts/hbx.js

@@ -0,0 +1,8 @@
+const {
+  isInHBuilderX
+} = require('../util')
+module.exports = {
+  isInHBuilderX () {
+    return isInHBuilderX
+  }
+}

package/lib/uts/index.js

@@ -0,0 +1,5 @@
+const UTSResolverPlugin = require('./resolver')
+const uts = require('./uts')
+module.exports = Object.assign({
+  UTSResolverPlugin
+}, uts)

package/lib/uts/resolver.js

@@ -0,0 +1,29 @@
+const path = require('path')
+const {
+  resolveUtsModule
+} = require('./uts')
+class UTSResolverPlugin {
+  apply (resolver) {
+    resolver.hooks.resolve.tapAsync('UTSResolverPlugin', (request, resolveContext, callback) => {
+      let utsModulePath = ''
+      if (request.request.startsWith('@/uni_modules/')) {
+        utsModulePath = path.resolve(process.env.UNI_INPUT_DIR, request.request.replace('@/', ''))
+      } else if (request.request.includes('uni_modules')) {
+        utsModulePath = path.resolve(request.path, request.request)
+      }
+      if (utsModulePath) {
+        const utsModule = resolveUtsModule(utsModulePath)
+        if (utsModule) {
+          if (process.env.UNI_PLATFORM === 'app-plus') {
+            request.request = utsModule + '/package.json?uts-proxy'
+          } else {
+            request.request = utsModule
+          }
+        }
+      }
+      callback()
+    })
+  }
+}
+
+module.exports = UTSResolverPlugin

package/lib/uts/utils.js

@@ -0,0 +1,6 @@
+const {
+  normalizePath
+} = require('../util')
+module.exports = {
+  normalizePath
+}

package/lib/uts/uts-loader.js

@@ -0,0 +1,19 @@
+const path = require('path')
+const {
+  resolveUTSCompiler
+} = require('./uts')
+module.exports = function (content) {
+  const callback = this.async()
+  resolveUTSCompiler().compile(path.dirname(this.resourcePath)).then(result => {
+    if (result) {
+      result.deps.forEach((dep) => {
+        this.addDependency(dep)
+      })
+      callback(null, result.code)
+    } else {
+      callback(null, '')
+    }
+  }).catch(err => {
+    callback(err)
+  })
+}

package/lib/uts/uts.js

@@ -0,0 +1,97 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveUTSCompiler = exports.resolveUtsModule = exports.resolveUtsAppModule = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const hbx_1 = require("./hbx");
+const utils_1 = require("./utils");
+/**
+ * 解析 app 平台的 uts 插件，任意平台（android|ios）存在即可
+ * @param id
+ * @param importer
+ * @returns
+ */
+function resolveUtsAppModule(id, importer) {
+    id = path_1.default.resolve(importer, id);
+    if (id.includes('utssdk') || id.includes('uni_modules')) {
+        const parts = (0, utils_1.normalizePath)(id).split('/');
+        const parentDir = parts[parts.length - 2];
+        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+            const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
+            if (fs_1.default.existsSync(path_1.default.resolve(id, basedir, 'index.uts'))) {
+                return id;
+            }
+            const resolvePlatformDir = (p) => {
+                return path_1.default.resolve(id, basedir, p);
+            };
+            const extname = ['.uts'];
+            if (resolveUtsFile(resolvePlatformDir('app-android'), extname)) {
+                return id;
+            }
+            if (resolveUtsFile(resolvePlatformDir('app-ios'), extname)) {
+                return id;
+            }
+        }
+    }
+}
+exports.resolveUtsAppModule = resolveUtsAppModule;
+// 仅限 root/uni_modules/test-plugin | root/utssdk/test-plugin 格式
+function resolveUtsModule(id, importer) {
+    if (process.env.UNI_PLATFORM === 'app' ||
+        process.env.UNI_PLATFORM === 'app-plus') {
+        return resolveUtsAppModule(id, importer);
+    }
+    id = path_1.default.resolve(importer, id);
+    if (id.includes('utssdk') || id.includes('uni_modules')) {
+        const parts = (0, utils_1.normalizePath)(id).split('/');
+        const parentDir = parts[parts.length - 2];
+        if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
+            const basedir = parentDir === 'uni_modules' ? 'utssdk' : '';
+            const resolvePlatformDir = (p) => {
+                return path_1.default.resolve(id, basedir, p);
+            };
+            let index = resolveUtsFile(resolvePlatformDir(process.env.UNI_UTS_PLATFORM));
+            if (index) {
+                return index;
+            }
+            index = path_1.default.resolve(id, basedir, 'index.uts');
+            if (fs_1.default.existsSync(index)) {
+                return index;
+            }
+        }
+    }
+}
+exports.resolveUtsModule = resolveUtsModule;
+function resolveUtsFile(dir, extensions = ['.uts', '.ts', '.js']) {
+    for (let i = 0; i < extensions.length; i++) {
+        const indexFile = path_1.default.join(dir, 'index' + extensions[i]);
+        if (fs_1.default.existsSync(indexFile)) {
+            return indexFile;
+        }
+    }
+}
+function resolveUTSCompiler() {
+    let compilerPath = '';
+    if ((0, hbx_1.isInHBuilderX)()) {
+        try {
+            compilerPath = require.resolve(path_1.default.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'uniapp-uts-v1'));
+        }
+        catch (e) { }
+    }
+    if (!compilerPath) {
+        try {
+            compilerPath = require.resolve('@dcloudio/uni-uts-v1', {
+                paths: [process.env.UNI_CLI_CONTEXT],
+            });
+        }
+        catch (e) { }
+    }
+    if (!compilerPath) {
+        throw 'uts compiler is not found';
+    }
+    return require(compilerPath);
+}
+exports.resolveUTSCompiler = resolveUTSCompiler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.1-alpha-36720221018002",
+  "version": "2.0.1-alpha-36820221027001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -25,5 +25,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "595dafce3471cb9a16766b6b6feaccf752481dc3"
+  "gitHead": "40924371d61653884f7ca66ee0b301fef31bd59d"
 }