Skip to content

Commit 0b0ffc2

Browse files
author
Giuseppe Pennisi
committed
Merge branch 'develop'
2 parents f165a75 + 362e815 commit 0b0ffc2

11 files changed

Lines changed: 6735 additions & 27336 deletions

File tree

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

apps/winbox-example-app-e2e/cypress.config.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,14 @@ import { defineConfig } from 'cypress';
22
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
33

44
export default defineConfig({
5-
e2e: nxE2EPreset(__dirname),
5+
e2e: {
6+
...nxE2EPreset(__dirname),
7+
/**
8+
* TODO(@nrwl/cypress): In Cypress v12,the testIsolation option is turned on by default.
9+
* This can cause tests to start breaking where not indended.
10+
* You should consider enabling this once you verify tests do not depend on each other
11+
* More Info: https://docs.cypress.io/guides/references/migration-guide#Test-Isolation
12+
**/
13+
testIsolation: false,
14+
},
615
});

apps/winbox-example-app-e2e/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "winbox-example-app-e2e",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"sourceRoot": "apps/winbox-example-app-e2e/src",
45
"projectType": "application",

apps/winbox-example-app/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"name": "winbox-example-app",
3+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
24
"projectType": "application",
35
"sourceRoot": "apps/winbox-example-app/src",
46
"prefix": "rbtech",
@@ -82,7 +84,7 @@
8284
},
8385
"test": {
8486
"executor": "@nrwl/jest:jest",
85-
"outputs": ["coverage/apps/winbox-example-app"],
87+
"outputs": ["{workspaceRoot}/coverage/apps/winbox-example-app"],
8688
"options": {
8789
"jestConfig": "apps/winbox-example-app/jest.config.ts",
8890
"passWithNoTests": true

migrations.json

Lines changed: 77 additions & 233 deletions
Large diffs are not rendered by default.

nx.json

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@
66
"cli": {
77
"packageManager": "npm"
88
},
9-
"implicitDependencies": {
10-
"package.json": {
11-
"dependencies": "*",
12-
"devDependencies": "*"
13-
},
14-
".eslintrc.json": "*"
15-
},
169
"tasksRunnerOptions": {
1710
"default": {
1811
"runner": "nx/tasks-runners/default",
@@ -45,7 +38,28 @@
4538
"$schema": "./node_modules/nx/schemas/nx-schema.json",
4639
"targetDefaults": {
4740
"build": {
48-
"dependsOn": ["^build"]
41+
"dependsOn": ["^build"],
42+
"inputs": ["production", "^production"]
43+
},
44+
"lint": {
45+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
46+
},
47+
"test": {
48+
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
49+
},
50+
"e2e": {
51+
"inputs": ["default", "^production"]
4952
}
53+
},
54+
"namedInputs": {
55+
"default": ["{projectRoot}/**/*", "sharedGlobals"],
56+
"sharedGlobals": [],
57+
"production": [
58+
"default",
59+
"!{projectRoot}/.eslintrc.json",
60+
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
61+
"!{projectRoot}/tsconfig.spec.json",
62+
"!{projectRoot}/jest.config.[jt]s"
63+
]
5064
}
5165
}

0 commit comments

Comments
 (0)