Skip to content

Upgrade to Yarn v3, Nx 13.1.4, and move to @nrwl/nx-plugin proper structure #91

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,12 @@ testem.log
.DS_Store
Thumbs.db

/*.tgz
/*.tgz

.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
546 changes: 546 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

766 changes: 766 additions & 0 deletions .yarn/releases/yarn-3.2.0-rc.6.cjs

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.2.0-rc.6.cjs
51 changes: 26 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,43 @@
{
"name": "angular-architects",
"version": "0.0.0",
"private": true,
"license": "MIT",
"scripts": {
"commit": "git-cz",
"nx": "nx",
"start": "nx serve",
"build": "nx build ddd",
"pack": "npm pack ./dist/libs/ddd",
"build:schema": "node libs/ddd/src/schematics/json-schema-to-ts.js",
"test": "nx test",
"lint": "nx workspace-lint && nx lint",
"e2e": "nx e2e",
"affected": "nx affected",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes to package.json in this commit would be easier to review if you include a commit that sorts the scripts entries by key name. Essentially you can apply the lint rules like this https://ota-meshi.github.io/eslint-plugin-jsonc/rules/sort-keys.html in a separate commit.

"affected:apps": "nx affected:apps",
"affected:libs": "nx affected:libs",
"affected:build": "nx affected:build",
"affected:dep-graph": "nx affected:dep-graph",
"affected:e2e": "nx affected:e2e",
"affected:test": "nx affected:test",
"affected:libs": "nx affected:libs",
"affected:lint": "nx affected:lint",
"affected:dep-graph": "nx affected:dep-graph",
"affected": "nx affected",
"affected:test": "nx affected:test",
"build": "nx build ddd",
"build:schema": "node libs/ddd/src/schematics/json-schema-to-ts.js",
"commit": "git-cz",
"dep-graph": "nx dep-graph",
"e2e": "nx e2e",
"format": "nx format:write",
"format:write": "nx format:write",
"format:check": "nx format:check",
"update": "nx migrate latest",
"dep-graph": "nx dep-graph",
"format:write": "nx format:write",
"help": "nx help",
"lint": "nx workspace-lint && nx lint",
"nx": "nx",
"pack": "npm pack ./dist/libs/ddd",
"start": "nx serve",
"test": "nx test",
"update": "nx migrate latest",
"workspace-generator": "nx workspace-generator"
},
"private": true,
"config": {
"commitizen": {
"path": "./node_modules/cz-customizable"
}
},
"dependencies": {
"@schematics/angular": "^12.0.0",
"@nrwl/schematics": "^12.0.0"
"@schematics/angular": "^12.0.0"
},
"devDependencies": {
"json-schema-to-typescript": "^8.1.0",
"@nrwl/angular": "11.0.20",
"@nrwl/cli": "11.0.20",
"@nrwl/eslint-plugin-nx": "11.0.20",
Expand All @@ -46,21 +49,19 @@
"@types/node": "12.12.38",
"@typescript-eslint/eslint-plugin": "4.3.0",
"@typescript-eslint/parser": "4.3.0",
"@yarnpkg/plugin-dlx": "^3.1.1",
"commitizen": "^4.2.2",
"cz-customizable": "^6.3.0",
"dotenv": "6.2.0",
"eslint": "7.10.0",
"eslint-config-prettier": "6.0.0",
"jest": "26.2.2",
"json-schema-to-typescript": "^8.1.0",
"prettier": "2.1.2",
"ts-jest": "26.4.0",
"ts-node": "9.1.1",
"tslint": "6.1.3",
"typescript": "4.0.5"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-customizable"
}
}
"packageManager": "[email protected]"
}
Loading