Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): update nx to 9.4.0 #447

Merged
merged 2 commits into from
Jun 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion apps/react-akita-app-e2e/.eslintrc
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{ "extends": "../../.eslintrc", "rules": {}, "ignorePatterns": ["!**/*"] }
{
"extends": ["../../.eslintrc", "plugin:cypress/recommended"],
"rules": {},
"ignorePatterns": ["!**/*"]
}
4 changes: 4 additions & 0 deletions apps/react-akita-app/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["@nrwl/react/babel"],
"plugins": []
}
4 changes: 4 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["@nrwl/web/babel"],
"babelrcRoots": ["*"]
}
59 changes: 40 additions & 19 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,53 @@
{
"migrations": [
{
"version": "9.2.0-beta.1",
"description": "Add cacheable operations to nx.json",
"factory": "./src/migrations/update-9-2-0/update-9-2-0",
"version": "9.3.0-beta.1",
"description": "Update prettier to v2",
"factory": "./src/migrations/update-9-3-0/update-9-3-0",
"package": "@nrwl/workspace",
"name": "update-9-2-0"
"name": "update-9-3-0"
},
{
"version": "9.2.0-beta.3",
"description": "Update jest to v25",
"factory": "./src/migrations/update-9-2-0/update-9-2-0",
"package": "@nrwl/jest",
"name": "update-9.2.0"
"version": "9.4.0-beta.1",
"description": "Remove config builder option when using eslint to enable automatic detection",
"factory": "./src/migrations/update-9-4-0/update-eslint-config",
"package": "@nrwl/workspace",
"name": "update-eslint-config"
},
{
"version": "9.4.0-beta.1",
"description": "Fix exclude patterns in tslint and eslint to ensure it does not break linting when a files option is defined",
"factory": "./src/migrations/update-9-4-0/update-linters-exclude",
"package": "@nrwl/workspace",
"name": "update-linters-exclude"
},
{
"version": "9.4.0-beta.1",
"description": "Decorate cli to enable computation caching",
"factory": "./src/migrations/update-9-4-0/add-decorate-cli",
"package": "@nrwl/workspace",
"name": "add-decorate-cli"
},
{
"version": "9.4.0-beta.1",
"description": "Add Cypress ESLint plugin",
"factory": "./src/migrations/update-9-4-0/add-cypress-eslint-plugin-9-4-0",
"package": "@nrwl/cypress",
"name": "add-cypress-eslint-plugin-9.4.0"
},
{
"version": "9.2.0-beta.1",
"description": "Set buildLibsFromSource property to true to not break existing projects.",
"factory": "./src/migrations/update-9-2-0/set-build-libs-from-source",
"package": "@nrwl/node",
"name": "set-build-libs-from-source"
"version": "9.4.0-beta.1",
"description": "Update libraries",
"factory": "./src/migrations/update-9-4-0/update-9-4-0",
"package": "@nrwl/react",
"name": "update-9.4.0"
},
{
"version": "9.2.0-beta.1",
"description": "Set buildLibsFromSource property to true to not break existing projects.",
"factory": "./src/migrations/update-9-2-0/set-build-libs-from-source",
"package": "@nrwl/web",
"name": "set-build-libs-from-source"
"version": "9.4.0-beta.1",
"description": "Migrate to new babel setup for greater flexibility",
"factory": "./src/migrations/update-9-4-0/babelrc-9-4-0",
"package": "@nrwl/react",
"name": "babelrc-9.4.0"
}
]
}
35 changes: 18 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@
"ngx-infinite-scroll": "^8.0.2",
"ngx-take-until-destroy": "^5.4.0",
"ngx-toastr": "^12.0.1",
"react": "16.12.0",
"react-dom": "16.12.0",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-loadable": "^5.5.0",
"react-router-dom": "5.1.2",
"react-router-dom": "5.2.0",
"recompose": "^0.30.0",
"rxjs": "6.4.0",
"schematics-utilities": "1.1.1",
Expand All @@ -141,16 +141,16 @@
"@angular/language-service": "9.1.1",
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@nrwl/angular": "9.2.2",
"@nrwl/cypress": "9.2.2",
"@nrwl/eslint-plugin-nx": "9.2.2",
"@nrwl/express": "9.2.2",
"@nrwl/jest": "9.2.2",
"@nrwl/node": "9.2.2",
"@nrwl/react": "9.2.3",
"@nrwl/web": "9.2.2",
"@nrwl/workspace": "9.2.2",
"@testing-library/react": "9.4.0",
"@nrwl/angular": "9.4.0",
"@nrwl/cypress": "9.4.0",
"@nrwl/eslint-plugin-nx": "9.4.0",
"@nrwl/express": "9.4.0",
"@nrwl/jest": "9.4.0",
"@nrwl/node": "9.4.0",
"@nrwl/react": "9.4.0",
"@nrwl/web": "9.4.0",
"@nrwl/workspace": "9.4.0",
"@testing-library/react": "10.0.4",
"@types/cookie-parser": "^1.4.2",
"@types/cors": "^2.8.6",
"@types/express": "4.17.6",
Expand All @@ -159,10 +159,10 @@
"@types/lodash": "^4.14.149",
"@types/morgan": "^1.9.0",
"@types/node": "^12.12.35",
"@types/react": "16.9.17",
"@types/react-dom": "16.9.4",
"@types/react": "16.9.35",
"@types/react-dom": "16.9.8",
"@types/react-loadable": "^5.5.3",
"@types/react-router-dom": "5.1.4",
"@types/react-router-dom": "5.1.5",
"@typescript-eslint/eslint-plugin": "2.27.0",
"@typescript-eslint/parser": "2.27.0",
"all-contributors-cli": "^6.14.1",
Expand All @@ -188,6 +188,7 @@
"ts-node": "~8.8.2",
"tslint": "6.1.1",
"tslint-config-prettier": "^1.18.0",
"typescript": "3.2.4"
"typescript": "3.2.4",
"eslint-plugin-cypress": "^2.10.3"
}
}
39 changes: 17 additions & 22 deletions workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
"builder": "@nrwl/linter:lint",
"options": {
"linter": "eslint",
"config": "libs/akita/.eslintrc",
"tsConfig": ["libs/akita/tsconfig.lib.json", "libs/akita/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!libs/akita/**"]
"exclude": ["**/node_modules/**", "!libs/akita/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -61,7 +60,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["libs/akita-ng-entity-service/tsconfig.lib.json", "libs/akita-ng-entity-service/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!libs/akita-ng-entity-service/**"]
"exclude": ["**/node_modules/**", "!libs/akita-ng-entity-service/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -152,7 +151,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-store-app/tsconfig.app.json", "apps/angular-store-app/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!apps/angular-store-app/**"]
"exclude": ["**/node_modules/**", "!apps/angular-store-app/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -188,7 +187,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-store-app-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!apps/angular-store-app-e2e/**"]
"exclude": ["**/node_modules/**", "!apps/angular-store-app-e2e/**/*"]
}
}
}
Expand All @@ -215,7 +214,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["libs/akita-ng-router-store/tsconfig.lib.json", "libs/akita-ng-router-store/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!libs/akita-ng-router-store/**"]
"exclude": ["**/node_modules/**", "!libs/akita-ng-router-store/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -252,7 +251,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["libs/akita-ng-devtools/tsconfig.lib.json", "libs/akita-ng-devtools/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!libs/akita-ng-devtools/**"]
"exclude": ["**/node_modules/**", "!libs/akita-ng-devtools/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -289,7 +288,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["libs/akita-ng-forms-manager/tsconfig.lib.json", "libs/akita-ng-forms-manager/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!libs/akita-ng-forms-manager/**"]
"exclude": ["**/node_modules/**", "!libs/akita-ng-forms-manager/**/*"]
}
},
"test": {
Expand All @@ -314,9 +313,8 @@
"builder": "@nrwl/linter:lint",
"options": {
"linter": "eslint",
"config": "libs/akita-schematics/.eslintrc",
"tsConfig": ["libs/akita-schematics/tsconfig.schematics.json"],
"exclude": ["**/node_modules/**", "!libs/akita-schematics/**"]
"exclude": ["**/node_modules/**", "!libs/akita-schematics/**/*"]
}
}
}
Expand Down Expand Up @@ -398,7 +396,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-akita-server-side-pagination/tsconfig.app.json", "apps/angular-akita-server-side-pagination/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!apps/angular-akita-server-side-pagination/**"]
"exclude": ["**/node_modules/**", "!apps/angular-akita-server-side-pagination/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -434,7 +432,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-akita-server-side-pagination-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!apps/angular-akita-server-side-pagination-e2e/**"]
"exclude": ["**/node_modules/**", "!apps/angular-akita-server-side-pagination-e2e/**/*"]
}
}
}
Expand Down Expand Up @@ -512,7 +510,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-twitter-like/tsconfig.app.json", "apps/angular-twitter-like/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!apps/angular-twitter-like/**"]
"exclude": ["**/node_modules/**", "!apps/angular-twitter-like/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -548,7 +546,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-twitter-like-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!apps/angular-twitter-like-e2e/**"]
"exclude": ["**/node_modules/**", "!apps/angular-twitter-like-e2e/**/*"]
}
}
}
Expand Down Expand Up @@ -627,7 +625,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-ecommerce/tsconfig.app.json", "apps/angular-ecommerce/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!apps/angular-ecommerce/**"]
"exclude": ["**/node_modules/**", "!apps/angular-ecommerce/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -663,7 +661,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["apps/angular-ecommerce-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!apps/angular-ecommerce-e2e/**"]
"exclude": ["**/node_modules/**", "!apps/angular-ecommerce-e2e/**/*"]
}
}
}
Expand Down Expand Up @@ -708,9 +706,8 @@
"builder": "@nrwl/linter:lint",
"options": {
"linter": "eslint",
"config": "apps/angular-ecommerce-server/.eslintrc",
"tsConfig": ["apps/angular-ecommerce-server/tsconfig.app.json", "apps/angular-ecommerce-server/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!apps/angular-ecommerce-server/**"]
"exclude": ["**/node_modules/**", "!apps/angular-ecommerce-server/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -783,9 +780,8 @@
"builder": "@nrwl/linter:lint",
"options": {
"linter": "eslint",
"config": "apps/react-akita-app/.eslintrc",
"tsConfig": ["apps/react-akita-app/tsconfig.app.json", "apps/react-akita-app/tsconfig.spec.json"],
"exclude": ["**/node_modules/**", "!apps/react-akita-app/**"]
"exclude": ["**/node_modules/**", "!apps/react-akita-app/**/*"]
}
},
"test": {
Expand Down Expand Up @@ -820,9 +816,8 @@
"builder": "@nrwl/linter:lint",
"options": {
"linter": "eslint",
"config": "apps/react-akita-app-e2e/.eslintrc",
"tsConfig": ["apps/react-akita-app-e2e/tsconfig.e2e.json"],
"exclude": ["**/node_modules/**", "!apps/react-akita-app-e2e/**"]
"exclude": ["**/node_modules/**", "!apps/react-akita-app-e2e/**/*"]
}
}
}
Expand Down
Loading