Skip to content

Commit 2f70638

Browse files
committed
fix: prod build fails
1 parent 0dcde45 commit 2f70638

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

gulpfile.js/index.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,9 @@ function containsRegExpExcludingEmpty(str) {
610610
const minifyablePaths = [
611611
'src/extensionsIntegrated/phoenix-pro/browser-context'
612612
];
613+
const noMinifyFiles = [
614+
'src/extensionsIntegrated/phoenix-pro/browser-context/control-box.js'
615+
];
613616

614617
function _minifyBrowserContextFile(fileContent) {
615618
const minified = terser.minify(fileContent, {
@@ -636,6 +639,9 @@ function _minifyBrowserContextFile(fileContent) {
636639

637640
function _isMinifyablePath(filePath) {
638641
const normalizedFilePath = path.normalize(filePath);
642+
if (noMinifyFiles.some(f => normalizedFilePath.endsWith(path.normalize(f)))) {
643+
return false;
644+
}
639645
return minifyablePaths.some(minifyPath =>
640646
normalizedFilePath.startsWith(path.normalize(minifyPath))
641647
);
@@ -690,7 +696,9 @@ function inlineTextRequire(file, content, srcDir, isDevBuild = true) {
690696
throw `Error inlining ${requireStatement} in ${file}: Regex: ${detectedRegEx}`+
691697
"\nRegular expression of the form /*/ is not allowed for minification please use RegEx constructor";
692698
}
693-
content = content.replaceAll(requireStatement, `${JSON.stringify(textContent)}`);
699+
// Escape $ in replacement to prevent special replacement patterns ($&, $1, etc.)
700+
const safeReplacement = JSON.stringify(textContent).replaceAll("$", "$$$$");
701+
content = content.replaceAll(requireStatement, safeReplacement);
694702
}
695703
}
696704

src/command/DefaultMenus.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,9 @@ define(function (require, exports, module) {
231231
menu.addMenuItem(Commands.TOGGLE_RULERS);
232232
menu.addMenuDivider();
233233
menu.addMenuItem(Commands.VIEW_TOGGLE_PROBLEMS);
234-
menu.addMenuItem(Commands.VIEW_TERMINAL);
234+
if (Phoenix.isNativeApp) {
235+
menu.addMenuItem(Commands.VIEW_TERMINAL);
236+
}
235237
menu.addMenuItem(Commands.VIEW_TOGGLE_INSPECTION);
236238

237239
/*

tracking-repos.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"phoenixPro": {
3-
"commitID": "dc54c66e3a6de664210c743bdda4f0f796cf3c0b"
3+
"commitID": "e576b046d4ab2941be70582b5acc641996f1e42d"
44
}
55
}

0 commit comments

Comments
 (0)