@dcloudio/uni-cli-shared 2.0.2-alpha-3061420221216003 → 2.0.2-alpha-3061520221222001

package/lib/index.js

@@ -32,7 +32,9 @@ const {
   normalizePath,
   getComponentName,
   convertStaticStyle,
-  getTemplatePath
+  getTemplatePath,
+  createSource,
+  deleteAsset
 } = require('./util')
 
 const {
@@ -108,6 +110,8 @@ module.exports = {
   getComponentName,
   convertStaticStyle,
   getTemplatePath,
+  createSource,
+  deleteAsset,
   jsPreprocessOptions,
   cssPreprocessOptions,
   htmlPreprocessOptions,

package/lib/pages.js

@@ -425,6 +425,16 @@ function initAutoComponents () {
 
 function initAutoImportScanComponents () {
   const components = initAutoComponents()
+
+  const {
+    initUTSComponents
+  } = require('./uts/uts.js')
+
+  initUTSComponents(process.env.UNI_INPUT_DIR, process.env.UNI_PLATFORM).forEach((item) => {
+    components[item.pattern.source] = item.replacement.replace('\0', '').replace('?uts-proxy',
+      '/package.json?uts-proxy')
+  })
+
   if (process.env.UNI_PLATFORM === 'quickapp-native') {
     if (!uniQuickAppAutoImportScanComponents) {
       uniQuickAppAutoImportScanComponents = getAutoComponentsByDir(
@@ -463,8 +473,7 @@ function initAutoImportComponents (easycom = {}) {
   }
   initBuiltInEasycom(BUILT_IN_EASYCOMS, usingAutoImportComponents)
   // 目前仅 mp-weixin 内置支持 page-meta 等组件
-  if (process.env.UNI_PLATFORM === 'mp-weixin') {
-  } else if (process.env.UNI_PLATFORM === 'mp-alipay') {
+  if (process.env.UNI_PLATFORM === 'mp-weixin') {} else if (process.env.UNI_PLATFORM === 'mp-alipay') {
     initBuiltInEasycom(BUILT_IN_COMPONENTS_ALIPAY, usingAutoImportComponents)
   } else {
     initBuiltInEasycom(BUILT_IN_COMPONENTS, usingAutoImportComponents)

package/lib/util.js

@@ -4,6 +4,7 @@ const hash = require('hash-sum')
 const crypto = require('crypto')
 const escapeStringRegexp = require('escape-string-regexp')
 const escapeGlob = require('glob-escape')
+const webpack = require('webpack')
 
 const isWin = /^win/.test(process.platform)
 
@@ -159,6 +160,25 @@ function isNormalPage (pagePath) {
   return !pagePath.startsWith('ext://')
 }
 
+function createSource (content) {
+  return webpack.version[0] > 4 ? new webpack.sources.RawSource(content) : {
+    size () {
+      return Buffer.byteLength(content, 'utf8')
+    },
+    source () {
+      return content
+    }
+  }
+}
+
+function deleteAsset (compilation, name) {
+  if ('deleteAsset' in compilation) {
+    compilation.deleteAsset(name)
+  } else {
+    delete compilation.assets[name]
+  }
+}
+
 module.exports = {
   isNormalPage,
   isInHBuilderX,
@@ -198,5 +218,7 @@ module.exports = {
   }),
   getTemplatePath () {
     return path.join(__dirname, '../template')
-  }
+  },
+  createSource,
+  deleteAsset
 }

package/lib/uts/uts.js

@@ -3,9 +3,10 @@ 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;
+exports.initUTSComponents = exports.resolveUTSCompiler = exports.resolveUtsModule = exports.resolveUtsAppModule = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const fast_glob_1 = __importDefault(require("fast-glob"));
 const hbx_1 = require("./hbx");
 const utils_1 = require("./utils");
 /**
@@ -99,3 +100,65 @@ function resolveUTSCompiler() {
     return require(compilerPath);
 }
 exports.resolveUTSCompiler = resolveUTSCompiler;
+function initUTSComponents(inputDir, platform) {
+    const components = [];
+    if (platform !== 'app' && platform !== 'app-plus') {
+        return components;
+    }
+    const easycomsObj = Object.create(null);
+    const dirs = resolveUTSComponentDirs(inputDir);
+    dirs.forEach((dir) => {
+        const is_uni_modules_utssdk = dir.endsWith('utssdk');
+        const is_ussdk = !is_uni_modules_utssdk && path_1.default.dirname(dir).endsWith('utssdk');
+        if (is_uni_modules_utssdk || is_ussdk) {
+            fast_glob_1.default
+                .sync('**/*.vue', {
+                cwd: dir,
+                absolute: true,
+            })
+                .forEach((file) => {
+                let name = parseVueComponentName(file);
+                if (!name) {
+                    if (file.endsWith('index.vue')) {
+                        name = path_1.default.basename(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
+                    }
+                }
+                if (name) {
+                    const importDir = (0, utils_1.normalizePath)(is_uni_modules_utssdk ? path_1.default.dirname(dir) : dir);
+                    easycomsObj[`^${name}$`] = `\0${importDir}?uts-proxy`;
+                }
+            });
+        }
+    });
+    Object.keys(easycomsObj).forEach((name) => {
+        components.push({
+            pattern: new RegExp(name),
+            replacement: easycomsObj[name],
+        });
+    });
+    return components;
+}
+exports.initUTSComponents = initUTSComponents;
+function resolveUTSComponentDirs(inputDir) {
+    const utssdkDir = path_1.default.resolve(inputDir, 'utssdk');
+    const uniModulesDir = path_1.default.resolve(inputDir, 'uni_modules');
+    return fast_glob_1.default
+        .sync('*', {
+        cwd: utssdkDir,
+        absolute: true,
+        onlyDirectories: true,
+    })
+        .concat(fast_glob_1.default.sync('*/utssdk', {
+        cwd: uniModulesDir,
+        absolute: true,
+        onlyDirectories: true,
+    }));
+}
+const nameRE = /name\s*:\s*['|"](.*)['|"]/;
+function parseVueComponentName(file) {
+    const content = fs_1.default.readFileSync(file, 'utf8');
+    const matches = content.match(nameRE);
+    if (matches) {
+        return matches[1];
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-alpha-3061420221216003",
+  "version": "2.0.2-alpha-3061520221222001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -20,10 +20,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "escape-string-regexp": "^4.0.0",
+    "fast-glob": "^3.2.11",
     "glob-escape": "^0.0.2",
     "hash-sum": "^1.0.2",
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "d5a8bd175373e9e5daef8846ae15c439a16b5c38"
+  "gitHead": "dcc8aea3aeeef17980166d128ca3788a758670e1"
 }