@dcloudio/uni-cli-shared 3.0.0-alpha-3060420220922002 → 3.0.0-alpha-3060420220922004

package/dist/mp/usingComponents.d.ts

@@ -38,6 +38,7 @@ interface ParseDescriptor {
     isExternal: boolean;
 }
 export interface ScriptDescriptor extends TemplateDescriptor {
+    setupBindingComponents: BindingComponents;
 }
 /**
  * 解析 script

package/dist/mp/usingComponents.js

@@ -117,7 +117,10 @@ function updateMiniProgramComponentsByMainFilename(mainFilename, inputDir, norma
     if (!scriptDescriptor) {
         return;
     }
-    const bindingComponents = parseBindingComponents(templateDescriptor.bindingComponents, scriptDescriptor.bindingComponents);
+    const bindingComponents = parseBindingComponents({
+        ...templateDescriptor.bindingComponents,
+        ...scriptDescriptor.setupBindingComponents,
+    }, scriptDescriptor.bindingComponents);
     const imports = parseImports(mainDescriptor.imports, scriptDescriptor.imports, templateDescriptor.imports);
     (0, jsonFile_1.addMiniProgramUsingComponents)((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(mainFilename, inputDir)), createUsingComponents(bindingComponents, imports, inputDir, normalizeComponentName));
 }
@@ -203,6 +206,7 @@ async function parseScriptDescriptor(filename, ast, options) {
         : [];
     const descriptor = {
         bindingComponents: parseComponents(ast),
+        setupBindingComponents: findBindingComponents(ast.body),
         imports,
     };
     scriptDescriptors.set(filename, descriptor);

package/dist/resolve.js

@@ -116,11 +116,12 @@ function resolveUtsAppModule(id, importer) {
         const parts = (0, utils_1.normalizePath)(id).split('/');
         const parentDir = parts[parts.length - 2];
         if (parentDir === 'uni_modules' || parentDir === 'utssdk') {
-            if (fs_1.default.existsSync(path_1.default.resolve(id, 'index.uts'))) {
+            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, parentDir === 'uni_modules' ? 'utssdk' : '', p);
+                return path_1.default.resolve(id, basedir, p);
             };
             const extname = ['.uts'];
             if (resolveUtsFile(resolvePlatformDir('app-android'), extname)) {
@@ -150,14 +151,15 @@ function resolveUtsModule(id, importer, platform) {
         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, parentDir === 'uni_modules' ? 'utssdk' : '', p);
+                return path_1.default.resolve(id, basedir, p);
             };
             let index = resolveUtsFile(resolvePlatformDir(platform));
             if (index) {
                 return index;
             }
-            index = path_1.default.resolve(id, 'index.uts');
+            index = path_1.default.resolve(id, basedir, 'index.uts');
             if (fs_1.default.existsSync(index)) {
                 return index;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3060420220922002",
+  "version": "3.0.0-alpha-3060420220922004",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
     "@babel/core": "^7.18.13",
     "@babel/parser": "^7.18.13",
     "@babel/types": "^7.17.0",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3060420220922002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3060420220922002",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3060420220922004",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3060420220922004",
     "@intlify/core-base": "9.1.9",
     "@intlify/shared": "9.1.9",
     "@intlify/vue-devtools": "9.1.9",