Skip to content

Commit e75407f

Browse files
DjDeveloperrDjDeveloperr
authored
cleanup (#31)
1 parent 2bfb275 commit e75407f

545 files changed

Lines changed: 3630 additions & 143371 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: npm install
2222

2323
- name: Download V8
24-
run: ./download_v8.sh
24+
run: ./scripts/download_v8.sh
2525

2626
- name: Install libffi build tools
2727
run: brew install autoconf automake libtool texinfo

‎.github/workflows/npm_napi_release.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,45 +58,45 @@ jobs:
5858
if: ${{ !contains(github.ref, 'refs/tags/') }}
5959
run: |
6060
# Bump @nativescript/ios-node-api
61-
NPM_VERSION_IOS=$(node ./scripts/get-next-version.js ios)
61+
NPM_VERSION_IOS=$(node ./scripts/get-next-version.js ios-node-api)
6262
echo NPM_VERSION_IOS=$NPM_VERSION_IOS >> $GITHUB_ENV
63-
cd packages/ios
63+
cd packages/ios-node-api
6464
npm version $NPM_VERSION_IOS --no-git-tag-version
6565
cd -
6666
6767
# Bump @nativescript/macos-node-api
68-
NPM_VERSION_MACOS=$(node ./scripts/get-next-version.js macos)
68+
NPM_VERSION_MACOS=$(node ./scripts/get-next-version.js macos-node-api)
6969
echo NPM_VERSION_MACOS=$NPM_VERSION_MACOS >> $GITHUB_ENV
70-
cd packages/macos
70+
cd packages/macos-node-api
7171
npm version $NPM_VERSION_MACOS --no-git-tag-version
7272
cd -
7373
- name: Output NPM Versions and tags
7474
id: npm_version_output
7575
run: |
76-
NPM_TAG_IOS=$(node ./scripts/get-npm-tag.js ios)
77-
NPM_TAG_MACOS=$(node ./scripts/get-npm-tag.js macos)
76+
NPM_TAG_IOS=$(node ./scripts/get-npm-tag.js ios-node-api)
77+
NPM_TAG_MACOS=$(node ./scripts/get-npm-tag.js macos-node-api)
7878
echo NPM_VERSION_IOS=$NPM_VERSION_IOS >> $GITHUB_OUTPUT
7979
echo NPM_VERSION_MACOS=$NPM_VERSION_MACOS >> $GITHUB_OUTPUT
8080
echo NPM_TAG_IOS=$NPM_TAG_IOS >> $GITHUB_OUTPUT
8181
echo NPM_TAG_MACOS=$NPM_TAG_MACOS >> $GITHUB_OUTPUT
8282
- name: Build
83-
run: ./build_all_react_native.sh
83+
run: ./scripts/build_all_react_native.sh
8484
- name: Pack @nativescript/ios-node-api
85-
working-directory: packages/ios
86-
run: npm pack
85+
working-directory: packages/ios-node-api
86+
run: npm pack --pack-destination dist
8787
- name: Pack @nativescript/macos-node-api
88-
working-directory: packages/macos
89-
run: npm pack
88+
working-directory: packages/macos-node-api
89+
run: npm pack --pack-destination dist
9090
- name: Upload npm package artifact for @nativescript/ios-node-api
9191
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
9292
with:
9393
name: nativescript-ios-node-api
94-
path: packages/ios/nativescript-ios-node-api-${{steps.npm_version_output.outputs.NPM_VERSION_IOS}}.tgz
94+
path: packages/ios-node-api/dist/nativescript-ios-node-api-${{steps.npm_version_output.outputs.NPM_VERSION_IOS}}.tgz
9595
- name: Upload npm package artifact for @nativescript/macos-node-api
9696
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
9797
with:
9898
name: nativescript-macos-node-api
99-
path: packages/macos/nativescript-macos-node-api-${{steps.npm_version_output.outputs.NPM_VERSION_MACOS}}.tgz
99+
path: packages/macos-node-api/dist/nativescript-macos-node-api-${{steps.npm_version_output.outputs.NPM_VERSION_MACOS}}.tgz
100100
publish:
101101
runs-on: ubuntu-latest
102102
environment: npm-publish
@@ -122,11 +122,11 @@ jobs:
122122
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
123123
with:
124124
name: nativescript-ios-node-api
125-
path: packages/ios
125+
path: packages/ios-node-api/dist
126126
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
127127
with:
128128
name: nativescript-macos-node-api
129-
path: packages/macos
129+
path: packages/macos-node-api/dist
130130
- name: Update npm (required for OIDC trusted publishing)
131131
run: |
132132
npm install -g npm@^11.6.2
@@ -139,7 +139,7 @@ jobs:
139139
if [ -n "${NPM_CONFIG_USERCONFIG:-}" ]; then
140140
rm -f "$NPM_CONFIG_USERCONFIG"
141141
fi
142-
npm publish packages/ios/nativescript-ios-node-api-${{env.NPM_VERSION_IOS}}.tgz --tag $NPM_TAG_IOS --access public --provenance
142+
npm publish packages/ios-node-api/dist/nativescript-ios-node-api-${{env.NPM_VERSION_IOS}}.tgz --tag $NPM_TAG_IOS --access public --provenance
143143
env:
144144
NODE_AUTH_TOKEN: ""
145145
- name: Publish @nativescript/macos-node-api package (OIDC trusted publishing)
@@ -150,21 +150,21 @@ jobs:
150150
if [ -n "${NPM_CONFIG_USERCONFIG:-}" ]; then
151151
rm -f "$NPM_CONFIG_USERCONFIG"
152152
fi
153-
npm publish packages/macos/nativescript-macos-node-api-${{env.NPM_VERSION_MACOS}}.tgz --tag $NPM_TAG_MACOS --access public --provenance
153+
npm publish packages/macos-node-api/dist/nativescript-macos-node-api-${{env.NPM_VERSION_MACOS}}.tgz --tag $NPM_TAG_MACOS --access public --provenance
154154
env:
155155
NODE_AUTH_TOKEN: ""
156156
- name: Publish @nativescript/ios-node-api package (granular token)
157157
if: ${{ vars.USE_NPM_TOKEN == 'true' }}
158158
run: |
159159
echo "Publishing @nativescript/ios-node-api@$NPM_VERSION to NPM with tag $NPM_TAG_IOS via granular token..."
160-
npm publish packages/ios/nativescript-ios-node-api-${{env.NPM_VERSION_IOS}}.tgz --tag $NPM_TAG_IOS --access public --provenance
160+
npm publish packages/ios-node-api/dist/nativescript-ios-node-api-${{env.NPM_VERSION_IOS}}.tgz --tag $NPM_TAG_IOS --access public --provenance
161161
env:
162162
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
163163
- name: Publish @nativescript/macos-node-api package (granular token)
164164
if: ${{ vars.USE_NPM_TOKEN == 'true' }}
165165
run: |
166166
echo "Publishing @nativescript/macos-node-api@$NPM_VERSION to NPM with tag $NPM_TAG_MACOS via granular token..."
167-
npm publish packages/macos/nativescript-macos-node-api-${{env.NPM_VERSION_MACOS}}.tgz --tag $NPM_TAG_MACOS --access public --provenance
167+
npm publish packages/macos-node-api/dist/nativescript-macos-node-api-${{env.NPM_VERSION_MACOS}}.tgz --tag $NPM_TAG_MACOS --access public --provenance
168168
env:
169169
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
170170
github-release:
@@ -194,20 +194,20 @@ jobs:
194194
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
195195
with:
196196
name: nativescript-ios-node-api
197-
path: packages/ios
197+
path: packages/ios-node-api/dist
198198
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
199199
with:
200200
name: nativescript-macos-node-api
201-
path: packages/macos
201+
path: packages/macos-node-api/dist
202202
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
203203
with:
204204
name: nativescript-macos-node-api
205-
path: packages/macos
205+
path: packages/macos-node-api/dist
206206
- name: Partial Changelog
207207
run: npx conventional-changelog -p angular -r2 > body.md
208208
- uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
209209
with:
210-
artifacts: "packages/macos/nativescript-macos-node-api-*.tgz,packages/ios/nativescript-ios-node-api-*.tgz"
210+
artifacts: "packages/macos-node-api/dist/nativescript-macos-node-api-*.tgz,packages/ios-node-api/dist/nativescript-ios-node-api-*.tgz"
211211
bodyFile: "body.md"
212212
prerelease: ${{needs.build.outputs.npm_tag_ios != 'latest' && needs.build.outputs.npm_tag_macos != 'latest'}}
213213
allowUpdates: true

‎.github/workflows/npm_release.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,19 @@ jobs:
5555
fi
5656
- name: Get Current Version
5757
run: |
58-
NPM_VERSION=$(node -e "console.log(require('./package.json').version);")
58+
NPM_VERSION=$(node -e "console.log(require('./packages/ios/package.json').version);")
5959
echo NPM_VERSION=$NPM_VERSION >> $GITHUB_ENV
6060
- name: Bump version for dev release
6161
if: ${{ !contains(github.ref, 'refs/tags/') }}
6262
run: |
63-
NPM_VERSION=$(node ./scripts/get-next-version.js root)
63+
NPM_VERSION=$(node ./scripts/get-next-version.js ios)
6464
echo NPM_VERSION=$NPM_VERSION >> $GITHUB_ENV
65+
cd packages/ios
6566
npm version $NPM_VERSION --no-git-tag-version
6667
- name: Output NPM Version and tag
6768
id: npm_version_output
6869
run: |
69-
NPM_TAG=$(node ./scripts/get-npm-tag.js root)
70+
NPM_TAG=$(node ./scripts/get-npm-tag.js ios)
7071
echo NPM_VERSION=$NPM_VERSION >> $GITHUB_OUTPUT
7172
echo NPM_TAG=$NPM_TAG >> $GITHUB_OUTPUT
7273
- name: Build
@@ -75,7 +76,7 @@ jobs:
7576
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7677
with:
7778
name: npm-package
78-
path: dist/nativescript-ios-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz
79+
path: packages/ios/dist/nativescript-ios-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz
7980
- name: Upload dSYMs artifact
8081
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
8182
with:
@@ -171,7 +172,7 @@ jobs:
171172
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
172173
with:
173174
name: npm-package
174-
path: dist
175+
path: packages/ios/dist
175176
- name: Update npm (required for OIDC trusted publishing)
176177
run: |
177178
npm install -g npm@^11.5.1
@@ -184,15 +185,15 @@ jobs:
184185
if [ -n "${NPM_CONFIG_USERCONFIG:-}" ]; then
185186
rm -f "$NPM_CONFIG_USERCONFIG"
186187
fi
187-
npm publish ./dist/nativescript-ios-${{env.NPM_VERSION}}.tgz --tag $NPM_TAG --access public --provenance
188+
npm publish ./packages/ios/dist/nativescript-ios-${{env.NPM_VERSION}}.tgz --tag $NPM_TAG --access public --provenance
188189
env:
189190
NODE_AUTH_TOKEN: ""
190191

191192
- name: Publish package (granular token)
192193
if: ${{ vars.USE_NPM_TOKEN == 'true' }}
193194
run: |
194195
echo "Publishing @nativescript/ios@$NPM_VERSION to NPM with tag $NPM_TAG via granular token..."
195-
npm publish ./dist/nativescript-ios-${{env.NPM_VERSION}}.tgz --tag $NPM_TAG --access public --provenance
196+
npm publish ./packages/ios/dist/nativescript-ios-${{env.NPM_VERSION}}.tgz --tag $NPM_TAG --access public --provenance
196197
env:
197198
NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
198199
github-release:
@@ -234,7 +235,7 @@ jobs:
234235
run: npx conventional-changelog -p angular -r2 > body.md
235236
- uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
236237
with:
237-
artifacts: "dist/nativescript-ios-*.tgz,dist/dSYMs/*.zip"
238+
artifacts: "packages/ios/dist/nativescript-ios-*.tgz,dist/dSYMs/*.zip"
238239
bodyFile: "body.md"
239240
prerelease: ${{needs.build.outputs.npm_tag != 'latest'}}
240241
allowUpdates: true

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ v8_build
5252
.cipd/
5353

5454
# project template
55-
/project-template-ios/.build_env_vars.sh
56-
/project-template-ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
57-
/project-template-vision/.build_env_vars.sh
58-
/project-template-vision/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
55+
/templates/ios/.build_env_vars.sh
56+
/templates/ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
57+
/templates/visionos/.build_env_vars.sh
58+
/templates/visionos/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
5959

6060
.cache/
6161

‎.travis.yml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎AppWithModules/Frameworks/TNSWidgets.xcframework/Info.plist‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎AppWithModules/Frameworks/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSData+Async.h‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎AppWithModules/Frameworks/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/NSString+Async.h‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎AppWithModules/Frameworks/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSLabel.h‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎AppWithModules/Frameworks/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/Headers/TNSProcess.h‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)