-
-
Notifications
You must be signed in to change notification settings - Fork 845
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.
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
web: Fix extension webpack import not working (close #10981) #19664
base: master
Are you sure you want to change the base?
web: Fix extension webpack import not working (close #10981) #19664
Conversation
8b7e49f
to
0c1291a
Compare
return prop in obj && (obj as Record<PropertyKey, unknown>)[prop] !== ""; | ||
} | ||
|
||
// Copied from Webpack: https://github.com/webpack/webpack/blob/f1bdec5cc70236083e45b665831d5d79d6485db7/lib/runtime/AutoPublicPathRuntimeModule.js#L75 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This link may be confusing.
It actually comes from webpack automatic publicPath. Specifically refers to get publicPath from the currentScript.src
.
@@ -57,6 +58,60 @@ function openInNewTab(swf: URL): void { | |||
window.postMessage(message, "*"); | |||
} | |||
|
|||
function polyfillCurrentScript(): void { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found the relevant code that has used currentScript.src
in these files and make polyfills for these files.
- web/packages/extension/src/ruffle.ts
- web/packages/core/src/current-script.ts
web/packages/selfhosted/js/ruffle.js(Intentionally ignored because the extension never use it)
); | ||
} | ||
} | ||
// TODO: Process other situations when mask url not webkit-masked-url://hidden/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the current problems are relatively easy to solve in a targeted manner, I made a simple fix. But this may not be the best or most general solution, so I left a todo here
const scriptUrl = script.src; | ||
const applyResetWebpackPublicPath = (overridePublicPath: string): void => { | ||
__webpack_public_path__ = overridePublicPath; | ||
// TODO: If there are other scripts that need to be dynamically created and executed, the current polyfill logic should also be applied. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps there is a better way for us to notify downstream of such fixes?
}; | ||
// Reset webpack public path should be safe when it is using mask url | ||
if ("webkit-masked-url://hidden/" === scriptUrl) { | ||
const webpackCurrentPublicPath = __webpack_public_path__; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The __webpack_public_path__
runtime code is actually like __webpack_require__.p
, so it could be set and get. But this is a webpack only logic.
0c1291a
to
fca80bc
Compare
Close #10981
Continue with PR #19348, this PR is used to fix the
ruffle.js
webpack import module.