@dynatrace/cordova-plugin 2.327.1 → 2.331.1

package/scripts/helpers/InstallHelper.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOptOut = exports.parsedNpmConfig = exports.parsedCapPackageJson = exports.parsedPluginPackageJson = exports.parsedApplicationPackageJson = exports.removeScriptHookAndDeps = exports.addScriptHook = exports.isCapVersionThreeOneOrHigher = exports.removePListModification = exports.removeGradleModification = exports.modifyPackageJsonCap = exports.CAP_HOOK = exports.IONIC_HOOK = void 0;
+exports.moveIosFilesForSPM = exports.replacePackageSwiftWithOriginal = exports.isOptOut = exports.parsedNpmConfig = exports.parsedCapPackageJson = exports.parsedPluginPackageJson = exports.parsedApplicationPackageJson = exports.removeScriptHookAndDeps = exports.addScriptHook = exports.isCapVersionThreeOneOrHigher = exports.removePListModification = exports.removeGradleModification = exports.modifyPackageJsonCap = exports.CAP_HOOK = exports.IONIC_HOOK = void 0;
 var path_1 = require("path");
 var fs_1 = require("fs");
 var Android_1 = require("../Android");
@@ -237,3 +237,69 @@ var isOptOut = function (parsedNpmConfig) {
     return parsedNpmConfig !== undefined && parsedNpmConfig[NPM_CONFIG_OPT_OUT] !== undefined ? parsedNpmConfig[NPM_CONFIG_OPT_OUT] : false;
 };
 exports.isOptOut = isOptOut;
+var replacePackageSwiftWithOriginal = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var originalPackageSwiftContent, e_5;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!(0, PathHelper_1.isCapacitorUsingSPM)()) return [3, 6];
+                if (!(0, fs_1.existsSync)((0, PathHelper_1.getIosPackageSwiftCapacitor)())) {
+                    Logger_1.Logger.getInstance().logWarning('Cannot replace Package.swift file, as it does not exist in the DynatraceCordovaPlugin folder inside the iOS Platform.');
+                    return [2];
+                }
+                _a.label = 1;
+            case 1:
+                _a.trys.push([1, 4, , 5]);
+                return [4, (0, FileHelper_1.readTextFromFile)((0, PathHelper_1.getOriginalPackageSwiftCapacitor)())];
+            case 2:
+                originalPackageSwiftContent = _a.sent();
+                return [4, (0, FileHelper_1.writeTextToFile)((0, PathHelper_1.getIosPackageSwiftCapacitor)(), originalPackageSwiftContent)];
+            case 3:
+                _a.sent();
+                return [3, 5];
+            case 4:
+                e_5 = _a.sent();
+                Logger_1.Logger.getInstance().logError("Unable to replace the Package.swift file! " + e_5);
+                return [3, 5];
+            case 5: return [3, 7];
+            case 6:
+                Logger_1.Logger.getInstance().logInfo('Capacitor iOS project is not using Swift Package Manager. There is no Package.swift file to replace.');
+                _a.label = 7;
+            case 7: return [2];
+        }
+    });
+}); };
+exports.replacePackageSwiftWithOriginal = replacePackageSwiftWithOriginal;
+var moveIosFilesForSPM = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var dirPath, e_6;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                if (!(0, PathHelper_1.isCapacitorUsingSPM)()) return [3, 7];
+                dirPath = (0, path_1.join)((0, PathHelper_1.getIosSPMCordovaPluginCapacitor)(), 'ios');
+                return [4, (0, FileHelper_1.createDirectory)(dirPath)];
+            case 1:
+                _a.sent();
+                _a.label = 2;
+            case 2:
+                _a.trys.push([2, 5, , 6]);
+                return [4, (0, FileHelper_1.renameFile)((0, path_1.join)((0, PathHelper_1.getIosSPMCordovaPluginCapacitor)(), PathHelper_1.FILE_IOS_HEADER), (0, path_1.join)(dirPath, PathHelper_1.FILE_IOS_HEADER))];
+            case 3:
+                _a.sent();
+                return [4, (0, FileHelper_1.renameFile)((0, path_1.join)((0, PathHelper_1.getIosSPMCordovaPluginCapacitor)(), PathHelper_1.FILE_IOS_IMPL), (0, path_1.join)(dirPath, PathHelper_1.FILE_IOS_IMPL))];
+            case 4:
+                _a.sent();
+                return [3, 6];
+            case 5:
+                e_6 = _a.sent();
+                Logger_1.Logger.getInstance().logError("Moving of iOS files for SPM failed! " + e_6);
+                return [3, 6];
+            case 6: return [3, 8];
+            case 7:
+                Logger_1.Logger.getInstance().logInfo('Capacitor iOS project is not using Swift Package Manager. There are no iOS files to move.');
+                _a.label = 8;
+            case 8: return [2];
+        }
+    });
+}); };
+exports.moveIosFilesForSPM = moveIosFilesForSPM;

package/scripts/helpers/PathHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCapacitorApp = exports.getCapacitorCookieProxyPath = exports.getCapacitorConfig = exports.getCapCliPackage = exports.getIosAssetsPathCapacitor = exports.getAndroidAssetsPathCapacitor = exports.getIosPlistPathCapacitor = exports.getAndroidPathCapacitor = exports.getIosPathCapacitor = exports.getDynatracePluginGradleFile = exports.getDynatraceGradleFile = exports.getLogPath = exports.getCurrentLogPath = exports.getCookieProxyPath = exports.getSwallowApiPath = exports.getDownloadJSAgentPath = exports.getIOSAssetsPath = exports.getAndroidAssetsPath = exports.getConfigFilePath = exports.getDefaultConfig = exports.getAndroidGradleVersionNewer = exports.getAndroidGradleVersion = exports.dynatraceConfigExists = exports.isIonic = exports.getIonicConfig = exports.getDoctorLogPath = exports.getAndroidGradleFile = exports.getPluginPath = exports.getPluginPackage = exports.getAndroidPath = exports.getIosPath = exports.getApplicationPackage = exports.getApplicationPath = exports.setRoot = exports.FILE_CAPACITOR_COOKIE_PROXY = exports.FILE_COOKIE_PROXY = exports.FILE_SWALLOW_API = exports.FILE_JSAGENT = exports.FOLDER_ASSETS = void 0;
+exports.getOriginalPackageSwiftCapacitor = exports.getIosPackageSwiftCapacitor = exports.getIosSPMCordovaPluginCapacitor = exports.isCapacitorUsingSPM = exports.isCapacitorApp = exports.getCapacitorCookieProxyPath = exports.getCapacitorConfig = exports.getCapCliPackage = exports.getIosAssetsPathCapacitor = exports.getAndroidAssetsPathCapacitor = exports.getIosPlistPathCapacitor = exports.getAndroidPathCapacitor = exports.getIosPathCapacitor = exports.getDynatracePluginGradleFile = exports.getDynatraceGradleFile = exports.getLogPath = exports.getCurrentLogPath = exports.getCookieProxyPath = exports.getSwallowApiPath = exports.getDownloadJSAgentPath = exports.getIOSAssetsPath = exports.getAndroidAssetsPath = exports.getConfigFilePath = exports.getDefaultConfig = exports.getAndroidGradleVersionNewer = exports.getAndroidGradleVersion = exports.dynatraceConfigExists = exports.isIonic = exports.getIonicConfig = exports.getDoctorLogPath = exports.getAndroidGradleFile = exports.getPluginPath = exports.getPluginPackage = exports.getAndroidPath = exports.getIosPath = exports.getApplicationPackage = exports.getApplicationPath = exports.setRoot = exports.FILE_IOS_IMPL = exports.FILE_IOS_HEADER = exports.FILE_CAPACITOR_COOKIE_PROXY = exports.FILE_COOKIE_PROXY = exports.FILE_SWALLOW_API = exports.FILE_JSAGENT = exports.FOLDER_ASSETS = void 0;
 var path_1 = require("path");
 var fs_1 = require("fs");
 var FOLDER_PLATFORMS = 'platforms';
@@ -11,15 +11,19 @@ var FOLDER_FILES = 'files';
 var FOLDER_LOGS = 'logs';
 var FOLDER_ANDROID_APP = 'app';
 var FOLDER_NODE_MODULES = 'node_modules';
+var FOLDER_CAP_SPM = 'CapApp-SPM';
 var FILE_PACKAGE = 'package.json';
 var FILE_CONFIG = 'dynatrace.config.js';
 var FILE_CURRENT_LOG = 'currentLog.txt';
 var FILE_CAPACITOR_CONFIG_TS = (0, path_1.join)(__dirname, '..', '..', '..', '..', '..', 'capacitor.config.ts');
 var FILE_CAPACITOR_CONFIG_JSON = (0, path_1.join)(__dirname, '..', '..', '..', '..', '..', 'capacitor.config.json');
+var FILE_PACKAGE_SWIFT_SPM = 'Package.swift';
 exports.FILE_JSAGENT = 'dtAgent.js';
 exports.FILE_SWALLOW_API = 'dtrum-swallow-api.js';
 exports.FILE_COOKIE_PROXY = 'dt-cookie-proxy.js';
 exports.FILE_CAPACITOR_COOKIE_PROXY = 'dt-cookie-proxy-cap.js';
+exports.FILE_IOS_HEADER = 'DynatraceCordovaPlugin.h';
+exports.FILE_IOS_IMPL = 'DynatraceCordovaPlugin.m';
 var rootPath = __dirname;
 var setRoot = function (newRoot) {
     rootPath = (0, path_1.resolve)(newRoot);
@@ -109,6 +113,13 @@ var getAndroidPathCapacitor = function () { return (0, path_1.join)(getApplicati
 exports.getAndroidPathCapacitor = getAndroidPathCapacitor;
 var getIosPlistPathCapacitor = function () { return (0, path_1.join)(getIosPathCapacitor(), 'App', 'Info.plist'); };
 exports.getIosPlistPathCapacitor = getIosPlistPathCapacitor;
+var getIosSPMCapacitor = function () { return (0, path_1.join)(getIosPathCapacitor(), FOLDER_CAP_SPM); };
+var getIosSPMCordovaPluginCapacitor = function () { return (0, path_1.join)(getIosPathCapacitor(), '..', 'capacitor-cordova-ios-plugins', 'sources', 'DynatraceCordovaPlugin'); };
+exports.getIosSPMCordovaPluginCapacitor = getIosSPMCordovaPluginCapacitor;
+var getIosPackageSwiftCapacitor = function () { return (0, path_1.join)(getIosSPMCordovaPluginCapacitor(), FILE_PACKAGE_SWIFT_SPM); };
+exports.getIosPackageSwiftCapacitor = getIosPackageSwiftCapacitor;
+var getOriginalPackageSwiftCapacitor = function () { return (0, path_1.join)(getApplicationPath(), FOLDER_NODE_MODULES, '@dynatrace', 'cordova-plugin', FILE_PACKAGE_SWIFT_SPM); };
+exports.getOriginalPackageSwiftCapacitor = getOriginalPackageSwiftCapacitor;
 var getAndroidAssetsPathCapacitor = function () {
     if ((0, fs_1.existsSync)((0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public'))) {
         return (0, path_1.join)(getAndroidPathCapacitor(), FOLDER_ANDROID_APP, 'src', 'main', exports.FOLDER_ASSETS, 'public');
@@ -141,3 +152,7 @@ exports.getCapacitorConfig = getCapacitorConfig;
 var isCapacitorApp = function () { return (0, fs_1.existsSync)(getCapacitorConfig()) || (0, fs_1.existsSync)(getCapacitorConfig(true)); };
 exports.isCapacitorApp = isCapacitorApp;
 var isNpxCommand = function () { return (0, fs_1.existsSync)((0, path_1.join)(__dirname, '..', '..', '..', '..', '..', 'package.json')) && __dirname.includes('node_modules'); };
+var isCapacitorUsingSPM = function () {
+    return (0, fs_1.existsSync)(getIosSPMCapacitor());
+};
+exports.isCapacitorUsingSPM = isCapacitorUsingSPM;