Skip to content

Commit 92aa472

Browse files
NathanWalkerNathanWalker
authored
Merge branch 'main' into feat/eventtarget
2 parents f22db38 + c1187fe commit 92aa472

11 files changed

Lines changed: 145880 additions & 15 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ apps/**/*/platforms
4343
apps/**/*/webpack.*.js
4444
*.tgz
4545
.npmrc
46+
**/**/*.log
4647

4748
# System Files
4849
.DS_Store

‎apps/automated/project.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
"sourceRoot": "apps/automated/app",
55
"projectType": "application",
66
"prefix": "nativescript",
7+
"namedInputs": {
8+
"default": ["{projectRoot}/**/*"],
9+
"production": ["!{projectRoot}/**/*.spec.ts"]
10+
},
711
"targets": {
812
"build": {
913
"executor": "@nativescript/nx:build",
@@ -17,13 +21,17 @@
1721
},
1822
"ios": {
1923
"executor": "@nativescript/nx:build",
24+
"inputs": ["default", "^production"],
25+
"outputs": [],
2026
"options": {
2127
"noHmr": true,
2228
"platform": "ios"
2329
}
2430
},
2531
"android": {
2632
"executor": "@nativescript/nx:build",
33+
"inputs": ["default", "^production"],
34+
"outputs": [],
2735
"options": {
2836
"noHmr": true,
2937
"platform": "android"

‎apps/toolbox/project.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
"sourceRoot": "apps/toolbox/src",
55
"projectType": "application",
66
"prefix": "nativescript",
7+
"namedInputs": {
8+
"default": ["{projectRoot}/**/*"],
9+
"production": ["!{projectRoot}/**/*.spec.ts"]
10+
},
711
"targets": {
812
"build": {
913
"executor": "@nativescript/nx:build",
@@ -17,13 +21,17 @@
1721
},
1822
"ios": {
1923
"executor": "@nativescript/nx:build",
24+
"inputs": ["default", "^production"],
25+
"outputs": [],
2026
"options": {
2127
"platform": "ios",
2228
"noHmr": true
2329
}
2430
},
2531
"android": {
2632
"executor": "@nativescript/nx:build",
33+
"inputs": ["default", "^production"],
34+
"outputs": [],
2735
"options": {
2836
"platform": "android",
2937
"noHmr": true

‎apps/ui/project.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
"sourceRoot": "apps/ui/src",
55
"projectType": "application",
66
"prefix": "nativescript",
7+
"namedInputs": {
8+
"default": ["{projectRoot}/**/*"],
9+
"production": ["!{projectRoot}/**/*.spec.ts"]
10+
},
711
"targets": {
812
"build": {
913
"executor": "@nativescript/nx:build",
@@ -17,13 +21,17 @@
1721
},
1822
"ios": {
1923
"executor": "@nativescript/nx:build",
24+
"inputs": ["default", "^production"],
25+
"outputs": [],
2026
"options": {
2127
"platform": "ios",
2228
"noHmr": true
2329
}
2430
},
2531
"android": {
2632
"executor": "@nativescript/nx:build",
33+
"inputs": ["default", "^production"],
34+
"outputs": [],
2735
"options": {
2836
"platform": "android",
2937
"noHmr": true

‎nx.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
},
77
"tasksRunnerOptions": {
88
"default": {
9-
"runner": "nx/tasks-runners/default",
9+
"runner": "@nrwl/nx-cloud",
1010
"options": {
1111
"useDaemonProcess": false,
12-
"cacheableOperations": ["build", "lint", "test", "e2e"],
12+
"cacheableOperations": ["build", "lint", "test", "ios", "android", "e2e"],
1313
"canTrackAnalytics": false,
1414
"showUsageWarnings": true,
15-
"parallel": 1
15+
"parallel": 1,
16+
"accessToken": "NzRmNDM3NDgtZjlmNy00MTUwLWIxZDktYjJlZTRhMWM5ODY3fHJlYWQtd3JpdGU="
1617
}
1718
}
1819
},

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
"url": "https://github.com/NativeScript/NativeScript.git"
1919
},
2020
"dependencies": {
21+
"@nrwl/nx-cloud": "^15.0.2",
2122
"nativescript-theme-core": "^1.0.4"
2223
},
2324
"devDependencies": {
2425
"@nativescript/hook": "^2.0.0",
25-
"@nativescript/nx": "~4.0.0",
26+
"@nativescript/nx": "~4.1.0",
2627
"@nrwl/cli": "15.2.1",
2728
"@nrwl/eslint-plugin-nx": "15.2.1",
2829
"@nrwl/jest": "15.2.1",
@@ -54,6 +55,7 @@
5455
"module-alias": "^2.2.2",
5556
"nativescript": "~8.3.0",
5657
"nativescript-typedoc-theme": "1.1.0",
58+
"nx": "15.2.1",
5759
"parse-css": "git+https://github.com/tabatkins/parse-css.git",
5860
"parserlib": "^1.1.1",
5961
"prettier": "^2.6.2",
@@ -69,13 +71,11 @@
6971
"tslint-to-eslint-config": "^2.13.0",
7072
"typedoc": "^0.22.17",
7173
"typescript": "4.8.4",
72-
"zx": "^7.0.5",
73-
"nx": "15.2.1"
74+
"zx": "^7.0.5"
7475
},
7576
"lint-staged": {
7677
"**/*": [
7778
"nx format:write --files"
7879
]
7980
}
8081
}
81-

‎packages/core/project.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
"sourceRoot": "packages/core",
55
"projectType": "library",
66
"generators": {},
7+
"namedInputs": {
8+
"default": ["{projectRoot}/**/*"],
9+
"production": ["!{projectRoot}/**/*.spec.ts"]
10+
},
711
"targets": {
812
"lint": {
913
"executor": "@nrwl/linter:eslint",
@@ -13,6 +17,8 @@
1317
},
1418
"test": {
1519
"executor": "@nrwl/jest:jest",
20+
"inputs": ["default", "^production"],
21+
"outputs": ["dist/out-tsc"],
1622
"options": {
1723
"jestConfig": "packages/core/jest.config.ts",
1824
"passWithNoTests": true,
@@ -22,11 +28,11 @@
2228
"ci": {
2329
"ci": true
2430
}
25-
},
26-
"outputs": ["{workspaceRoot}/coverage/packages/core"]
31+
}
2732
},
2833
"build": {
2934
"executor": "nx:run-commands",
35+
"inputs": ["default", "^production"],
3036
"outputs": ["{workspaceRoot}/dist/packages"],
3137
"options": {
3238
"commands": [

‎packages/types-android/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/types-android",
3-
"version": "8.3.1",
3+
"version": "8.4.0",
44
"description": "NativeScript Types for Android.",
55
"homepage": "https://nativescript.org",
66
"repository": {

‎packages/types-android/src/lib/android-33.d.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="./android/android-platform-33.d.ts" />
2+
/// <reference path="./android/androidx-32.d.ts" />
3+
/// <reference path="./android/common.d.ts" />

0 commit comments

Comments
 (0)