Skip to content

Commit

Permalink
chore: nx migrate @nativescript/plugin-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanWalker committed Aug 30, 2024
1 parent ff516e0 commit ef85fce
Show file tree
Hide file tree
Showing 37 changed files with 216 additions and 251 deletions.
18 changes: 12 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
Expand All @@ -23,13 +23,19 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nrwl/nx/typescript"],
"rules": {}
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:@nx/typescript"],
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
"extends": ["plugin:@nx/javascript"],
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["references.d.ts"],
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ Thumbs.db

*.tgz
packages/**/angular/dist

.nx/cache
.nx/workspace-data
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
/dist
/coverage
native-src

/.nx/cache
/.nx/workspace-data
4 changes: 2 additions & 2 deletions apps/demo-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@nativescript/firebase-ui": "file:../../dist/packages/firebase-ui"
},
"devDependencies": {
"@nativescript/android": "~8.4.0",
"@nativescript/ios": "~8.4.0"
"@nativescript/android": "~8.8.0",
"@nativescript/ios": "~8.8.0"
}
}
11 changes: 4 additions & 7 deletions apps/demo-angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -30,7 +30,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -43,7 +43,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -54,10 +54,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["apps/demo-angular/**/*.ts"]
}
"executor": "@nx/eslint:lint"
}
}
}
4 changes: 2 additions & 2 deletions apps/demo-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@nativescript/firebase-ui": "file:../../packages/firebase-ui"
},
"devDependencies": {
"@nativescript/android": "~8.4.0",
"@nativescript/ios": "~8.4.0"
"@nativescript/android": "~8.8.0",
"@nativescript/ios": "~8.8.0"
}
}
11 changes: 4 additions & 7 deletions apps/demo-vue/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -29,7 +29,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -42,7 +42,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -53,10 +53,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["apps/demo-vue/**/*.ts"]
}
"executor": "@nx/eslint:lint"
}
}
}
4 changes: 2 additions & 2 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@nativescript/firebase-ui": "file:../../packages/firebase-ui"
},
"devDependencies": {
"@nativescript/android": "~8.5.3",
"@nativescript/ios": "~8.5.2"
"@nativescript/android": "~8.8.0",
"@nativescript/ios": "~8.8.0"
}
}
11 changes: 4 additions & 7 deletions apps/demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -30,7 +30,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -43,7 +43,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -54,10 +54,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["apps/demo/**/*.ts"]
}
"executor": "@nx/eslint:lint"
}
}
}
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { getJestProjects } = require('@nrwl/jest');
const { getJestProjects } = require('@nx/jest');

export default { projects: [...getJestProjects()] };
7 changes: 7 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"migrations": [
{ "cli": "nx", "version": "5.2.0", "description": "Migrate tools to 5.2.0", "implementation": "./src/migrations/update-5-2-0/update-5-2-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.2.0" },
{ "cli": "nx", "version": "5.3.0", "description": "Migrate tools to 5.3.0", "implementation": "./src/migrations/update-5-3-0/update-5-3-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.3.0" },
{ "cli": "nx", "version": "5.4.0", "description": "Migrate tools to 5.4.0", "implementation": "./src/migrations/update-5-4-0/update-5-4-0", "package": "@nativescript/plugin-tools", "name": "update-to-5.4.0" }
]
}
33 changes: 20 additions & 13 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,42 @@
{
"npmScope": "nativescript",
"affected": {
"defaultBase": "master"
},
"workspaceLayout": {
"appsDir": "apps",
"libsDir": "packages"
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "build.all", "lint", "test", "e2e"],
"runtimeCacheInputs": ["node -v"],
"parallel": 1,
"useDaemonProcess": false
"runtimeCacheInputs": ["node -v"]
}
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
"production": ["default", "!{projectRoot}/.eslintrc.json"]
"production": ["default", "!{projectRoot}/.eslintrc.json", "!{projectRoot}/src/test-setup.[jt]s"]
},
"targetDefaults": {
"build": {
"inputs": ["production", "^production"]
"inputs": ["production", "^production"],
"cache": true
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
},
"build.all": {
"cache": true
},
"test": {
"cache": true
},
"e2e": {
"cache": true
}
}
},
"useDaemonProcess": false,
"parallel": 1,
"useInferencePlugins": false,
"defaultBase": "master"
}
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "3.3.1",
"license": "MIT",
"scripts": {
"postinstall": "husky install && npx ts-patch install",
"postinstall": "husky && npx ts-patch install",
"setup": "npx rimraf node_modules package-lock.json dist tmp yarn.lock && yarn config set ignore-engines true && ns package-manager set npm && yarn",
"start": "nps",
"add": "nx g @nativescript/plugin-tools:add-package",
Expand All @@ -17,32 +17,32 @@
},
"private": true,
"devDependencies": {
"@angular-devkit/build-angular": "^15.0.0",
"@angular/animations": "^15.0.0",
"@angular/common": "^15.0.0",
"@angular/compiler": "^15.0.0",
"@angular/compiler-cli": "^15.0.0",
"@angular/core": "^15.0.0",
"@angular/forms": "^15.0.0",
"@angular/platform-browser": "^15.0.0",
"@angular/platform-browser-dynamic": "^15.0.0",
"@angular/router": "^15.0.0",
"@nativescript/angular": "^15.0.0",
"@nativescript/core": "~8.4.0",
"@nativescript/plugin-tools": "5.1.0",
"@nativescript/types": "~8.4.0",
"@angular-devkit/build-angular": "^18.0.0",
"@angular/animations": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/router": "^18.0.0",
"@nativescript/angular": "^18.0.0",
"@nativescript/core": "~8.8.0",
"@nativescript/plugin-tools": "5.4.1",
"@nativescript/types": "~8.8.0",
"@nativescript/webpack": "~5.0.5",
"@ngtools/webpack": "^15.0.0",
"@ngtools/webpack": "^18.0.0",
"conventional-changelog-cli": "^2.2.2",
"husky": "^8.0.0",
"husky": "~9.0.0",
"nativescript-vue": "~2.9.0",
"nativescript-vue-template-compiler": "~2.9.0",
"ng-packagr": "^15.0.0",
"rxjs": "~7.6.0",
"ng-packagr": "^18.0.0",
"rxjs": "~7.8.0",
"stacktrace-js": "~2.0.2",
"typescript": "~4.8.0",
"typescript": "~5.5.0",
"vue": "~2.6.12",
"zone.js": "~0.13.0"
"zone.js": "~0.14.0"
},
"lint-staged": {
"**/*.{js,ts,scss,json,html}": [
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase-admob/angular/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{
"files": ["*.ts", "*.tsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"allowCircularSelfDependency": true
Expand Down
14 changes: 5 additions & 9 deletions packages/firebase-admob/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sourceRoot": "packages/firebase-admob",
"targets": {
"build": {
"executor": "@nrwl/js:tsc",
"executor": "@nx/js:tsc",
"options": {
"outputPath": "dist/packages/firebase-admob",
"tsConfig": "packages/firebase-admob/tsconfig.json",
Expand Down Expand Up @@ -36,7 +36,7 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
}
]
},
Expand All @@ -50,11 +50,10 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
},
{
"target": "build",
"projects": "self"
"target": "build"
}
]
},
Expand All @@ -66,10 +65,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["packages/firebase-admob/**/*.ts"]
}
"executor": "@nx/eslint:lint"
}
}
}
Loading

0 comments on commit ef85fce

Please sign in to comment.