Skip to content

Commit

Permalink
Merge branch 'main' into feat/eventtarget
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanWalker committed Nov 29, 2022
2 parents f22db38 + c1187fe commit 92aa472
Show file tree
Hide file tree
Showing 11 changed files with 145,880 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ apps/**/*/platforms
apps/**/*/webpack.*.js
*.tgz
.npmrc
**/**/*.log

# System Files
.DS_Store
Expand Down
8 changes: 8 additions & 0 deletions apps/automated/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"sourceRoot": "apps/automated/app",
"projectType": "application",
"prefix": "nativescript",
"namedInputs": {
"default": ["{projectRoot}/**/*"],
"production": ["!{projectRoot}/**/*.spec.ts"]
},
"targets": {
"build": {
"executor": "@nativescript/nx:build",
Expand All @@ -17,13 +21,17 @@
},
"ios": {
"executor": "@nativescript/nx:build",
"inputs": ["default", "^production"],
"outputs": [],
"options": {
"noHmr": true,
"platform": "ios"
}
},
"android": {
"executor": "@nativescript/nx:build",
"inputs": ["default", "^production"],
"outputs": [],
"options": {
"noHmr": true,
"platform": "android"
Expand Down
8 changes: 8 additions & 0 deletions apps/toolbox/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"sourceRoot": "apps/toolbox/src",
"projectType": "application",
"prefix": "nativescript",
"namedInputs": {
"default": ["{projectRoot}/**/*"],
"production": ["!{projectRoot}/**/*.spec.ts"]
},
"targets": {
"build": {
"executor": "@nativescript/nx:build",
Expand All @@ -17,13 +21,17 @@
},
"ios": {
"executor": "@nativescript/nx:build",
"inputs": ["default", "^production"],
"outputs": [],
"options": {
"platform": "ios",
"noHmr": true
}
},
"android": {
"executor": "@nativescript/nx:build",
"inputs": ["default", "^production"],
"outputs": [],
"options": {
"platform": "android",
"noHmr": true
Expand Down
8 changes: 8 additions & 0 deletions apps/ui/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"sourceRoot": "apps/ui/src",
"projectType": "application",
"prefix": "nativescript",
"namedInputs": {
"default": ["{projectRoot}/**/*"],
"production": ["!{projectRoot}/**/*.spec.ts"]
},
"targets": {
"build": {
"executor": "@nativescript/nx:build",
Expand All @@ -17,13 +21,17 @@
},
"ios": {
"executor": "@nativescript/nx:build",
"inputs": ["default", "^production"],
"outputs": [],
"options": {
"platform": "ios",
"noHmr": true
}
},
"android": {
"executor": "@nativescript/nx:build",
"inputs": ["default", "^production"],
"outputs": [],
"options": {
"platform": "android",
"noHmr": true
Expand Down
7 changes: 4 additions & 3 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"runner": "@nrwl/nx-cloud",
"options": {
"useDaemonProcess": false,
"cacheableOperations": ["build", "lint", "test", "e2e"],
"cacheableOperations": ["build", "lint", "test", "ios", "android", "e2e"],
"canTrackAnalytics": false,
"showUsageWarnings": true,
"parallel": 1
"parallel": 1,
"accessToken": "NzRmNDM3NDgtZjlmNy00MTUwLWIxZDktYjJlZTRhMWM5ODY3fHJlYWQtd3JpdGU="
}
}
},
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
"url": "https://github.com/NativeScript/NativeScript.git"
},
"dependencies": {
"@nrwl/nx-cloud": "^15.0.2",
"nativescript-theme-core": "^1.0.4"
},
"devDependencies": {
"@nativescript/hook": "^2.0.0",
"@nativescript/nx": "~4.0.0",
"@nativescript/nx": "~4.1.0",
"@nrwl/cli": "15.2.1",
"@nrwl/eslint-plugin-nx": "15.2.1",
"@nrwl/jest": "15.2.1",
Expand Down Expand Up @@ -54,6 +55,7 @@
"module-alias": "^2.2.2",
"nativescript": "~8.3.0",
"nativescript-typedoc-theme": "1.1.0",
"nx": "15.2.1",
"parse-css": "git+https://github.com/tabatkins/parse-css.git",
"parserlib": "^1.1.1",
"prettier": "^2.6.2",
Expand All @@ -69,13 +71,11 @@
"tslint-to-eslint-config": "^2.13.0",
"typedoc": "^0.22.17",
"typescript": "4.8.4",
"zx": "^7.0.5",
"nx": "15.2.1"
"zx": "^7.0.5"
},
"lint-staged": {
"**/*": [
"nx format:write --files"
]
}
}

10 changes: 8 additions & 2 deletions packages/core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"sourceRoot": "packages/core",
"projectType": "library",
"generators": {},
"namedInputs": {
"default": ["{projectRoot}/**/*"],
"production": ["!{projectRoot}/**/*.spec.ts"]
},
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
Expand All @@ -13,6 +17,8 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"inputs": ["default", "^production"],
"outputs": ["dist/out-tsc"],
"options": {
"jestConfig": "packages/core/jest.config.ts",
"passWithNoTests": true,
Expand All @@ -22,11 +28,11 @@
"ci": {
"ci": true
}
},
"outputs": ["{workspaceRoot}/coverage/packages/core"]
}
},
"build": {
"executor": "nx:run-commands",
"inputs": ["default", "^production"],
"outputs": ["{workspaceRoot}/dist/packages"],
"options": {
"commands": [
Expand Down
2 changes: 1 addition & 1 deletion packages/types-android/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nativescript/types-android",
"version": "8.3.1",
"version": "8.4.0",
"description": "NativeScript Types for Android.",
"homepage": "https://nativescript.org",
"repository": {
Expand Down
3 changes: 3 additions & 0 deletions packages/types-android/src/lib/android-33.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/// <reference path="./android/android-platform-33.d.ts" />
/// <reference path="./android/androidx-32.d.ts" />
/// <reference path="./android/common.d.ts" />

0 comments on commit 92aa472

Please sign in to comment.