Skip to content

🐜 Patch react-loadable SSR URL resolution #2418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JFWooten4 wants to merge 1 commit into
base: main
Choose a base branch
from
+93 −0
Open

🐜 Patch react-loadable SSR URL resolution #2418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions patches/react-loadable-ssr-addon-v5-slorber+1.0.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
diff --git a/node_modules/react-loadable-ssr-addon-v5-slorber/lib/ReactLoadableSSRAddon.js b/node_modules/react-loadable-ssr-addon-v5-slorber/lib/ReactLoadableSSRAddon.js
index 80b1d3e..3a42c51 100644
--- a/node_modules/react-loadable-ssr-addon-v5-slorber/lib/ReactLoadableSSRAddon.js
+++ b/node_modules/react-loadable-ssr-addon-v5-slorber/lib/ReactLoadableSSRAddon.js
@@ -13,8 +13,6 @@ var _fs = _interopRequireDefault(require("fs"));

var _path = _interopRequireDefault(require("path"));

-var _url = _interopRequireDefault(require("url"));
-
var _utils = require("./utils");

var PLUGIN_NAME = 'ReactLoadableSSRAddon';
@@ -30,6 +28,24 @@ var defaultOptions = {
};
exports.defaultOptions = defaultOptions;

+var resolvePublicPath = function resolvePublicPath(publicPath, file) {
+ var base = publicPath || '';
+
+ if (!base) {
+ return file;
+ }
+
+ try {
+ return new URL(file, base).toString();
+ } catch (_unused) {
+ var origin = 'https://webpack.local';
+ var normalizedBase = base.startsWith('/') ? base : "/" + base;
+ var resolved = new URL(file, "" + origin + normalizedBase);
+ var path = "" + resolved.pathname + resolved.search + resolved.hash;
+ return base.startsWith('/') ? path : path.replace(/^\//, '');
+ }
+};
+
var ReactLoadableSSRAddon = function () {
function ReactLoadableSSRAddon(options) {
if (options === void 0) {
@@ -222,7 +238,7 @@ var ReactLoadableSSRAddon = function () {
assets[id][ext].push({
file: file,
hash: hash,
- publicPath: _url["default"].resolve(_this2.options.publicPath || '', file),
+ publicPath: resolvePublicPath(_this2.options.publicPath || '', file),
integrity: currentAsset[_this2.options.integrityPropertyName]
});
}
diff --git a/node_modules/react-loadable-ssr-addon-v5-slorber/source/ReactLoadableSSRAddon.js b/node_modules/react-loadable-ssr-addon-v5-slorber/source/ReactLoadableSSRAddon.js
index a416720..c1ecdbe 100644
--- a/node_modules/react-loadable-ssr-addon-v5-slorber/source/ReactLoadableSSRAddon.js
+++ b/node_modules/react-loadable-ssr-addon-v5-slorber/source/ReactLoadableSSRAddon.js
@@ -6,7 +6,6 @@

import fs from 'fs';
import path from 'path';
-import url from 'url';
import { getFileExtension, computeIntegrity, hasEntry } from './utils';

// Webpack plugin name
@@ -24,6 +23,24 @@ const defaultOptions = {
integrityPropertyName: 'integrity',
};

+const resolvePublicPath = (publicPath, file) => {
+ const base = publicPath || '';
+
+ if (!base) {
+ return file;
+ }
+
+ try {
+ return new URL(file, base).toString();
+ } catch (_) {
+ const origin = 'https://webpack.local';
+ const normalizedBase = base.startsWith('/') ? base : `/${base}`;
+ const resolved = new URL(file, `${origin}${normalizedBase}`);
+ const path = `${resolved.pathname}${resolved.search}${resolved.hash}`;
+ return base.startsWith('/') ? path : path.replace(/^\//, '');
+ }
+};
+
/**
* React Loadable SSR Add-on for Webpack
* @class ReactLoadableSSRAddon
@@ -304,7 +321,7 @@ class ReactLoadableSSRAddon {
assets[id][ext].push({
file,
hash,
- publicPath: url.resolve(this.options.publicPath || '', file),
+ publicPath: resolvePublicPath(this.options.publicPath || '', file),
integrity: currentAsset[this.options.integrityPropertyName],
});
}
Loading