Skip to content

Commit

Permalink
feat: nx version upgrade (#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
udayvunnam authored Nov 28, 2020
1 parent 640572e commit 50dbf89
Show file tree
Hide file tree
Showing 8 changed files with 154 additions and 134 deletions.
63 changes: 31 additions & 32 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,41 @@
{
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module",
"project": "./tsconfig.*?.json"
},
"ignorePatterns": ["**/*"],
"plugins": ["@typescript-eslint", "@nrwl/nx"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"prettier/@typescript-eslint"
],
"rules": {
"@typescript-eslint/explicit-member-accessibility": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-parameter-properties": "off",
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{ "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] }
]
}
]
},
"plugins": ["@nrwl/nx"],
"overrides": [
{
"files": ["*.tsx"],
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"parserOptions": {
"project": "./tsconfig.*?.json"
},
"rules": {
"@typescript-eslint/no-unused-vars": "off"
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"parserOptions": {
"project": "./tsconfig.*?.json"
},
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
}
]
}
6 changes: 5 additions & 1 deletion apps/breadcrumb-demo/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{ "extends": "../../.eslintrc.json", "ignorePatterns": ["!**/*"], "rules": {} }
{
"extends": "../../.eslintrc.json",
"ignorePatterns": ["!**/*"],
"rules": {}
}
6 changes: 5 additions & 1 deletion apps/demo/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{ "extends": "../../.eslintrc.json", "ignorePatterns": ["!**/*"], "rules": {} }
{
"extends": "../../.eslintrc.json",
"ignorePatterns": ["!**/*"],
"rules": {}
}
6 changes: 5 additions & 1 deletion apps/got-demo/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{ "extends": "../../.eslintrc.json", "ignorePatterns": ["!**/*"], "rules": {} }
{
"extends": "../../.eslintrc.json",
"ignorePatterns": ["!**/*"],
"rules": {}
}
6 changes: 5 additions & 1 deletion apps/simple-demo/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{ "extends": "../../.eslintrc.json", "ignorePatterns": ["!**/*"], "rules": {} }
{
"extends": "../../.eslintrc.json",
"ignorePatterns": ["!**/*"],
"rules": {}
}
86 changes: 29 additions & 57 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,74 +1,46 @@
{
"migrations": [
{
"version": "10.0.0-beta.0",
"description": "Add default branch to nx.json",
"factory": "./src/migrations/update-10-0-0/update-10-0-0",
"version": "10.4.0-beta.5",
"description": "Add an explicit dependency on @nrwl/tao",
"factory": "./src/migrations/update-10-4-0/add-explicit-dep-on-tao",
"package": "@nrwl/workspace",
"name": "add-default-branch-to-nx-json"
"name": "add-explicit-dep-on-tao"
},
{
"version": "10.0.0-beta.0",
"description": "Migrate tsconfigs to solution style tsconfigs",
"factory": "./src/migrations/update-10-0-0/solution-tsconfigs",
"package": "@nrwl/workspace",
"name": "solution-tsconfigs"
},
{
"version": "10.0.1-beta.0",
"description": "Migrate .eslintrc files to reference new tsconfig",
"factory": "./src/migrations/update-10-0-1/migrate-eslintrc",
"package": "@nrwl/workspace",
"name": "migrate-eslintrc-tsconfig"
},
{
"version": "10.1.0-beta.0",
"description": "Migrate .eslintrc files to use tsconfig with a wildcard",
"factory": "./src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard",
"package": "@nrwl/workspace",
"name": "migrate-eslintrc-tsconfig-wildcard"
},
{
"version": "10.0.0-beta",
"description": "Missing @Injectable and incomplete provider definition migration. As of Angular 9, enforcement of @Injectable decorators for DI is a bit stricter and incomplete provider definitions behave differently. Read more about this here: https://v9.angular.io/guide/migration-injectable",
"factory": "./migrations/missing-injectable/index",
"package": "@angular/core",
"name": "migration-v10-missing-injectable"
},
{
"version": "10.0.0-beta",
"description": "ModuleWithProviders migration. As of Angular 10, the ModuleWithProviders type requires a generic. This migration adds the generic where it is missing. Read more about this here: https://v10.angular.io/guide/migration-module-with-providers",
"factory": "./migrations/module-with-providers/index",
"package": "@angular/core",
"name": "migration-v10-module-with-providers"
"version": "10.4.0-beta.3",
"description": "Adjust karma and protractor setup",
"factory": "./src/migrations/update-10-4-0/update-10-4-0",
"package": "@nrwl/angular",
"name": "update-10-4-0"
},
{
"version": "10.0.0-beta",
"description": "Undecorated classes with Angular features migration. In version 10, classes that use Angular features and do not have an Angular decorator are no longer supported. Read more about this here: https://v10.angular.io/guide/migration-undecorated-classes",
"factory": "./migrations/undecorated-classes-with-decorated-fields/index",
"package": "@angular/core",
"name": "migration-v10-undecorated-classes-with-decorated-fields"
"version": "10.3.1-beta.1",
"description": "Fix ts-jest migration",
"factory": "./src/migrations/update-10-3-0/update-ts-jest",
"package": "@nrwl/jest",
"name": "update-ts-jest"
},
{
"version": "10.0.0-beta.1",
"description": "Upgrades Angular and Angular CLI to 10.0.0",
"factory": "./src/migrations/update-10-0-0/update-10-0-0",
"package": "@nrwl/angular",
"name": "update-10-0-0"
"version": "10.3.1-beta.1",
"description": "Revert any node_modules lintFilesPatterns that were accidentally included by update-eslint-builder-and-config",
"factory": "./src/migrations/update-10-3-1/revert-node-modules-files-in-eslint-builder-options",
"package": "@nrwl/linter",
"name": "revert-node-modules-files-in-eslint-builder-options"
},
{
"version": "10.0.0-beta.2",
"description": "update jest configs to include setup env files",
"factory": "./src/migrations/update-10-0-0/update-jest-configs",
"package": "@nrwl/jest",
"name": "update-10.0.0"
"version": "10.4.0-beta.0",
"description": "Update ESLint config files to use preset configs which eslint-plugin-nx exports",
"factory": "./src/migrations/update-10-4-0/update-eslint-configs-to-use-nx-presets",
"package": "@nrwl/linter",
"name": "update-eslint-configs-to-use-nx-presets"
},
{
"version": "10.1.0-beta.4",
"description": "Update jest to v26",
"factory": "./src/migrations/update-10-1-0/update-10-1-0",
"package": "@nrwl/jest",
"name": "update-10.1.0"
"version": "10.4.0-beta.1",
"description": "Update root ESLint config to use overrides",
"factory": "./src/migrations/update-10-4-0/update-root-eslint-config-to-use-overrides",
"package": "@nrwl/linter",
"name": "update-root-eslint-config-to-use-overrides"
}
]
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@angular/platform-browser": "^10.1.0",
"@angular/platform-browser-dynamic": "^10.1.0",
"@angular/router": "^10.1.0",
"@nrwl/angular": "10.3.0",
"@nrwl/angular": "10.4.0",
"angular-in-memory-web-api": "^0.11.0",
"faker": "^4.1.0",
"rxjs": "~6.5.5",
Expand All @@ -62,10 +62,10 @@
"@commitlint/cli": "^9.1.2",
"@commitlint/config-conventional": "^9.1.2",
"@nrwl/cli": "10.3.0",
"@nrwl/cypress": "10.3.0",
"@nrwl/eslint-plugin-nx": "10.3.0",
"@nrwl/jest": "10.3.0",
"@nrwl/workspace": "10.3.0",
"@nrwl/cypress": "10.4.0",
"@nrwl/eslint-plugin-nx": "10.4.0",
"@nrwl/jest": "10.4.0",
"@nrwl/workspace": "10.4.0",
"@types/faker": "^4.1.12",
"@types/jest": "26.0.8",
"@types/node": "~8.9.4",
Expand All @@ -85,7 +85,7 @@
"netlify": "^4.3.8",
"ng-packagr": "^10.1.0",
"npm-run-all": "^4.1.5",
"prettier": "2.0.4",
"prettier": "2.1.2",
"pretty-quick": "^2.0.1",
"standard-version": "^8.0.2",
"ts-jest": "26.4.0",
Expand Down
Loading

0 comments on commit 50dbf89

Please sign in to comment.