Skip to content

Commit 116a45d

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/allow-conditional-esm-consumption
2 parents bee756c + ffad5bb commit 116a45d

File tree

26 files changed

+509
-95
lines changed

26 files changed

+509
-95
lines changed

.github/dependabot.yml

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: monthly
7+
8+
- package-ecosystem: npm
9+
directory: /
10+
schedule:
11+
interval: monthly
12+
time: "23:00"
13+
open-pull-requests-limit: 10
14+
ignore:
15+
- dependency-name: "*"
16+
update-types: ["version-update:semver-major"]
17+
18+
- package-ecosystem: npm
19+
directory: /test-app/app/src/main/assets/app
20+
schedule:
21+
interval: monthly
22+
time: "23:00"
23+
open-pull-requests-limit: 10
24+
ignore:
25+
- dependency-name: "*"
26+
update-types: ["version-update:semver-major"]
27+
28+
- package-ecosystem: npm
29+
directory: /test-app/app/src/main/assets/app/tests
30+
schedule:
31+
interval: monthly
32+
time: "23:00"
33+
open-pull-requests-limit: 10
34+
ignore:
35+
- dependency-name: "*"
36+
update-types: ["version-update:semver-major"]
37+
38+
- package-ecosystem: npm
39+
directory: /test-app/app/src/main/assets/app/tns_modules/dummy-package
40+
schedule:
41+
interval: monthly
42+
time: "23:00"
43+
open-pull-requests-limit: 10
44+
ignore:
45+
- dependency-name: "*"
46+
update-types: ["version-update:semver-major"]
47+
48+
- package-ecosystem: npm
49+
directory: /test-app/build-tools/android-metadata-generator
50+
schedule:
51+
interval: monthly
52+
time: "23:00"
53+
open-pull-requests-limit: 10
54+
ignore:
55+
- dependency-name: "*"
56+
update-types: ["version-update:semver-major"]
57+
58+
- package-ecosystem: npm
59+
directory: /test-app/build-tools/jsparser
60+
schedule:
61+
interval: monthly
62+
time: "23:00"
63+
open-pull-requests-limit: 10
64+
ignore:
65+
- dependency-name: "*"
66+
update-types: ["version-update:semver-major"]
67+
68+
- package-ecosystem: npm
69+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app
70+
schedule:
71+
interval: monthly
72+
time: "23:00"
73+
open-pull-requests-limit: 10
74+
ignore:
75+
- dependency-name: "*"
76+
update-types: ["version-update:semver-major"]
77+
78+
- package-ecosystem: npm
79+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/component/not_ns_subcomponent
80+
schedule:
81+
interval: monthly
82+
time: "23:00"
83+
open-pull-requests-limit: 10
84+
ignore:
85+
- dependency-name: "*"
86+
update-types: ["version-update:semver-major"]
87+
88+
- package-ecosystem: npm
89+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/component
90+
schedule:
91+
interval: monthly
92+
time: "23:00"
93+
open-pull-requests-limit: 10
94+
ignore:
95+
- dependency-name: "*"
96+
update-types: ["version-update:semver-major"]
97+
98+
- package-ecosystem: npm
99+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection/component1
100+
schedule:
101+
interval: monthly
102+
time: "23:00"
103+
open-pull-requests-limit: 10
104+
ignore:
105+
- dependency-name: "*"
106+
update-types: ["version-update:semver-major"]
107+
108+
- package-ecosystem: npm
109+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection/component2
110+
schedule:
111+
interval: monthly
112+
time: "23:00"
113+
open-pull-requests-limit: 10
114+
ignore:
115+
- dependency-name: "*"
116+
update-types: ["version-update:semver-major"]
117+
118+
- package-ecosystem: npm
119+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection/component2/subcomponent2.1
120+
schedule:
121+
interval: monthly
122+
time: "23:00"
123+
open-pull-requests-limit: 10
124+
ignore:
125+
- dependency-name: "*"
126+
update-types: ["version-update:semver-major"]
127+
128+
- package-ecosystem: npm
129+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/components_collection
130+
schedule:
131+
interval: monthly
132+
time: "23:00"
133+
open-pull-requests-limit: 10
134+
ignore:
135+
- dependency-name: "*"
136+
update-types: ["version-update:semver-major"]
137+
138+
- package-ecosystem: npm
139+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/not_ns_module/not_ns_module_submodule
140+
schedule:
141+
interval: monthly
142+
time: "23:00"
143+
open-pull-requests-limit: 10
144+
ignore:
145+
- dependency-name: "*"
146+
update-types: ["version-update:semver-major"]
147+
148+
- package-ecosystem: npm
149+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules/not_ns_module
150+
schedule:
151+
interval: monthly
152+
time: "23:00"
153+
open-pull-requests-limit: 10
154+
ignore:
155+
- dependency-name: "*"
156+
update-types: ["version-update:semver-major"]
157+
158+
- package-ecosystem: npm
159+
directory: /test-app/build-tools/jsparser/tests/cases/mini_app/app/tns_modules
160+
schedule:
161+
interval: monthly
162+
time: "23:00"
163+
open-pull-requests-limit: 10
164+
ignore:
165+
- dependency-name: "*"
166+
update-types: ["version-update:semver-major"]
167+
168+
- package-ecosystem: npm
169+
directory: /test-app/build-tools/jsparser/tests
170+
schedule:
171+
interval: monthly
172+
time: "23:00"
173+
open-pull-requests-limit: 10
174+
ignore:
175+
- dependency-name: "*"
176+
update-types: ["version-update:semver-major"]
177+
178+
- package-ecosystem: npm
179+
directory: /test-app
180+
schedule:
181+
interval: monthly
182+
time: "23:00"
183+
open-pull-requests-limit: 10
184+
ignore:
185+
- dependency-name: "*"
186+
update-types: ["version-update:semver-major"]
187+
188+
- package-ecosystem: npm
189+
directory: /test-app/tools
190+
schedule:
191+
interval: monthly
192+
time: "23:00"
193+
open-pull-requests-limit: 10
194+
ignore:
195+
- dependency-name: "*"
196+
update-types: ["version-update:semver-major"]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Dependency Review Action
2+
#
3+
# This Action will scan dependency manifest files that change as part of a Pull Request,
4+
# surfacing known-vulnerable versions of the packages declared or updated in the PR.
5+
# Once installed, if the workflow run is marked as required,
6+
# PRs introducing known-vulnerable packages will be blocked from merging.
7+
#
8+
# Source repository: https://github.com/actions/dependency-review-action
9+
name: 'Dependency Review'
10+
on: [pull_request]
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
dependency-review:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: 'Checkout Repository'
20+
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
21+
- name: 'Dependency Review'
22+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0

.github/workflows/npm_release.yml

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ on:
88
env:
99
NPM_TAG: "next"
1010
EMULATOR_NAME: "runtime-emu"
11-
NDK_VERSION: r27
11+
NDK_VERSION: r27d
1212
ANDROID_API: 33
1313
ANDROID_ABI: x86_64
1414
NDK_ARCH: darwin
1515

16+
permissions:
17+
contents: read
18+
1619
jobs:
1720
build:
1821
name: Build
@@ -21,21 +24,26 @@ jobs:
2124
npm_version: ${{ steps.npm_version_output.outputs.NPM_VERSION }}
2225
npm_tag: ${{ steps.npm_version_output.outputs.NPM_TAG }}
2326
steps:
24-
- uses: actions/checkout@v3
27+
- name: Harden the runner (Audit all outbound calls)
28+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
29+
with:
30+
egress-policy: audit
31+
32+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2533
with:
2634
fetch-depth: 0
2735
submodules: true
28-
- uses: actions/setup-node@v3
36+
- uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
2937
with:
3038
node-version: 22
3139
registry-url: "https://registry.npmjs.org"
32-
- uses: actions/setup-java@v3
40+
- uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3.14.1
3341
with:
3442
distribution: "temurin"
3543
java-version: "21"
3644
cache: gradle
3745
- name: Setup Android SDK
38-
uses: android-actions/setup-android@v2
46+
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
3947
- name: Homebrew dependencies
4048
run: |
4149
brew install wget
@@ -73,12 +81,12 @@ jobs:
7381
- name: Build npm package
7482
run: ./gradlew -PgitCommitVersion=${{ github.sha }} -PnoCCache --stacktrace
7583
- name: Upload npm package artifact
76-
uses: actions/upload-artifact@v4
84+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7785
with:
7886
name: npm-package
7987
path: dist/nativescript-android-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz
8088
- name: Upload debug symbols
81-
uses: actions/upload-artifact@v4
89+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8290
with:
8391
name: debug-symbols
8492
path: test-app/runtime/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/*
@@ -88,20 +96,25 @@ jobs:
8896
runs-on: macos-13
8997
needs: build
9098
steps:
91-
- uses: actions/checkout@v3
99+
- name: Harden the runner (Audit all outbound calls)
100+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
101+
with:
102+
egress-policy: audit
103+
104+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
92105
with:
93106
submodules: true
94-
- uses: actions/setup-node@v3
107+
- uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
95108
with:
96109
node-version: 22
97110
registry-url: "https://registry.npmjs.org"
98-
- uses: actions/setup-java@v3
111+
- uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3.14.1
99112
with:
100113
distribution: "temurin"
101114
java-version: "21"
102115
cache: gradle
103116
- name: Setup Android SDK
104-
uses: android-actions/setup-android@v2
117+
uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
105118
- name: Homebrew dependencies
106119
run: |
107120
brew install wget
@@ -123,7 +136,7 @@ jobs:
123136
- name: SBG tests
124137
run: ./gradlew runSbgTests --stacktrace
125138
- name: Run unit tests
126-
uses: ReactiveCircus/android-emulator-runner@v2
139+
uses: ReactiveCircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # v2.34.0
127140
with:
128141
api-level: ${{env.ANDROID_API}}
129142
# this is needed on API 30+
@@ -142,7 +155,12 @@ jobs:
142155
NPM_VERSION: ${{needs.build.outputs.npm_version}}
143156
NPM_TAG: ${{needs.build.outputs.npm_tag}}
144157
steps:
145-
- uses: actions/setup-node@v3
158+
- name: Harden the runner (Audit all outbound calls)
159+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
160+
with:
161+
egress-policy: audit
162+
163+
- uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
146164
with:
147165
node-version: 22
148166
registry-url: "https://registry.npmjs.org"
@@ -168,10 +186,15 @@ jobs:
168186
env:
169187
NPM_VERSION: ${{needs.build.outputs.npm_version}}
170188
steps:
171-
- uses: actions/checkout@v3
189+
- name: Harden the runner (Audit all outbound calls)
190+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
191+
with:
192+
egress-policy: audit
193+
194+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
172195
with:
173196
fetch-depth: 0
174-
- uses: actions/setup-node@v3
197+
- uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
175198
with:
176199
node-version: 22
177200
- name: Setup
@@ -189,7 +212,7 @@ jobs:
189212
run: zip -r debug-symbols.zip .
190213
- name: Partial Changelog
191214
run: npx conventional-changelog -p angular -r2 > body.md
192-
- uses: ncipollo/release-action@v1
215+
- uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
193216
with:
194217
artifacts: "dist/nativescript-android-*.tgz,dist/debug-symbols/debug-symbols.zip"
195218
bodyFile: "body.md"

0 commit comments

Comments
 (0)