Skip to content

Commit 1ae6ca3

Browse files
committed
fix: release dist failing to launch lp edit
1 parent 87f8f77 commit 1ae6ca3

File tree

3 files changed

+26
-35
lines changed

3 files changed

+26
-35
lines changed

gulpfile.js/index.js

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,19 @@ function _cleanPhoenixProGitFolder() {
9191

9292
function _deletePhoenixProSourceFolder() {
9393
return new Promise((resolve) => {
94-
// 1. Delete everything in dist folder
95-
const distFolder = 'dist/extensionsIntegrated/phoenix-pro';
96-
if (fs.existsSync(distFolder)) {
97-
fs.rmSync(distFolder, { recursive: true, force: true });
98-
console.log(`Deleted phoenix-pro source folder: ${distFolder}`);
99-
}
100-
101-
// 2. Selectively delete in dist-test folder, keeping test files
102-
const distTestFolder = 'dist-test/src/extensionsIntegrated/phoenix-pro';
103-
if (fs.existsSync(distTestFolder)) {
104-
const items = fs.readdirSync(distTestFolder);
105-
const keepItems = ['unittests.js', 'unit-tests'];
106-
107-
for (const item of items) {
108-
if (keepItems.includes(item)) {
109-
console.log(`Retained for testing: ${distTestFolder}/${item}`);
110-
} else {
111-
const itemPath = path.join(distTestFolder, item);
112-
fs.rmSync(itemPath, { recursive: true, force: true });
113-
console.log(`Deleted: ${itemPath}`);
114-
}
115-
}
116-
}
117-
94+
// todo we cant do this yet lots of issues happening due to missing files in dist test mainly
95+
// which i also suspect are actual issues
96+
// const phoenixProFolders = [
97+
// 'dist/extensionsIntegrated/phoenix-pro',
98+
// 'dist-test/src/extensionsIntegrated/phoenix-pro'
99+
// ];
100+
//
101+
// for (const folder of phoenixProFolders) {
102+
// if (fs.existsSync(folder)) {
103+
// fs.rmSync(folder, { recursive: true, force: true });
104+
// console.log(`Deleted phoenix-pro source folder: ${folder}`);
105+
// }
106+
// }
118107
resolve();
119108
});
120109
}

src/LiveDevelopment/BrowserScripts/RemoteFunctions.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5943,10 +5943,7 @@ function RemoteFunctions(config = {}) {
59435943
}
59445944

59455945
let customReturns = {};
5946-
// the below code comment is replaced by added scripts for extensibility
5947-
// DONT_STRIP_MINIFY:REPLACE_WITH_ADDED_REMOTE_SCRIPTS
5948-
5949-
return {
5946+
customReturns = { // we have to do this else the minifier will strip the customReturns variable
59505947
...customReturns,
59515948
"DOMEditHandler" : DOMEditHandler,
59525949
"hideHighlight" : hideHighlight,
@@ -5963,4 +5960,9 @@ function RemoteFunctions(config = {}) {
59635960
"showToastMessage" : showToastMessage,
59645961
"cancelSVGDragIfActive" : cancelSVGDragIfActive
59655962
};
5963+
5964+
// the below code comment is replaced by added scripts for extensibility
5965+
// DONT_STRIP_MINIFY:REPLACE_WITH_ADDED_REMOTE_SCRIPTS
5966+
5967+
return customReturns;
59665968
}

src/extensionsIntegrated/Phoenix-live-preview/main.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,6 @@ define(function (require, exports, module) {
174174
isProEditUser = false;
175175
}
176176
}
177-
if(!Phoenix.isSpecRunnerWindow){
178-
_entitlementsChanged();
179-
KernalModeTrust.EntitlementsManager.on(
180-
KernalModeTrust.EntitlementsManager.EVENT_ENTITLEMENTS_CHANGED,
181-
_entitlementsChanged
182-
);
183-
}
184177

185178
StaticServer.on(EVENT_EMBEDDED_IFRAME_WHO_AM_I, function () {
186179
if($iframe && $iframe[0]) {
@@ -1312,6 +1305,13 @@ define(function (require, exports, module) {
13121305
}
13131306
}, 1000);
13141307
_projectOpened();
1308+
if(!Phoenix.isSpecRunnerWindow){
1309+
_entitlementsChanged();
1310+
KernalModeTrust.EntitlementsManager.on(
1311+
KernalModeTrust.EntitlementsManager.EVENT_ENTITLEMENTS_CHANGED,
1312+
_entitlementsChanged
1313+
);
1314+
}
13151315
});
13161316

13171317
// private API to be used inside phoenix codebase only

0 commit comments

Comments
 (0)