@dcloudio/uni-cli-shared 3.0.0-alpha-3060120220907001 → 3.0.0-alpha-3060120220907002

package/dist/env/provide.js

@@ -9,7 +9,7 @@ const libDir = path_1.default.resolve(__dirname, '../../lib');
 function initAppProvide() {
     const cryptoDefine = [path_1.default.join(libDir, 'crypto.js'), 'default'];
     return {
-        __f__: ['@dcloudio/uni-shared', 'formatAppLog'],
+        __f__: ['@dcloudio/uni-app', 'formatAppLog'],
         crypto: cryptoDefine,
         'window.crypto': cryptoDefine,
         'global.crypto': cryptoDefine,
@@ -20,7 +20,7 @@ function initAppProvide() {
 exports.initAppProvide = initAppProvide;
 function initH5Provide() {
     return {
-        __f__: ['@dcloudio/uni-shared', 'formatH5Log'],
+        __f__: ['@dcloudio/uni-app', 'formatH5Log'],
     };
 }
 exports.initH5Provide = initH5Provide;

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

@@ -201,13 +201,26 @@ function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
             case '[hash]':
                 return hash;
             case '[name]':
-                return name;
+                return sanitizeFileName(name);
         }
         throw new Error(`invalid placeholder ${placeholder} in assetFileNames "${assetFileNames}"`);
     });
     return fileName;
 }
 exports.assetFileNamesToFileName = assetFileNamesToFileName;
+// taken from https://github.com/rollup/rollup/blob/a8647dac0fe46c86183be8596ef7de25bc5b4e4b/src/utils/sanitizeFileName.ts
+// https://datatracker.ietf.org/doc/html/rfc2396
+// eslint-disable-next-line no-control-regex
+const INVALID_CHAR_REGEX = /[\x00-\x1F\x7F<>*#"{}|^[\]`;?:&=+$,]/g;
+const DRIVE_LETTER_REGEX = /^[a-z]:/i;
+function sanitizeFileName(name) {
+    const match = DRIVE_LETTER_REGEX.exec(name);
+    const driveLetter = match ? match[0] : '';
+    // A `:` is only allowed as part of a windows drive letter (ex: C:\foo)
+    // Otherwise, avoid them because they can refer to NTFS alternate data streams.
+    return (driveLetter +
+        name.substring(driveLetter.length).replace(INVALID_CHAR_REGEX, '_'));
+}
 /**
  * Register an asset to be emitted as part of the bundle (if necessary)
  * and returns the resolved public URL

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

@@ -305,6 +305,10 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         if (preprocessResult.errors.length) {
             throw preprocessResult.errors[0];
         }
+        // TODO 升级
+        // if (preprocessResult.error) {
+        //   throw preprocessResult.error
+        // }
         code = preprocessResult.code;
         preprocessorMap = combineSourcemapsIfExists(opts.filename, preprocessResult.map, preprocessResult.additionalMap);
         if (preprocessResult.deps) {
@@ -363,69 +367,81 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
             map: preprocessorMap,
         };
     }
-    // postcss is an unbundled dep and should be lazy imported
-    const postcssResult = await (await Promise.resolve().then(() => __importStar(require('postcss'))))
-        .default(postcssPlugins)
-        .process(code, {
-        ...postcssOptions,
-        to: id,
-        from: id,
-        ...(devSourcemap
-            ? {
-                map: {
-                    inline: false,
-                    annotation: false,
-                    // postcss may return virtual files
-                    // we cannot obtain content of them, so this needs to be enabled
-                    sourcesContent: true,
-                    // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
-                    // prev: preprocessorMap,
-                },
-            }
-            : {}),
-    });
-    // record CSS dependencies from @imports
-    for (const message of postcssResult.messages) {
-        if (message.type === 'dependency') {
-            deps.add((0, utils_1.normalizePath)(message.file));
-        }
-        else if (message.type === 'dir-dependency') {
-            // https://github.com/postcss/postcss/blob/main/docs/guidelines/plugin.md#3-dependencies
-            const { dir, glob: globPattern = '**' } = message;
-            const pattern = (0, utils_1.normalizePath)(path_1.default.resolve(path_1.default.dirname(id), dir)) + `/` + globPattern;
-            const files = fast_glob_1.default.sync(pattern, {
-                ignore: ['**/node_modules/**'],
-            });
-            for (let i = 0; i < files.length; i++) {
-                deps.add(files[i]);
+    let postcssResult;
+    try {
+        // postcss is an unbundled dep and should be lazy imported
+        postcssResult = await (await Promise.resolve().then(() => __importStar(require('postcss'))))
+            .default(postcssPlugins)
+            .process(code, {
+            ...postcssOptions,
+            to: id,
+            from: id,
+            ...(devSourcemap
+                ? {
+                    map: {
+                        inline: false,
+                        annotation: false,
+                        // postcss may return virtual files
+                        // we cannot obtain content of them, so this needs to be enabled
+                        sourcesContent: true,
+                        // when "prev: preprocessorMap", the result map may include duplicate filename in `postcssResult.map.sources`
+                        // prev: preprocessorMap,
+                    },
+                }
+                : {}),
+        });
+        // record CSS dependencies from @imports
+        for (const message of postcssResult.messages) {
+            if (message.type === 'dependency') {
+                deps.add((0, utils_1.normalizePath)(message.file));
             }
-            if (server) {
-                // register glob importers so we can trigger updates on file add/remove
-                if (!(id in server._globImporters)) {
+            else if (message.type === 'dir-dependency') {
+                // https://github.com/postcss/postcss/blob/main/docs/guidelines/plugin.md#3-dependencies
+                const { dir, glob: globPattern = '**' } = message;
+                const pattern = (0, utils_1.normalizePath)(path_1.default.resolve(path_1.default.dirname(id), dir)) + `/` + globPattern;
+                const files = fast_glob_1.default.sync(pattern, {
+                    ignore: ['**/node_modules/**'],
+                });
+                for (let i = 0; i < files.length; i++) {
+                    deps.add(files[i]);
+                }
+                if (server) {
+                    // register glob importers so we can trigger updates on file add/remove
+                    if (!(id in server._globImporters)) {
+                        ;
+                        server._globImporters[id] = {
+                            module: server.moduleGraph.getModuleById(id),
+                            importGlobs: [],
+                        };
+                    }
                     ;
-                    server._globImporters[id] = {
-                        module: server.moduleGraph.getModuleById(id),
-                        importGlobs: [],
-                    };
+                    server._globImporters[id].importGlobs.push({
+                        base: config.root,
+                        pattern,
+                    });
                 }
-                ;
-                server._globImporters[id].importGlobs.push({
-                    base: config.root,
-                    pattern,
-                });
             }
-        }
-        else if (message.type === 'warning') {
-            let msg = `[vite:css] ${message.text}`;
-            if (message.line && message.column) {
-                msg += `\n${(0, utils_1.generateCodeFrame)(code, {
-                    line: message.line,
-                    column: message.column,
-                })}`;
+            else if (message.type === 'warning') {
+                let msg = `[vite:css] ${message.text}`;
+                if (message.line && message.column) {
+                    msg += `\n${(0, utils_1.generateCodeFrame)(code, {
+                        line: message.line,
+                        column: message.column,
+                    })}`;
+                }
+                config.logger.warn(picocolors_1.default.yellow(msg));
             }
-            config.logger.warn(picocolors_1.default.yellow(msg));
         }
     }
+    catch (e) {
+        e.message = `[postcss] ${e.message}`;
+        e.code = code;
+        e.loc = {
+            column: e.column,
+            line: e.line,
+        };
+        throw e;
+    }
     if (!devSourcemap) {
         return {
             ast: postcssResult,

package/package.json

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