Merge branch 'main' into remove_doc_generator_0829

.changeset/few-olives-remain.md

@@ -0,0 +1,7 @@
+---
+'@modern-js/builder-shared': patch
+---
+
+fix(builder): fix withPublicPath may missing subpath
+
+fix(builder):  修复 withPublicPath 方法可能会丢失子路径的问题

packages/builder/builder-shared/src/url.ts

@@ -1,5 +1,4 @@
 import { URL } from 'url';
-import path from 'path';
 import { urlJoin } from '@modern-js/utils';
 
 export const withPublicPath = (str: string, base: string) => {
@@ -11,28 +10,11 @@ export const withPublicPath = (str: string, base: string) => {
     return str;
   }
 
-  if (base.startsWith('//')) {
-    return urlJoin(base, str);
-  }
-
   // Only absolute url with hostname & protocol can be parsed into URL instance.
   // e.g. str is https://example.com/foo.js
   try {
     return new URL(str).toString();
   } catch {}
 
-  // Or it should be a relative path.
-  // Let's join the publicPath.
-  // e.g. str is ./foo.js
-  try {
-    // `base` is a url with hostname & protocol.
-    // e.g. base is https://example.com/static
-    const url = new URL(base);
-    url.pathname = path.posix.resolve(url.pathname, str);
-    return url.toString();
-  } catch {
-    // without hostname & protocol.
-    // e.g. base is /
-    return path.posix.resolve(base, str);
-  }
+  return urlJoin(base, str);
 };

packages/builder/builder-shared/tests/url.test.ts

@@ -9,15 +9,15 @@ describe('withPublicPath', () => {
       'https://www.example.com/static/foo/bar.js',
     );
     expect(withPublicPath('foo/bar.js', '/')).toBe('/foo/bar.js');
-    expect(withPublicPath('./foo/bar.js', PUBLIC_PATH)).toBe(
+    expect(withPublicPath('/foo/bar.js', PUBLIC_PATH)).toBe(
       'https://www.example.com/static/foo/bar.js',
     );
-    expect(withPublicPath('./foo/bar.js', '/')).toBe('/foo/bar.js');
+    expect(withPublicPath('/foo/bar.js', '/')).toBe('/foo/bar.js');
   });
 
   it('should handle absolute url', () => {
     expect(withPublicPath('/foo/bar.js', PUBLIC_PATH)).toBe(
-      'https://www.example.com/foo/bar.js',
+      'https://www.example.com/static/foo/bar.js',
     );
     expect(withPublicPath('/foo/bar.js', '/')).toBe('/foo/bar.js');
   });