refactor: headers and remote fn import fn wrapping to prevent name collision

Author: abose

src/LiveDevelopment/MultiBrowserImpl/documents/LiveDocument.js

@@ -74,6 +74,7 @@ define(function (require, exports, module) {
         this._onActiveEditorChange = this._onActiveEditorChange.bind(this);
         this._onCursorActivity = this._onCursorActivity.bind(this);
 
+        // we cant use file paths for event registration - paths may have spaces(treated as an event list separator)
         this.fileHashForEvents = _simpleHash(this.doc.file.fullPath);
         EditorManager.off(`activeEditorChange.LiveDocument-${this.fileHashForEvents}`);
         EditorManager.on(`activeEditorChange.LiveDocument-${this.fileHashForEvents}`, this._onActiveEditorChange);

src/LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol.js

@@ -365,6 +365,7 @@ define(function (require, exports, module) {
             console.error(`Remote function script ${scriptName} already exists. Script wont be added.`);
             return false;
         }
+        scriptText = `(()=>{${scriptText}})();`;
         remoteFunctionsScripts.set(scriptName, scriptText);
         if(!RemoteFunctions.includes("// DONT_STRIP_MINIFY:REPLACE_WITH_ADDED_REMOTE_SCRIPTS")){
             throw new Error("RemoteFunctions script is missing the placeholder // REPLACE_WITH_ADDED_REMOTE_SCRIPTS");

src/extensionsIntegrated/phoenix-pro/LivePreviewEdit.js

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 /*

src/extensionsIntegrated/phoenix-pro/browser-context/remote-utils.js

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 /*global customReturns, enableHoverListeners, dismissUIAndCleanupState, cancelSVGDragIfActive */

src/extensionsIntegrated/phoenix-pro/main.js

@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 define(function (require, exports, module) {
     require("./LivePreviewEdit");
-    require("./remote-constants");
-    require("./remote-icons");
-    require("./remote-styles");
+    const remoteConstants = require("./remote-constants");
+    const remoteIcons = require("./remote-icons");
+    const remoteStyles = require("./remote-styles");
 
     const KernalModeTrust = window.KernalModeTrust;
     if(!KernalModeTrust){
@@ -22,7 +22,6 @@ define(function (require, exports, module) {
 
     const remoteUtilsCode = require("text!./browser-context/remote-utils.js");
     const LiveDevProtocol = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol");
-    LiveDevProtocol.addRemoteFunctionScript("remoteUtilsCode", remoteUtilsCode);
 
     // this will later be assigned its correct values once entitlementsManager loads
     let isProEditActivated = false;
@@ -55,6 +54,21 @@ define(function (require, exports, module) {
     // Escape is mainly to hide boxes if they are visible
     WorkspaceManager.addEscapeKeyEventHandler("livePreview", _handleLivePreviewEscapeKey);
 
+    function _addRemoteScripts() {
+        // the ordering here is important
+        // constants first
+        LiveDevProtocol.addRemoteFunctionConstantsScript("strings",
+            `strings = ${JSON.stringify(remoteConstants.remoteStrings)};`);
+        LiveDevProtocol.addRemoteFunctionConstantsScript("icons",
+            `icons = ${JSON.stringify(remoteIcons.svgIcons)};`);
+        LiveDevProtocol.addRemoteFunctionConstantsScript("styles",
+            `cssStyles = ${JSON.stringify(remoteStyles.cssStyles)};`);
+
+        // functions start here
+        LiveDevProtocol.addRemoteFunctionScript("remoteUtilsCode", remoteUtilsCode);
+    }
+    _addRemoteScripts();
+
     AppInit.appReady(function () {
         _entitlementsChanged();
         KernalModeTrust.EntitlementsManager.on(

src/extensionsIntegrated/phoenix-pro/remote-constants.js

@@ -1,15 +1,14 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 define(function (require, exports, module) {
     const Strings = require("strings");
-    const LiveDevProtocol = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol");
 
     // list of all the strings that are used in the remoteFunctions file
     // we dont pass in the full strings object as its more data to load in every live preview reload.
-    const remoteStrings = {
+    exports.remoteStrings = {
         selectParent: Strings.LIVE_DEV_MORE_OPTIONS_SELECT_PARENT,
         editText: Strings.LIVE_DEV_MORE_OPTIONS_EDIT_TEXT,
         editHyperlink: Strings.LIVE_DEV_MORE_OPTIONS_EDIT_HYPERLINK,
@@ -44,7 +43,4 @@ define(function (require, exports, module) {
         toastCopyFirstTime: Strings.LIVE_DEV_COPY_TOAST_MESSAGE,
         togglePreviewMode: Strings.LIVE_PREVIEW_MODE_TOGGLE_PREVIEW
     };
-
-    LiveDevProtocol.addRemoteFunctionConstantsScript("strings",
-        `strings = ${JSON.stringify(remoteStrings)};`);
 });

src/extensionsIntegrated/phoenix-pro/remote-icons.js

@@ -1,13 +1,12 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 define(function (require, exports, module) {
-    const LiveDevProtocol = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol");
 
     // these are all the icons that are used in the remote functions file
-    const remoteIcons = {
+    exports.svgIcons = {
         ai: `
         <svg x="0px" y="0px" width="100" height="100" viewBox="0,0,256,256">
             <g fill="#fffbfb" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><g transform="scale(4,4)"><path d="M30.701,41.663l-2.246,5.145c-0.864,1.978 -3.6,1.978 -4.464,0l-2.247,-5.145c-1.999,-4.579 -5.598,-8.224 -10.086,-10.216l-6.183,-2.745c-1.966,-0.873 -1.966,-3.733 0,-4.605l5.99,-2.659c4.604,-2.044 8.267,-5.824 10.232,-10.559l2.276,-5.483c0.844,-2.035 3.656,-2.035 4.5,0l2.276,5.483c1.965,4.735 5.628,8.515 10.232,10.559l5.99,2.659c1.966,0.873 1.966,3.733 0,4.605l-6.183,2.745c-4.489,1.992 -8.088,5.637 -10.087,10.216z"></path><path d="M30.701,41.663l-2.246,5.145c-0.864,1.978 -3.6,1.978 -4.464,0l-2.247,-5.145c-1.999,-4.579 -5.598,-8.224 -10.086,-10.216l-6.183,-2.745c-1.966,-0.873 -1.966,-3.733 0,-4.605l5.99,-2.659c4.604,-2.044 8.267,-5.824 10.232,-10.559l2.276,-5.483c0.844,-2.035 3.656,-2.035 4.5,0l2.276,5.483c1.965,4.735 5.628,8.515 10.232,10.559l5.99,2.659c1.966,0.873 1.966,3.733 0,4.605l-6.183,2.745c-4.489,1.992 -8.088,5.637 -10.087,10.216z"></path><g><path d="M51.578,57.887l-0.632,1.448c-0.462,1.06 -1.93,1.06 -2.393,0l-0.632,-1.448c-1.126,-2.582 -3.155,-4.637 -5.686,-5.762l-1.946,-0.865c-1.052,-0.468 -1.052,-1.998 0,-2.465l1.838,-0.816c2.596,-1.153 4.661,-3.285 5.768,-5.955l0.649,-1.565c0.452,-1.091 1.96,-1.091 2.412,0l0.649,1.565c1.107,2.669 3.172,4.801 5.768,5.955l1.837,0.816c1.053,0.468 1.053,1.998 0,2.465l-1.946,0.865c-2.531,1.125 -4.56,3.18 -5.686,5.762z"></path><path d="M51.578,57.887l-0.632,1.448c-0.462,1.06 -1.93,1.06 -2.393,0l-0.632,-1.448c-1.126,-2.582 -3.155,-4.637 -5.686,-5.762l-1.946,-0.865c-1.052,-0.468 -1.052,-1.998 0,-2.465l1.838,-0.816c2.596,-1.153 4.661,-3.285 5.768,-5.955l0.649,-1.565c0.452,-1.091 1.96,-1.091 2.412,0l0.649,1.565c1.107,2.669 3.172,4.801 5.768,5.955l1.837,0.816c1.053,0.468 1.053,1.998 0,2.465l-1.946,0.865c-2.531,1.125 -4.56,3.18 -5.686,5.762z"></path></g></g></g>
@@ -142,7 +141,4 @@ define(function (require, exports, module) {
             <path d="M187.2 100.9C174.8 94.1 159.8 94.4 147.6 101.6C135.4 108.8 128 121.9 128 136L128 504C128 518.1 135.5 531.2 147.6 538.4C159.7 545.6 174.8 545.9 187.2 539.1L523.2 355.1C536 348.1 544 334.6 544 320C544 305.4 536 291.9 523.2 284.9L187.2 100.9z"/>
         </svg>`
     };
-
-    LiveDevProtocol.addRemoteFunctionConstantsScript("icons",
-        `icons = ${JSON.stringify(remoteIcons)};`);
 });

src/extensionsIntegrated/phoenix-pro/remote-styles.js

@@ -1,11 +1,9 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 define(function (require, exports, module) {
-    const LiveDevProtocol = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol");
-
     // this is the box that comes up with the tools like select parent, duplicate, delete, etc..
     const optionsBoxStyles = require("text!./browser-css/options-box.css");
     // this is the more options dropdown that comes up when clicking the ... icon in the option box.
@@ -29,7 +27,7 @@ define(function (require, exports, module) {
     const hotCornerStyles = require("text!./browser-css/hot-corners.css");
 
 
-    const remoteStyles = {
+    exports.cssStyles = {
         optionsBox: optionsBoxStyles,
         optionsBoxDropdown: optionsBoxDropdownStyles,
         infoBox: infoBoxStyles,
@@ -41,7 +39,4 @@ define(function (require, exports, module) {
         ruler: rulerStyles,
         hotCorner: hotCornerStyles
     };
-
-    LiveDevProtocol.addRemoteFunctionConstantsScript("styles",
-        `cssStyles = ${JSON.stringify(remoteStyles)};`);
 });

src/extensionsIntegrated/phoenix-pro/unit-tests/LivePreviewEdit-test.js

@@ -1,10 +1,6 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
- */
-/*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 /*global describe, beforeAll, afterAll, awaitsFor, it, awaitsForDone, expect, awaits, jsPromise*/

src/extensionsIntegrated/phoenix-pro/unittests.js

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021 - present core.ai . All rights reserved.
- * Proprietary code, all rights reserved.
+ * Copyright (c) 2021 - present core.ai
+ * SPDX-License-Identifier: LicenseRef-Proprietary
  */
 
 define(function (require, exports, module) {