Skip to content

Commit ab43411

Browse files
committed
chore: update Nx 11.3.0
1 parent 55e4b85 commit ab43411

File tree

10 files changed

+636
-534
lines changed

10 files changed

+636
-534
lines changed

package-lock.json

Lines changed: 583 additions & 503 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"nx": "nx",
77
"start": "nx serve",
8-
"build": "nx build",
8+
"build": "nx build nx",
99
"test": "nx run-many --target=test --all --parallel",
1010
"lint": "nx workspace-lint && nx lint",
1111
"e2e": "nx e2e",
@@ -21,34 +21,34 @@
2121
"format:write": "nx format:write",
2222
"format:check": "nx format:check",
2323
"update": "nx migrate latest",
24-
"workspace-schematic": "nx workspace-schematic",
2524
"dep-graph": "nx dep-graph",
2625
"help": "nx help",
27-
"doctoc": "doctoc packages/nx/README.md"
26+
"doctoc": "doctoc packages/nx/README.md",
27+
"workspace-generator": "nx workspace-generator"
2828
},
2929
"private": true,
3030
"dependencies": {},
3131
"devDependencies": {
32-
"@nrwl/cli": "10.4.4",
33-
"@nrwl/eslint-plugin-nx": "10.4.4",
34-
"@nrwl/jest": "10.4.4",
35-
"@nrwl/nx-plugin": "^10.4.4",
36-
"@nrwl/tao": "10.4.4",
37-
"@nrwl/workspace": "10.4.4",
32+
"@nrwl/cli": "11.3.0",
33+
"@nrwl/eslint-plugin-nx": "11.3.0",
34+
"@nrwl/jest": "11.3.0",
35+
"@nrwl/nx-plugin": "11.3.0",
36+
"@nrwl/tao": "11.3.0",
37+
"@nrwl/workspace": "11.3.0",
3838
"@types/jest": "26.0.8",
39-
"@types/node": "~8.9.4",
39+
"@types/node": "12.12.38",
4040
"@typescript-eslint/eslint-plugin": "4.3.0",
4141
"@typescript-eslint/parser": "4.3.0",
4242
"doctoc": "^1.4.0",
4343
"dotenv": "6.2.0",
4444
"eslint": "7.10.0",
4545
"eslint-config-prettier": "6.0.0",
4646
"jest": "26.2.2",
47-
"prettier": "2.1.2",
47+
"prettier": "2.2.1",
4848
"strip-json-comments": "^3.1.1",
4949
"ts-jest": "26.4.0",
50-
"ts-node": "~7.0.0",
51-
"tslint": "~6.0.0",
50+
"ts-node": "9.1.1",
51+
"tslint": "6.1.3",
5252
"typescript": "~4.0.3"
5353
}
54-
}
54+
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
2-
"$schema": "https://json-schema.org/draft-07/schema",
3-
"$id": "https://json-schema.org/draft-07/schema",
2+
"$schema": "http://json-schema.org/schema",
43
"title": "Build builder",
54
"description": "",
65
"type": "object",
76
"properties": {},
87
"required": []
9-
}
8+
}

packages/nx/src/schematics/app-resources/schema.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
"default": "App_Resources"
1515
}
1616
},
17-
"required": ["path"]
18-
}
17+
"required": [
18+
"path"
19+
]
20+
}

packages/nx/src/schematics/application/schema.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747
},
4848
"unitTestRunner": {
4949
"type": "string",
50-
"enum": ["jest", "none"],
50+
"enum": [
51+
"jest",
52+
"none"
53+
],
5154
"description": "Test runner to use for unit tests",
5255
"default": "jest"
5356
},

packages/nx/src/schematics/init/schema.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
{
32
"$schema": "http://json-schema.org/schema",
43
"id": "NativeScriptNxInit",

packages/nx/src/schematics/library/schema.json

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,18 @@
3232
"linter": {
3333
"description": "The tool to use for running lint checks.",
3434
"type": "string",
35-
"enum": ["eslint", "tslint"],
35+
"enum": [
36+
"eslint",
37+
"tslint"
38+
],
3639
"default": "eslint"
3740
},
3841
"unitTestRunner": {
3942
"type": "string",
40-
"enum": ["jest", "none"],
43+
"enum": [
44+
"jest",
45+
"none"
46+
],
4147
"description": "Test runner to use for unit tests",
4248
"default": "jest"
4349
},
@@ -57,7 +63,10 @@
5763
},
5864
"testEnvironment": {
5965
"type": "string",
60-
"enum": ["jsdom", "node"],
66+
"enum": [
67+
"jsdom",
68+
"node"
69+
],
6170
"description": "The test environment to use if unitTestRunner is set to jest",
6271
"default": "jsdom"
6372
},
@@ -82,5 +91,7 @@
8291
"default": false
8392
}
8493
},
85-
"required": ["name"]
86-
}
94+
"required": [
95+
"name"
96+
]
97+
}

packages/nx/src/utils/testing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { TestingArchitectHost } from '@angular-devkit/architect/testing';
44
import { join } from 'path';
55
import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
66
import { Rule, Tree } from '@angular-devkit/schematics';
7-
import { names } from '@nrwl/workspace/src/utils/name-utils';
7+
import { names } from '@nrwl/workspace';
88
import { updateWorkspace } from '@nrwl/workspace/src/utils/workspace';
99
import { MockBuilderContext } from '@nrwl/workspace/testing';
1010

File renamed without changes.

workspace.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@
1010
"lint": {
1111
"builder": "@nrwl/linter:eslint",
1212
"options": {
13-
"lintFilePatterns": ["packages/nx/**/*.ts"]
13+
"lintFilePatterns": [
14+
"packages/nx/**/*.ts"
15+
]
1416
}
1517
},
1618
"test": {
1719
"builder": "@nrwl/jest:jest",
1820
"options": {
1921
"jestConfig": "packages/nx/jest.config.js",
2022
"passWithNoTests": true
21-
}
23+
},
24+
"outputs": [
25+
"coverage/packages/nx"
26+
]
2227
},
2328
"build": {
2429
"builder": "@nrwl/node:package",
@@ -45,7 +50,10 @@
4550
"output": "."
4651
}
4752
]
48-
}
53+
},
54+
"outputs": [
55+
"{options.outputPath}"
56+
]
4957
}
5058
}
5159
},
@@ -69,4 +77,4 @@
6977
"cli": {
7078
"defaultCollection": "@nrwl/workspace"
7179
}
72-
}
80+
}

0 commit comments

Comments
 (0)