@dcloudio/uni-cli-shared 3.0.0-alpha-3030820220114009 → 3.0.0-alpha-3031120220221001

package/dist/constants.d.ts

@@ -7,6 +7,12 @@ export declare const EXTNAME_VUE_RE: RegExp;
 export declare const EXTNAME_JS_RE: RegExp;
 export declare const EXTNAME_TS_RE: RegExp;
 export declare const extensions: string[];
+export declare const PAGES_JSON_JS = "pages-json-js";
+export declare const MANIFEST_JSON_JS = "manifest-json-js";
+export declare const JSON_JS_MAP: {
+    readonly 'pages.json': "pages-json-js";
+    readonly 'manifest.json': "manifest-json-js";
+};
 export declare const ASSETS_INLINE_LIMIT: number;
 export declare const APP_SERVICE_FILENAME = "app-service.js";
 export declare const BINDING_COMPONENTS = "__BINDING_COMPONENTS__";

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
+exports.COMMON_EXCLUDE = exports.BASE_COMPONENTS_STYLE_PATH = exports.H5_COMPONENTS_STYLE_PATH = exports.H5_FRAMEWORK_STYLE_PATH = exports.H5_API_STYLE_PATH = exports.PAGE_EXTNAME = exports.PAGE_EXTNAME_APP = exports.BINDING_COMPONENTS = exports.APP_SERVICE_FILENAME = exports.ASSETS_INLINE_LIMIT = exports.JSON_JS_MAP = exports.MANIFEST_JSON_JS = exports.PAGES_JSON_JS = exports.extensions = exports.EXTNAME_TS_RE = exports.EXTNAME_JS_RE = exports.EXTNAME_VUE_RE = exports.EXTNAME_VUE_TEMPLATE = exports.EXTNAME_VUE = exports.EXTNAME_TS = exports.EXTNAME_JS = exports.PUBLIC_DIR = void 0;
 exports.PUBLIC_DIR = 'static';
 exports.EXTNAME_JS = ['.js', '.ts', '.jsx', '.tsx'];
 exports.EXTNAME_TS = ['.ts', '.tsx'];
@@ -17,6 +17,12 @@ exports.extensions = [
     '.tsx',
     '.json',
 ].concat(exports.EXTNAME_VUE);
+exports.PAGES_JSON_JS = 'pages-json-js';
+exports.MANIFEST_JSON_JS = 'manifest-json-js';
+exports.JSON_JS_MAP = {
+    'pages.json': exports.PAGES_JSON_JS,
+    'manifest.json': exports.MANIFEST_JSON_JS,
+};
 exports.ASSETS_INLINE_LIMIT = 40 * 1024;
 exports.APP_SERVICE_FILENAME = 'app-service.js';
 exports.BINDING_COMPONENTS = '__BINDING_COMPONENTS__';

package/dist/json/mp/jsonFile.d.ts

@@ -16,8 +16,12 @@ export declare function isMiniProgramUsingComponent(name: string, options: {
     inputDir: string;
     componentsDir?: string;
 }): boolean;
+interface MiniProgramComponents {
+    [name: string]: 'plugin' | 'component';
+}
 export declare function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }: {
     filename: string;
     inputDir: string;
     componentsDir?: string;
-}): string[];
+}): MiniProgramComponents;
+export {};

package/dist/json/mp/jsonFile.js

@@ -103,28 +103,31 @@ function addMiniProgramUsingComponents(filename, json) {
 }
 exports.addMiniProgramUsingComponents = addMiniProgramUsingComponents;
 function isMiniProgramUsingComponent(name, options) {
-    return findMiniProgramUsingComponents(options).includes(name);
+    return !!findMiniProgramUsingComponents(options)[name];
 }
 exports.isMiniProgramUsingComponent = isMiniProgramUsingComponent;
 function findMiniProgramUsingComponents({ filename, inputDir, componentsDir, }) {
-    if (!componentsDir) {
-        return [];
-    }
     const globalUsingComponents = appJsonCache && appJsonCache.usingComponents;
-    const miniProgramComponents = [];
+    const miniProgramComponents = {};
     if (globalUsingComponents) {
-        miniProgramComponents.push(...findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
+        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(globalUsingComponents, componentsDir));
     }
     const jsonFile = findJsonFile((0, utils_1.removeExt)((0, utils_1.normalizeMiniProgramFilename)(filename, inputDir)));
     if (jsonFile === null || jsonFile === void 0 ? void 0 : jsonFile.usingComponents) {
-        miniProgramComponents.push(...findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
+        (0, shared_1.extend)(miniProgramComponents, findMiniProgramUsingComponent(jsonFile.usingComponents, componentsDir));
     }
     return miniProgramComponents;
 }
 exports.findMiniProgramUsingComponents = findMiniProgramUsingComponents;
 function findMiniProgramUsingComponent(usingComponents, componentsDir) {
-    return Object.keys(usingComponents).filter((name) => {
+    return Object.keys(usingComponents).reduce((res, name) => {
         const path = usingComponents[name];
-        return path.includes(componentsDir + '/');
-    });
+        if (componentsDir && path.includes(componentsDir + '/')) {
+            res[name] = 'component';
+        }
+        else if (path.includes('plugin://')) {
+            res[name] = 'plugin';
+        }
+        return res;
+    }, {});
 }

package/dist/vite/plugins/jsonJs.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineUniManifestJsonPlugin = exports.defineUniPagesJsonPlugin = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 exports.defineUniPagesJsonPlugin = createDefineJsonJsPlugin('pages.json');
 exports.defineUniManifestJsonPlugin = createDefineJsonJsPlugin('manifest.json');
 function createDefineJsonJsPlugin(name) {
-    const JSON_JS = name + '.js';
+    const JSON_JS = constants_1.JSON_JS_MAP[name];
     return function (createVitePlugin) {
         const opts = {
             resolvedConfig: {},
@@ -23,18 +24,20 @@ function createDefineJsonJsPlugin(name) {
         const origResolveId = plugin.resolveId;
         const origConfigResolved = plugin.configResolved;
         let jsonPath = '';
+        let jsonJsPath = '';
         plugin.resolveId = function (id, importer, options) {
             const res = origResolveId && origResolveId.call(this, id, importer, options);
             if (res) {
                 return res;
             }
             if (id.endsWith(JSON_JS)) {
-                return jsonPath + '.js';
+                return jsonJsPath;
             }
         };
         plugin.configResolved = function (config) {
             opts.resolvedConfig = config;
             jsonPath = (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, name));
+            jsonJsPath = (0, utils_1.normalizePath)(path_1.default.join(process.env.UNI_INPUT_DIR, JSON_JS));
             return origConfigResolved && origConfigResolved(config);
         };
         plugin.load = function (id, ssr) {

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -33,6 +33,7 @@ const utils_1 = require("../utils");
 const asset_1 = require("./asset");
 const esbuild_1 = require("esbuild");
 const preprocess_1 = require("../../../../preprocess");
+const constants_1 = require("../../../../constants");
 const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`;
 exports.cssLangRE = new RegExp(cssLangs);
 const cssModuleRE = new RegExp(`\\.module${cssLangs}`);
@@ -114,7 +115,7 @@ function findCssModuleIds(moduleId, cssModuleIds, seen) {
     const moduleInfo = this.getModuleInfo(moduleId);
     if (moduleInfo) {
         moduleInfo.importedIds.forEach((id) => {
-            if (id.includes('pages.json.js')) {
+            if (id.includes(constants_1.PAGES_JSON_JS)) {
                 // 查询main.js时，需要忽略pages.json.js，否则会把所有页面样式加进来
                 return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3030820220114009",
+  "version": "3.0.0-alpha-3031120220221001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,17 +18,17 @@
     "url": "https://github.com/dcloudio/uni-app/issues"
   },
   "dependencies": {
-    "@babel/core": "^7.16.12",
-    "@babel/parser": "^7.16.12",
+    "@babel/core": "^7.17.2",
+    "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.8",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3030820220114009",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3030820220114009",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3031120220221001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3031120220221001",
     "@rollup/pluginutils": "^4.1.2",
-    "@vue/compiler-core": "3.2.30",
-    "@vue/compiler-dom": "3.2.30",
-    "@vue/compiler-sfc": "3.2.30",
-    "@vue/server-renderer": "3.2.30",
-    "@vue/shared": "3.2.30",
+    "@vue/compiler-core": "3.2.31",
+    "@vue/compiler-dom": "3.2.31",
+    "@vue/compiler-sfc": "3.2.31",
+    "@vue/server-renderer": "3.2.31",
+    "@vue/shared": "3.2.31",
     "autoprefixer": "^10.4.2",
     "base64url": "^3.0.1",
     "chokidar": "^3.5.3",
@@ -63,6 +63,6 @@
     "@types/mime": "^2.0.3",
     "@types/module-alias": "^2.0.1",
     "@types/stylus": "^0.48.36",
-    "postcss": "^8.4.5"
+    "postcss": "^8.4.6"
   }
 }