refactor: working after move

Author: abose

gulpfile.js/index.js

@@ -645,7 +645,7 @@ function inlineTextRequire(file, content, srcDir, isDevBuild = true) {
         const requireFragments = extractRequireTextFragments(content);
         for (const {requirePath, requireStatement} of requireFragments) {
             let filePath = srcDir + requirePath;
-            if(requirePath.startsWith("./")) {
+            if(requirePath.startsWith("./") || requirePath.startsWith("../")) {
                 filePath = path.join(path.dirname(file), requirePath);
             }
             let textContent = textContentMap[getKey(filePath, isDevBuild)];
@@ -663,7 +663,7 @@ function inlineTextRequire(file, content, srcDir, isDevBuild = true) {
                 textContentMap[getKey(filePath, isDevBuild)] = fileContent;
                 textContent = fileContent;
             }
-            if((requirePath.endsWith(".js") && !requirePath.includes("./")) // js files that are relative paths are ok
+            if((requirePath.endsWith(".js") && !requirePath.includes("./") && !requirePath.includes("../")) // js files that are relative paths are ok
                 || excludeSuffixPathsInlining.some(ext => requirePath.endsWith(ext))) {
                 console.warn("Not inlining JS/JSON file:", requirePath, filePath);
                 if(filePath.includes("phoenix-pro")) {

src/brackets.js

@@ -139,8 +139,6 @@ define(function (require, exports, module) {
     require("widgets/InlineMenu");
     require("thirdparty/tinycolor");
     require("utils/LocalizationUtils");
-    require("services/login-desktop");
-    require("services/login-browser");
 
     // DEPRECATED: In future we want to remove the global CodeMirror, but for now we
     // expose our required CodeMirror globally so as to avoid breaking extensions in the

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

@@ -73,7 +73,6 @@ define(function (require, exports, module) {
         panelHTML       = require("text!./panel.html"),
         Dialogs = require("widgets/Dialogs"),
         DefaultDialogs = require("widgets/DefaultDialogs"),
-        ProDialogs = require("services/pro-dialogs"),
         utils = require('./utils');
 
     const KernalModeTrust = window.KernalModeTrust;
@@ -411,7 +410,12 @@ define(function (require, exports, module) {
                 LiveDevelopment.setMode(LiveDevelopment.CONSTANTS.LIVE_HIGHLIGHT_MODE);
             } else if (index === 2) {
                 if (!LiveDevelopment.setMode(LiveDevelopment.CONSTANTS.LIVE_EDIT_MODE)) {
-                    ProDialogs.showProUpsellDialog(ProDialogs.UPSELL_TYPE_LIVE_EDIT);
+                    if(KernalModeTrust.ProDialogs) {
+                        KernalModeTrust.ProDialogs.showProUpsellDialog(
+                            KernalModeTrust.ProDialogs.UPSELL_TYPE_LIVE_EDIT);
+                    } else {
+                        Metrics.countEvent(Metrics.EVENT_TYPE.PRO, "proUpsellDlg", "fail");
+                    }
                 }
             } else if (item === Strings.LIVE_PREVIEW_EDIT_HIGHLIGHT_ON) {
                 // Don't allow edit highlight toggle if edit features are not active

src/help/HelpCommandHandlers.js

@@ -31,7 +31,7 @@ define(function (require, exports, module) {
         NativeApp               = require("utils/NativeApp"),
         Strings                 = require("strings"),
         StringUtils       = require("utils/StringUtils"),
-        ManageLicenses          = require("services/manage-licenses"),
+        ManageLicenses          = require("extensionsIntegrated/phoenix-pro/services/manage-licenses"),
         AboutDialogTemplate     = require("text!htmlContent/about-dialog.html"),
         ContributorsTemplate    = require("text!htmlContent/contributors-list.html"),
         Mustache                = require("thirdparty/mustache/mustache");

test/UnitTestSuite.js

@@ -124,7 +124,6 @@ define(function (require, exports, module) {
     require("spec/login-desktop-integ-test");
     require("spec/LocalizationUtils-test");
     require("spec/ScrollTrackHandler-integ-test");
-    require("spec/login-utils-test");
     // Integrated extension tests
     require("spec/Extn-InAppNotifications-integ-test");
     require("spec/Extn-RemoteFileAdapter-integ-test");