chore: update lock

web-infra-dev · Dec 22, 2024 · 4522637 · 4522637
1 parent ac486b9
commit 4522637
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 9 deletions.
diff --git a/packages/core/src/asset/assetConfig.ts b/packages/core/src/asset/assetConfig.ts
@@ -11,15 +11,39 @@ export const composeAssetConfig = (
       return {
         output: {
           dataUriLimit: 0, // default: no inline asset
-          // assetPrefix: 'auto', // TODO: will turn on this with js support together in the future
+          assetPrefix: 'auto', // TODO: will turn on this with js support together in the future
+        },
+        tools: {
+          // rspack: {
+          //   module: {
+          //     generator: {
+          //       asset: {
+          //         // publicPath: 'auto',
+          //         // experimentalLibPreserveImport: true,
+          //       },
+          //     },
+          //   },
+          // },
         },
       };
     }
-
+    // TODO: bundleless
     return {
       output: {
         dataUriLimit: 0, // default: no inline asset
-        // assetPrefix: 'auto', // TODO: will turn on this with js support together in the future
+        assetPrefix: 'auto',
+      },
+      tools: {
+        // rspack: {
+        //   module: {
+        //     generator: {
+        //       asset: {
+        //         // publicPath: 'auto',
+        //         // experimentalLibReExport: true,
+        //       },
+        //     },
+        //   },
+        // },
       },
     };
   }

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -909,9 +909,12 @@ const composeEntryConfig = async (
     });
 
     // Filter the glob resolved entry files based on the allowed extensions
-    const resolvedEntryFiles = globEntryFiles.filter((file) =>
-      ENTRY_EXTENSIONS_PATTERN.test(file),
-    );
+    const resolvedEntryFiles = globEntryFiles;
+    ENTRY_EXTENSIONS_PATTERN;
+
+    // .filter((file) =>
+    //   ENTRY_EXTENSIONS_PATTERN.test(file),
+    // );
 
     if (resolvedEntryFiles.length === 0) {
       throw new Error(`Cannot find ${resolvedEntryFiles}`);
@@ -1053,7 +1056,10 @@ const composeBundlelessExternalConfig = (
                     );
                   } else {
                     // If it does not match jsExtensionsPattern, we should do nothing, eg: ./foo.png
-                    return callback();
+                    resolvedRequest = resolvedRequest.replace(
+                      /\.[^.]+$/,
+                      jsExtension,
+                    );
                   }
                 } else {
                   resolvedRequest = `${resolvedRequest}${jsExtension}`;

diff --git a/packages/core/src/css/LibCssExtractPlugin.ts b/packages/core/src/css/LibCssExtractPlugin.ts
@@ -3,6 +3,7 @@ import { RSLIB_CSS_ENTRY_FLAG } from './cssConfig';
 import {
   ABSOLUTE_PUBLIC_PATH,
   AUTO_PUBLIC_PATH,
+  // BASE_URI,
   SINGLE_DOT_PATH_SEGMENT,
 } from './libCssExtractLoader';
 import { getUndoPath } from './utils';
@@ -62,14 +63,15 @@ class LibCssExtractPlugin implements Rspack.RspackPluginInstance {
               }
             }
 
-            replace(ABSOLUTE_PUBLIC_PATH, '');
             replace(SINGLE_DOT_PATH_SEGMENT, '.');
             const undoPath = getUndoPath(
               name,
               compilation.outputOptions.path!,
               false,
             );
-            replace(AUTO_PUBLIC_PATH, undoPath);
+            replace(`${ABSOLUTE_PUBLIC_PATH}${AUTO_PUBLIC_PATH}`, undoPath);
+            replace(ABSOLUTE_PUBLIC_PATH, '');
+            // replace(`${BASE_URI}/`, undoPath);
 
             return replaceSource;
           });