nativescript 8.5.4-dev.1 → 8.5.4-dev.1-next-05-22-2023-5047994157

package/config/test-deps-versions-generated.json

@@ -1 +1 @@
-{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.4.1","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"10.2.0","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"4.0.2","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"10.0.1","@types/jasmine":"4.3.1","@types/qunit":"2.19.4","nyc":"15.1.0"}
+{"@jsdevtools/coverage-istanbul-loader":"3.0.5","karma":"6.4.2","karma-coverage":"2.2.0","karma-nativescript-launcher":"0.4.0","mocha":"10.2.0","karma-mocha":"2.0.1","karma-chai":"0.1.0","karma-jasmine":"4.0.2","karma-qunit":"4.1.2","@types/karma-chai":"0.1.3","@types/mocha":"10.0.1","@types/jasmine":"4.3.1","@types/qunit":"2.19.5","nyc":"15.1.0"}

package/lib/common/mobile/device-log-provider.js

@@ -14,7 +14,7 @@ class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase
         this.$logSourceMapService = $logSourceMapService;
         this.$timelineProfilerService = $timelineProfilerService;
         this.$options = $options;
-        this.consoleLogLevelRegex = /^CONSOLE (LOG|INFO|WARN|ERROR|TRACE|INFO( .+)):\s/;
+        this.consoleLogLevelRegex = /^CONSOLE (LOG|INFO|WARN|ERROR|TRACE|INFO( .+)|TIME):\s/;
         this.consoleLevelColor = {
             log: (line) => line,
             info: color_1.color.cyanBright,
@@ -62,6 +62,7 @@ class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase
     }
     logDataCore(data, deviceIdentifier) {
         var _a, _b, _c;
+        data = data.replace(/^JS:\s/, "");
         if ("classicLogs" in ((_a = this.$options.env) !== null && _a !== void 0 ? _a : {})) {
             this.$logger.info(data, { [constants_2.LoggerConfigData.skipNewLine]: true });
             return;
@@ -103,12 +104,15 @@ class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase
                 level = "time";
                 timeLabel = timeLabel.replace("INFO ", "").trim() + ": ";
             }
+            else if (!level && line.startsWith("Trace:")) {
+                level = "trace";
+            }
             else {
                 level = (_c = level === null || level === void 0 ? void 0 : level.toLowerCase()) !== null && _c !== void 0 ? _c : "log";
             }
             const toLog = [timeLabel !== null && timeLabel !== void 0 ? timeLabel : "", match ? line.replace(match, "") : line]
                 .join("")
-                .trim();
+                .trimEnd();
             toLog.split("\n").forEach((actualLine) => {
                 this.printLine(color_1.color[this.getDeviceColor(deviceIdentifier)](" "), this.consoleLevelColor[level](actualLine));
             });

package/lib/services/ios-log-filter.js

@@ -6,7 +6,7 @@ class IOSLogFilter {
     constructor($loggingLevels) {
         this.$loggingLevels = $loggingLevels;
         this.appOutputRegex = /([^\s\(\)]+)(?:\(([^\s]+)\))?\[[0-9]+\]/;
-        this.infoFilterRegex = new RegExp(`^.*(?:<Notice>:|<Error>:|<Warning>:|\\(NativeScript\\)|${this.appOutputRegex.source}:){1}`);
+        this.infoFilterRegex = new RegExp(`^.*(?:<Notice>:[ \t]?|<Error>:[ \t]?|<Warning>:[ \t]?|\\(NativeScript\\)[ \t]?|${this.appOutputRegex.source}:[ \t]?){1}`);
         this.postFilterRegex = /^\((.+)\) \[com\.apple.+\]/;
         this.filterActive = true;
         this.partialLine = null;
@@ -47,7 +47,9 @@ class IOSLogFilter {
             if (filteredLineInfo && filteredLineInfo.length > 0) {
                 currentLine = currentLine.replace(filteredLineInfo[0], "");
             }
-            currentLine = currentLine.trim();
+            currentLine = currentLine
+                .replace(/^\s*CONSOLE/, "CONSOLE")
+                .trimEnd();
             const postFilterMatch = this.postFilterRegex.exec(currentLine);
             if (postFilterMatch && (postFilterMatch === null || postFilterMatch === void 0 ? void 0 : postFilterMatch[1]) !== "NativeScript") {
                 continue;

package/lib/services/xcconfig-service.js

@@ -38,12 +38,12 @@ class XcconfigService {
             const escapedDestinationFile = destinationFile.replace(/'/g, "\\'");
             const escapedSourceFile = sourceFile.replace(/'/g, "\\'");
             const mergeScript = `require 'xcodeproj';
-		sourceConfig = Xcodeproj::Config.new('${escapedDestinationFile}')
-		targetConfig = Xcodeproj::Config.new('${escapedSourceFile}')
-		if(sourceConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET') && targetConfig.attributes.key?('IPHONEOS_DEPLOYMENT_TARGET'))
-			sourceConfig.attributes.delete('IPHONEOS_DEPLOYMENT_TARGET')
+		userConfig = Xcodeproj::Config.new('${escapedDestinationFile}')
+		existingConfig = Xcodeproj::Config.new('${escapedSourceFile}')
+		userConfig.attributes.each do |key,|
+  			existingConfig.attributes.delete(key) if (userConfig.attributes.key?(key) && existingConfig.attributes.key?(key))
 		end
-		sourceConfig.merge(targetConfig).save_as(Pathname.new('${escapedDestinationFile}'))`;
+		userConfig.merge(existingConfig).save_as(Pathname.new('${escapedDestinationFile}'))`;
             yield this.$childProcess.exec(`ruby -e "${mergeScript}"`);
         });
     }

package/node_modules/balanced-match/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+tidelift: "npm/balanced-match"
+patreon: juliangruber

package/node_modules/balanced-match/README.md

@@ -66,6 +66,12 @@ With [npm](https://npmjs.org) do:
 npm install balanced-match
 ```
 
+## Security contact information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.
+
 ## License
 
 (MIT)

package/node_modules/balanced-match/index.js

@@ -28,6 +28,9 @@ function range(a, b, str) {
   var i = ai;
 
   if (ai >= 0 && bi > 0) {
+    if(a===b) {
+      return [ai, bi];
+    }
     begs = [];
     left = str.length;
 

package/node_modules/balanced-match/package.json

@@ -1,7 +1,7 @@
 {
   "name": "balanced-match",
   "description": "Match balanced character pairs, like \"{\" and \"}\"",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/juliangruber/balanced-match.git"
@@ -9,10 +9,9 @@
   "homepage": "https://github.com/juliangruber/balanced-match",
   "main": "index.js",
   "scripts": {
-    "test": "make test",
-    "bench": "make bench"
+    "test": "tape test/test.js",
+    "bench": "matcha test/bench.js"
   },
-  "dependencies": {},
   "devDependencies": {
     "matcha": "^0.7.0",
     "tape": "^4.6.0"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.5.4-dev.1",
+  "version": "8.5.4-dev.1-next-05-22-2023-5047994157",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

package/lib/common/test/definitions/mocha.d.ts

@@ -1,86 +0,0 @@
-// Type definitions for mocha 1.9.0
-// Project: http://visionmedia.github.io/mocha/
-// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid/>
-// DefinitelyTyped: https://github.com/borisyankov/DefinitelyTyped
-
-interface Mocha {
-	// Setup mocha with the given setting options.
-	setup(options: MochaSetupOptions): Mocha;
-
-	//Run tests and invoke `fn()` when complete.
-	run(callback?: () => void): void;
-
-	// Set reporter as function
-	reporter(reporter: () => void): Mocha;
-
-	// Set reporter, defaults to "dot"
-	reporter(reporter: string): Mocha;
-
-	// Enable growl support.
-	growl(): Mocha;
-}
-
-interface MochaSetupOptions {
-	//milliseconds to wait before considering a test slow
-	slow?: number;
-
-	// timeout in milliseconds
-	timeout?: number;
-
-	// ui name "bdd", "tdd", "exports" etc
-	ui?: string;
-
-	//array of accepted globals
-	globals?: any[];
-
-	// reporter instance (function or string), defaults to `mocha.reporters.Dot`
-	reporter?: any;
-
-	// bail on the first test failure
-	bail?: Boolean;
-
-	// ignore global leaks
-	ignoreLeaks?: Boolean;
-
-	// grep string or regexp to filter tests with
-	grep?: any;
-}
-
-declare module mocha {
-	interface Done {
-		(error?: Error): void;
-	}
-}
-
-declare var describe: {
-	(description: string, spec: () => void): void;
-	only(description: string, spec: () => void): void;
-	skip(description: string, spec: () => void): void;
-	timeout(ms: number): void;
-};
-
-declare var it: {
-	(expectation: string, assertion?: () => void): void;
-	(expectation: string, assertion?: (done: mocha.Done) => void): void;
-	only(expectation: string, assertion?: () => void): void;
-	only(expectation: string, assertion?: (done: mocha.Done) => void): void;
-	skip(expectation: string, assertion?: () => void): void;
-	skip(expectation: string, assertion?: (done: mocha.Done) => void): void;
-	timeout(ms: number): void;
-};
-
-declare function before(action: () => void): void;
-
-declare function before(action: (done: mocha.Done) => void): void;
-
-declare function after(action: () => void): void;
-
-declare function after(action: (done: mocha.Done) => void): void;
-
-declare function beforeEach(action: () => void): void;
-
-declare function beforeEach(action: (done: mocha.Done) => void): void;
-
-declare function afterEach(action: () => void): void;
-
-declare function afterEach(action: (done: mocha.Done) => void): void;

package/node_modules/balanced-match/.npmignore

@@ -1,5 +0,0 @@
-test
-.gitignore
-.travis.yml
-Makefile
-example.js