@shuvi/toolpack 1.0.51 → 1.0.53

package/lib/webpack/config/base.js

@@ -189,11 +189,25 @@ function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot,
         .oneOf('media')
         .exclude.merge([/\.(tsx|ts|js|cjs|mjs|jsx)$/, /\.html$/, /\.json$/])
         .end()
-        .use('file-loader')
-        .loader(require.resolve('file-loader'))
-        .options({
-        name: 'static/media/[name].[hash:8].[ext]'
+        // @ts-ignore
+        .type('asset/resource')
+        .set('generator', {
+        filename: (pathData) => {
+            // Check if a string is a base64 data URI
+            if (pathData.filename && isValidBase64DataURL(pathData.filename)) {
+                // Handle base64 string case, [name] is empty
+                return `static/media/base64.[hash:8][ext]`;
+            }
+            else {
+                return `static/media/[name].[hash:8][ext]`;
+            }
+        }
     });
+    // .use('file-loader')
+    // .loader(require.resolve('file-loader'))
+    // .options({
+    //   name: 'static/media/[name].[hash:8].[ext]'
+    // });
     config.plugin('private/ignore-plugin').use(webpack_1.default.IgnorePlugin, [
         {
             resourceRegExp: /^\.\/locale$/,
@@ -255,3 +269,24 @@ function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot,
     return config;
 }
 exports.baseWebpackChain = baseWebpackChain;
+function isValidBase64DataURL(input) {
+    // Check if input starts with the data URI scheme
+    if (!input.startsWith('data:')) {
+        return false;
+    }
+    // Split the data URI into metadata and data parts
+    const parts = input.split(',');
+    if (parts.length !== 2) {
+        return false;
+    }
+    const metadata = parts[0];
+    const data = parts[1];
+    // Check if the metadata contains 'base64'
+    if (!metadata.includes('base64')) {
+        return false;
+    }
+    // Regular expression to validate Base64 string
+    const base64Regex = /^[A-Za-z0-9+/]+[=]{0,2}$/;
+    // Validate Base64 data
+    return base64Regex.test(data);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.51",
+    "@shuvi/compiler": "1.0.53",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -35,8 +35,8 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
     "lightningcss": "1.19.0",
-    "@shuvi/shared": "1.0.51",
-    "@shuvi/utils": "1.0.51",
+    "@shuvi/shared": "1.0.53",
+    "@shuvi/utils": "1.0.53",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -50,11 +50,10 @@
     "es-module-lexer": "0.10.5",
     "esbuild": "0.14.38",
     "esbuild-loader": "2.19.0",
-    "file-loader": "6.2.0",
     "fork-ts-checker-webpack-plugin": "6.0.8",
     "fs-extra": "9.0.1",
     "ignore-loader": "0.1.2",
-    "loader-utils": "2.0.0",
+    "loader-utils": "3.0.0",
     "mini-css-extract-plugin": "1.3.9",
     "mrmime": "1.0.0",
     "path-browserify": "1.0.1",