chore: merge fix

Author: farfromrefug

lib/options.ts

@@ -254,7 +254,6 @@ export class Options {
 			dtsGeneratorPath: { type: OptionType.String, hasSensitiveValue: true },
 			filter: { type: OptionType.String, hasSensitiveValue: true },
 			lookupPath: { type: OptionType.String, hasSensitiveValue: true },
-			dtsGeneratorPath: { type: OptionType.String, hasSensitiveValue: true },
 			super: { type: OptionType.String, hasSensitiveValue: true },
 			skipDeclarations: { type: OptionType.Boolean, hasSensitiveValue: false },
 			git: {

package.json

@@ -60,8 +60,8 @@
     "@nativescript/doctor": "2.0.17",
     "@nativescript/hook": "3.0.4",
     "@npmcli/arborist": "9.1.6",
-    "@rigor789/resolve-package-path": "1.0.7",
     "@nstudio/trapezedev-project": "7.2.3",
+    "@rigor789/resolve-package-path": "1.0.7",
     "archiver": "7.0.1",
     "axios": "1.13.2",
     "byline": "5.0.0",

yarn.lock

@@ -9,9 +9,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@akylas/nativescript-cli@workspace:."
   dependencies:
-    "@foxt/js-srp": "npm:^0.0.3-patch2"
+    "@foxt/js-srp": "npm:0.0.3-patch2"
     "@nativescript/doctor": "npm:2.0.17"
-    "@npmcli/arborist": "npm:^9.1.4"
+    "@nativescript/hook": "npm:3.0.4"
+    "@npmcli/arborist": "npm:9.1.6"
     "@nstudio/trapezedev-project": "npm:7.2.3"
     "@rigor789/resolve-package-path": "npm:1.0.7"
     "@types/archiver": "npm:^6.0.3"
@@ -41,8 +42,8 @@ __metadata:
     "@types/ws": "npm:8.18.1"
     "@types/xml2js": "npm:0.4.14"
     "@types/yargs": "npm:17.0.33"
-    archiver: "npm:^7.0.1"
-    axios: "npm:1.12.2"
+    archiver: "npm:7.0.1"
+    axios: "npm:1.13.2"
     braces: "npm:>=3.0.3"
     byline: "npm:5.0.0"
     chai: "npm:5.3.3"
@@ -75,7 +76,7 @@ __metadata:
     log4js: "npm:6.9.1"
     marked: "npm:15.0.12"
     marked-terminal: "npm:7.3.0"
-    minimatch: "npm:10.0.3"
+    minimatch: "npm:10.1.1"
     mkdirp: "npm:3.0.1"
     mocha: "npm:11.7.4"
     mute-stream: "npm:2.0.0"
@@ -92,14 +93,14 @@ __metadata:
     proxy-lib: "npm:0.4.1"
     qr-image: "npm:3.2.0"
     qrcode-terminal: "npm:0.12.0"
-    semver: "npm:7.7.2"
+    semver: "npm:7.7.3"
     shelljs: "npm:0.10.0"
-    simple-git: "npm:3.28.0"
+    simple-git: "npm:3.30.0"
     simple-plist: "npm:1.4.0"
     sinon: "npm:19.0.5"
     source-map: "npm:0.7.6"
     source-map-support: "npm:0.5.21"
-    tar: "npm:7.5.1"
+    tar: "npm:7.5.2"
     ts-morph: "npm:25.0.1"
     tunnel: "npm:0.0.6"
     typescript: "npm:5.7.3"
@@ -183,10 +184,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@foxt/js-srp@npm:^0.0.3-patch2":
-  version: 0.0.3
-  resolution: "@foxt/js-srp@npm:0.0.3"
-  checksum: 10c0/b38df00e80473e4e255e36bfeef242da8f38c0607ab61b2842c911a8472c36ff885ba32d34131bca666411aa63a74692050ea34f74e292ed3468aabe7058208c
+"@foxt/js-srp@npm:0.0.3-patch2":
+  version: 0.0.3-patch2
+  resolution: "@foxt/js-srp@npm:0.0.3-patch2"
+  checksum: 10c0/44a5784808abbdef0bcbe47d45d4ca8f7579194af3190b0177e3e8483d651926d97496c54cab571b4ffa2e16947490a57e0c434307609a34d2055e0cc693135d
   languageName: node
   linkType: hard
 
@@ -714,6 +715,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nativescript/hook@npm:3.0.4":
+  version: 3.0.4
+  resolution: "@nativescript/hook@npm:3.0.4"
+  dependencies:
+    glob: "npm:^11.0.0"
+    mkdirp: "npm:^3.0.1"
+  checksum: 10c0/a383e5f42b38a4da6c3cce379f0899abb5ff247b94b5cfa77e6ffb4e898c895457ccd08b0d03bb7f88d848b90f8e23d3e0879157f2911d2932b4738820320651
+  languageName: node
+  linkType: hard
+
 "@nodelib/fs.scandir@npm:2.1.5":
   version: 2.1.5
   resolution: "@nodelib/fs.scandir@npm:2.1.5"
@@ -787,9 +798,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/arborist@npm:^9.1.4":
-  version: 9.1.5
-  resolution: "@npmcli/arborist@npm:9.1.5"
+"@npmcli/arborist@npm:9.1.6":
+  version: 9.1.6
+  resolution: "@npmcli/arborist@npm:9.1.6"
   dependencies:
     "@isaacs/string-locale-compare": "npm:^1.1.0"
     "@npmcli/fs": "npm:^4.0.0"
@@ -826,7 +837,7 @@ __metadata:
     walk-up-path: "npm:^4.0.0"
   bin:
     arborist: bin/index.js
-  checksum: 10c0/40618f54cfa7de5ee14a25fea09541ac0af4399f19c6ea5e32ddc0bd0d961105c039d3c7b08e99d38e4bba547f19a69957c48ee5ae2909ac67f5e7339a71bc9a
+  checksum: 10c0/359e2a278fda83e60bdfdc410c1d439753d8d390a475e934d31d3fd250a3f2b0693dc7c64f6e9ed9cc5bd0186b21b50c3fc1c5befc0c6ff4996d332477dbe1b1
   languageName: node
   linkType: hard
 
@@ -1944,7 +1955,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"archiver@npm:^7.0.1":
+"archiver@npm:7.0.1":
   version: 7.0.1
   resolution: "archiver@npm:7.0.1"
   dependencies:
@@ -2112,14 +2123,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:1.12.2":
-  version: 1.12.2
-  resolution: "axios@npm:1.12.2"
+"axios@npm:1.13.2":
+  version: 1.13.2
+  resolution: "axios@npm:1.13.2"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.4"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/80b063e318cf05cd33a4d991cea0162f3573481946f9129efb7766f38fde4c061c34f41a93a9f9521f02b7c9565ccbc197c099b0186543ac84a24580017adfed
+  checksum: 10c0/e8a42e37e5568ae9c7a28c348db0e8cf3e43d06fcbef73f0048669edfe4f71219664da7b6cc991b0c0f01c28a48f037c515263cb79be1f1ae8ff034cd813867b
   languageName: node
   linkType: hard
 
@@ -4406,6 +4417,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^11.0.0":
+  version: 11.1.0
+  resolution: "glob@npm:11.1.0"
+  dependencies:
+    foreground-child: "npm:^3.3.1"
+    jackspeak: "npm:^4.1.1"
+    minimatch: "npm:^10.1.1"
+    minipass: "npm:^7.1.2"
+    package-json-from-dist: "npm:^1.0.0"
+    path-scurry: "npm:^2.0.0"
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 10c0/1ceae07f23e316a6fa74581d9a74be6e8c2e590d2f7205034dd5c0435c53f5f7b712c2be00c3b65bf0a49294a1c6f4b98cd84c7637e29453b5aa13b79f1763a2
+  languageName: node
+  linkType: hard
+
 "glob@npm:^11.0.3":
   version: 11.0.3
   resolution: "glob@npm:11.0.3"
@@ -6116,12 +6143,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:10.0.3, minimatch@npm:^10.0.3":
-  version: 10.0.3
-  resolution: "minimatch@npm:10.0.3"
+"minimatch@npm:10.1.1, minimatch@npm:^10.1.1":
+  version: 10.1.1
+  resolution: "minimatch@npm:10.1.1"
   dependencies:
     "@isaacs/brace-expansion": "npm:^5.0.0"
-  checksum: 10c0/e43e4a905c5d70ac4cec8530ceaeccb9c544b1ba8ac45238e2a78121a01c17ff0c373346472d221872563204eabe929ad02669bb575cb1f0cc30facab369f70f
+  checksum: 10c0/c85d44821c71973d636091fddbfbffe62370f5ee3caf0241c5b60c18cd289e916200acb2361b7e987558cd06896d153e25d505db9fc1e43e6b4b6752e2702902
   languageName: node
   linkType: hard
 
@@ -6143,6 +6170,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^10.0.3":
+  version: 10.0.3
+  resolution: "minimatch@npm:10.0.3"
+  dependencies:
+    "@isaacs/brace-expansion": "npm:^5.0.0"
+  checksum: 10c0/e43e4a905c5d70ac4cec8530ceaeccb9c544b1ba8ac45238e2a78121a01c17ff0c373346472d221872563204eabe929ad02669bb575cb1f0cc30facab369f70f
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^5.1.0":
   version: 5.1.6
   resolution: "minimatch@npm:5.1.6"
@@ -8077,6 +8113,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:7.7.3":
+  version: 7.7.3
+  resolution: "semver@npm:7.7.3"
+  bin:
+    semver: bin/semver.js
+  checksum: 10c0/4afe5c986567db82f44c8c6faef8fe9df2a9b1d98098fc1721f57c696c4c21cebd572f297fc21002f81889492345b8470473bc6f4aff5fb032a6ea59ea2bc45e
+  languageName: node
+  linkType: hard
+
 "semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
@@ -8255,14 +8300,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-git@npm:3.28.0":
-  version: 3.28.0
-  resolution: "simple-git@npm:3.28.0"
+"simple-git@npm:3.30.0":
+  version: 3.30.0
+  resolution: "simple-git@npm:3.30.0"
   dependencies:
     "@kwsites/file-exists": "npm:^1.1.1"
     "@kwsites/promise-deferred": "npm:^1.1.1"
     debug: "npm:^4.4.0"
-  checksum: 10c0/d78b8f5884967513efa3d3ee419be421207367c65b680ee45f4c9571f909ba89933ffa27d6d7972fbb759bb30b00e435e35ade2b9e788661feb996da6f461932
+  checksum: 10c0/ca123580944d55c7f93d17f7a89b39cd43245916b35ed3a8b1269d1f2ae9200e17f098e42af4a2572313726f1273641cbe0748a1ea37d8c803c181fb69068b1d
   languageName: node
   linkType: hard
 
@@ -8845,16 +8890,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:7.5.1":
-  version: 7.5.1
-  resolution: "tar@npm:7.5.1"
+"tar@npm:7.5.2":
+  version: 7.5.2
+  resolution: "tar@npm:7.5.2"
   dependencies:
     "@isaacs/fs-minipass": "npm:^4.0.0"
     chownr: "npm:^3.0.0"
     minipass: "npm:^7.1.2"
     minizlib: "npm:^3.1.0"
     yallist: "npm:^5.0.0"
-  checksum: 10c0/0dad0596a61586180981133b20c32cfd93c5863c5b7140d646714e6ea8ec84583b879e5dc3928a4d683be6e6109ad7ea3de1cf71986d5194f81b3a016c8858c9
+  checksum: 10c0/a7d8b801139b52f93a7e34830db0de54c5aa45487c7cb551f6f3d44a112c67f1cb8ffdae856b05fd4f17b1749911f1c26f1e3a23bbe0279e17fd96077f13f467
   languageName: node
   linkType: hard