Skip to content

Commit c910025

Browse files
committed
Bundle obfuscator as lazy module
1 parent c8b63dc commit c910025

2 files changed

Lines changed: 9 additions & 15 deletions

File tree

src/packager/packager.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -151,26 +151,19 @@ const loadJavaScriptObfuscatorBrowserBundle = () => {
151151
}
152152

153153
const browserBundleModule = await import(
154-
/* webpackChunkName: "javascript-obfuscator-browser-source" */
155-
'raw-loader!javascript-obfuscator/dist/index.browser.js'
154+
/* webpackChunkName: "javascript-obfuscator-browser" */
155+
'javascript-obfuscator'
156156
);
157-
const browserBundleSource = browserBundleModule.default || browserBundleModule;
158-
if (typeof browserBundleSource !== 'string' || browserBundleSource.length === 0) {
159-
throw new Error('Failed to load javascript-obfuscator browser source');
160-
}
161-
162-
const script = document.createElement('script');
163-
script.text = browserBundleSource;
164-
document.head.appendChild(script);
165-
script.remove();
166-
167-
const JavaScriptObfuscator = globalObject.JavaScriptObfuscator;
157+
const JavaScriptObfuscator =
158+
browserBundleModule.default ||
159+
browserBundleModule.JavaScriptObfuscator ||
160+
browserBundleModule;
168161

169162
if (JavaScriptObfuscator && typeof JavaScriptObfuscator.obfuscate === 'function') {
170163
return JavaScriptObfuscator;
171164
}
172165

173-
throw new Error('Failed to initialize javascript-obfuscator browser bundle');
166+
throw new Error('Failed to initialize javascript-obfuscator module');
174167
});
175168

176169
return javaScriptObfuscatorPromise;

webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ const makeWebsite = () => ({
159159
include: [
160160
path.resolve(__dirname, 'src'),
161161
/node_modules[\\/]scratch-[^\\/]+[\\/]src/,
162-
/node_modules[\\/]@turbowarp[\\/]scratch-[^\\/]+[\\/](src|dist)/
162+
/node_modules[\\/]@turbowarp[\\/]scratch-[^\\/]+[\\/](src|dist)/,
163+
/node_modules[\\/]javascript-obfuscator[\\/]dist/
163164
],
164165
options: {
165166
babelrc: false,

0 commit comments

Comments
 (0)