Skip to content

Commit 38bbb2e

Browse files
committed
chore: patches working
1 parent 5f34215 commit 38bbb2e

3 files changed

Lines changed: 47 additions & 23 deletions

File tree

.yarn/patches/nativescript-dev-xcode-npm-0.8.1-c14b82ef0b.patch

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,10 @@ index 70f82ea1a1c41de3ea18b66e4d89584c16a79e88..aa0096f47d9111c7d6e0abdaf5749348
2525
- // null is better for early errors
2626
- if (this.hasFile(file.path)) return null;
2727
+ const existingFile = this.hasFile(file.path);
28-
+ if (existingFile) return file;
28+
+ if (existingFile) return {...file, fileRef: existingFile.fileRef};
2929

3030
file.fileRef = this.generateUuid();
31-
32-
@@ -184,8 +184,9 @@ pbxProject.prototype.addSourceFile = function (path, opt, group) {
33-
34-
file.target = opt ? opt.target : undefined;
35-
file.uuid = this.generateUuid();
36-
-
37-
- this.addToPbxBuildFileSection(file); // PBXBuildFile
38-
+ if(file.fileRef) {
39-
+ this.addToPbxBuildFileSection(file); // PBXBuildFile
40-
+ }
41-
this.addToPbxSourcesBuildPhase(file); // PBXSourcesBuildPhase
42-
43-
return file;
31+
4432
@@ -256,19 +257,23 @@ pbxProject.prototype.addResourceFile = function(path, opt, group) {
4533
opt = opt || {};
4634

@@ -104,14 +92,6 @@ index 70f82ea1a1c41de3ea18b66e4d89584c16a79e88..aa0096f47d9111c7d6e0abdaf5749348
10492
for (i in pluginsGroupChildren) {
10593
if (pbxGroupChild(file).value == pluginsGroupChildren[i].value &&
10694
pbxGroupChild(file).comment == pluginsGroupChildren[i].comment) {
107-
@@ -916,6 +921,7 @@ function getReferenceInPbxBuildFile(buildFileReferences, fileReference) {
108-
}
109-
110-
pbxProject.prototype.addToPbxEmbedFrameworksBuildPhase = function (file) {
111-
+ console.error('addToPbxEmbedFrameworksBuildPhase', JSON.stringify(file));
112-
var sources = this.pbxEmbedFrameworksBuildPhaseObj(file.target);
113-
114-
if (sources) {
11595
@@ -1363,7 +1369,6 @@ pbxProject.prototype.buildPhaseObject = function(name, group, target) {
11696
var section = this.hash.project.objects[name],
11797
obj, sectionKey, key;

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,5 +179,9 @@
179179
"lint-staged": {
180180
"*.ts": "prettier --write"
181181
},
182-
"packageManager": "yarn@4.10.3"
182+
"packageManager": "yarn@4.10.3",
183+
"resolutions": {
184+
"nativescript-dev-xcode@0.8.1": "patch:nativescript-dev-xcode@npm%3A0.8.1#./.yarn/patches/nativescript-dev-xcode-npm-0.8.1-c14b82ef0b.patch",
185+
"@nstudio/trapezedev-project@7.2.3": "patch:@nstudio/trapezedev-project@npm%3A7.2.3#./.yarn/patches/@nstudio-trapezedev-project-npm-7.2.3-6b4d535c7d.patch"
186+
}
183187
}

yarn.lock

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,36 @@ __metadata:
10551055
languageName: node
10561056
linkType: hard
10571057

1058+
"@nstudio/trapezedev-project@patch:@nstudio/trapezedev-project@npm%3A7.2.3#./.yarn/patches/@nstudio-trapezedev-project-npm-7.2.3-6b4d535c7d.patch::locator=%40akylas%2Fnativescript-cli%40workspace%3A.":
1059+
version: 7.2.3
1060+
resolution: "@nstudio/trapezedev-project@patch:@nstudio/trapezedev-project@npm%3A7.2.3#./.yarn/patches/@nstudio-trapezedev-project-npm-7.2.3-6b4d535c7d.patch::version=7.2.3&hash=8361a2&locator=%40akylas%2Fnativescript-cli%40workspace%3A."
1061+
dependencies:
1062+
"@ionic/utils-fs": "npm:^3.1.5"
1063+
"@ionic/utils-subprocess": "npm:^2.1.8"
1064+
"@prettier/plugin-xml": "npm:^2.2.0"
1065+
"@trapezedev/gradle-parse": "npm:7.1.3"
1066+
"@xmldom/xmldom": "npm:^0.8.11"
1067+
cross-spawn: "npm:^7.0.3"
1068+
diff: "npm:^5.1.0"
1069+
env-paths: "npm:^3.0.0"
1070+
gradle-to-js: "npm:^2.0.0"
1071+
ini: "npm:^2.0.0"
1072+
kleur: "npm:^4.1.5"
1073+
lodash: "npm:^4.17.21"
1074+
plist: "npm:^3.0.4"
1075+
prettier: "npm:^2.7.1"
1076+
prompts: "npm:^2.4.2"
1077+
replace: "npm:^1.1.0"
1078+
tmp: "npm:^0.2.1"
1079+
ts-node: "npm:^10.2.1"
1080+
xcode: "npm:^3.0.1"
1081+
xml-js: "npm:^1.6.11"
1082+
xpath: "npm:^0.0.32"
1083+
yargs: "npm:^17.2.1"
1084+
checksum: 10c0/29b0e0e692965f98e02e2c085526a40d49fa09b3d1dd0e9f9aeb05586aa67ee7a0af0000e43826912cc0419f1e6ef029c936d6b460b305f195c8ca414296f3f9
1085+
languageName: node
1086+
linkType: hard
1087+
10581088
"@pkgjs/parseargs@npm:^0.11.0":
10591089
version: 0.11.0
10601090
resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -6502,6 +6532,16 @@ __metadata:
65026532
languageName: node
65036533
linkType: hard
65046534

6535+
"nativescript-dev-xcode@patch:nativescript-dev-xcode@npm%3A0.8.1#./.yarn/patches/nativescript-dev-xcode-npm-0.8.1-c14b82ef0b.patch::locator=%40akylas%2Fnativescript-cli%40workspace%3A.":
6536+
version: 0.8.1
6537+
resolution: "nativescript-dev-xcode@patch:nativescript-dev-xcode@npm%3A0.8.1#./.yarn/patches/nativescript-dev-xcode-npm-0.8.1-c14b82ef0b.patch::version=0.8.1&hash=46999c&locator=%40akylas%2Fnativescript-cli%40workspace%3A."
6538+
dependencies:
6539+
simple-plist: "npm:1.3.1"
6540+
uuid: "npm:9.0.1"
6541+
checksum: 10c0/1f4d2457aebb381e2bbdca5ea32b1b0f6dd184cb5eb62df0b6236744111ce68fb135c882c4cf9fe74e563b24f7c78291f34d6477529d48d700680d4822848335
6542+
languageName: node
6543+
linkType: hard
6544+
65056545
"ncp@npm:0.5.1":
65066546
version: 0.5.1
65076547
resolution: "ncp@npm:0.5.1"

0 commit comments

Comments
 (0)