@dcloudio/uni-cli-shared 2.0.2-alpha-3090920231215002 → 2.0.2-alpha-4000020240123001

package/lib/file-loader.js

@@ -1,16 +1,35 @@
 const path = require('path')
+const webpack = require('webpack')
 const {
-  normalizeNodeModules
+  normalizePath
+  // normalizeNodeModules
 } = require('./util')
 
+let inputDir
+
 module.exports = {
   loader: 'file-loader',
   options: {
-    publicPath (url, resourcePath, context) {
-      return '/' + normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
-    },
-    outputPath (url, resourcePath, context) {
-      return normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    name (resourcePath, resourceQuery) {
+      if (!inputDir) {
+        inputDir = normalizePath(process.env.UNI_INPUT_DIR)
+      }
+      resourcePath = normalizePath(resourcePath)
+      if (resourcePath.startsWith(inputDir)) {
+        const relativePath = normalizePath(path.relative(inputDir,
+          resourcePath))
+        if (relativePath.startsWith('static/') || relativePath.includes(
+          '/static/')) {
+          return relativePath
+        }
+      }
+      return `assets/[name].[hash:8]${webpack.version[0] > 4 ? '' : '.'}[ext]`
     }
+    // publicPath (url, resourcePath, context) {
+    //   return '/' + normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    // },
+    // outputPath (url, resourcePath, context) {
+    //   return normalizeNodeModules(path.relative(process.env.UNI_INPUT_DIR, resourcePath))
+    // }
   }
-}
+}

package/lib/pages.js

@@ -122,7 +122,15 @@ function isValidPage (page, root = '') {
   let pagePath = page.path
 
   if (pagePath.indexOf('platforms') === 0) { // 平台相关
-    if (pagePath.indexOf('platforms/' + process.env.UNI_PLATFORM) === -1) { // 非本平台
+    if (process.env.UNI_PLATFORM === 'h5' || process.env.UNI_PLATFORM === 'web') {
+      if (!(pagePath.indexOf('platforms/h5/') === 0 || pagePath.indexOf('platforms/web/') === 0)) {
+        return false
+      }
+    } else if (process.env.UNI_PLATFORM === 'app-plus' || process.env.UNI_PLATFORM === 'app') {
+      if (!(pagePath.indexOf('platforms/app-plus/') === 0 || pagePath.indexOf('platforms/app/') === 0)) {
+        return false
+      }
+    } else if (pagePath.indexOf('platforms/' + process.env.UNI_PLATFORM) === -1) { // 非本平台
       return false
     }
   }
@@ -578,4 +586,4 @@ module.exports = {
   getGlobalUsingComponentsCode,
   parseUsingAutoImportComponents,
   generateGlobalUsingComponentsCode
-}
+}

package/lib/url-loader.js

@@ -35,8 +35,11 @@ module.exports = {
   loader: 'url-loader',
   options () {
     if (process.env.UNI_PLATFORM === 'h5') {
-      // h5平台，不对 url-loader 作调整，默认limit:4096，也不修改file-loader输出路径
-      return {}
+      // h5平台，不对 url-loader 作调整，默认limit:4096，也不修改file-loader输出路径（已做处理）
+      return {
+        ...defaultOptions,
+        limit: 4096
+      }
     }
     if (inlineLimit) {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-alpha-3090920231215002",
+  "version": "2.0.2-alpha-4000020240123001",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -26,5 +26,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "48538d042d5d603a803f2742470514d0b76cf549"
+  "gitHead": "d3e5090a12b549e5bbb505d652ebd7af1a7b6ac8"
 }