Skip to content

Commit a568785

Browse files
author
Richard Gunning
committed
update nrwl
1 parent f7cf4f5 commit a568785

File tree

8 files changed

+44
-47
lines changed

8 files changed

+44
-47
lines changed

‎angular.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"apps/react-app/tsconfig.app.json",
7373
"apps/react-app/tsconfig.spec.json"
7474
],
75-
"exclude": ["**/node_modules/**"]
75+
"exclude": ["**/node_modules/**", "!apps/react-app/**"]
7676
}
7777
},
7878
"test": {
@@ -106,7 +106,7 @@
106106
"builder": "@angular-devkit/build-angular:tslint",
107107
"options": {
108108
"tsConfig": "apps/react-app-e2e/tsconfig.e2e.json",
109-
"exclude": ["**/node_modules/**"]
109+
"exclude": ["**/node_modules/**", "!apps/react-app-e2e/**"]
110110
}
111111
}
112112
}
@@ -131,7 +131,7 @@
131131
"libs/test-react/tsconfig.lib.json",
132132
"libs/test-react/tsconfig.spec.json"
133133
],
134-
"exclude": ["**/node_modules/**"]
134+
"exclude": ["**/node_modules/**", "!libs/test-react/**"]
135135
}
136136
},
137137
"test": {
@@ -226,7 +226,7 @@
226226
"apps/angular-app/tsconfig.app.json",
227227
"apps/angular-app/tsconfig.spec.json"
228228
],
229-
"exclude": ["**/node_modules/**"]
229+
"exclude": ["**/node_modules/**", "!apps/angular-app/**"]
230230
}
231231
},
232232
"test": {
@@ -261,7 +261,7 @@
261261
"builder": "@angular-devkit/build-angular:tslint",
262262
"options": {
263263
"tsConfig": "apps/angular-app-e2e/tsconfig.e2e.json",
264-
"exclude": ["**/node_modules/**"]
264+
"exclude": ["**/node_modules/**", "!apps/angular-app-e2e/**"]
265265
}
266266
}
267267
}

‎apps/angular-app-e2e/cypress.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"fileServerFolder": "../../dist/out-tsc/apps/angular-app-e2e",
3-
"fixturesFolder": "../../dist/out-tsc/apps/angular-app-e2e/src/fixtures",
4-
"integrationFolder": "../../dist/out-tsc/apps/angular-app-e2e/src/integration",
5-
"pluginsFile": "../../dist/out-tsc/apps/angular-app-e2e/src/plugins/index.js",
2+
"fileServerFolder": "./",
3+
"fixturesFolder": "./src/fixtures",
4+
"integrationFolder": "./src/integration",
5+
"pluginsFile": "./src/plugins/index.js",
66
"supportFile": false,
77
"video": true,
88
"videosFolder": "../../dist/out-tsc/apps/angular-app-e2e/videos",

‎apps/angular-app-e2e/src/plugins/index.ts renamed to ‎apps/angular-app-e2e/src/plugins/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ***********************************************************
1+
const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor'); // ***********************************************************
22
// This example plugins/index.js can be used to load plugins
33
//
44
// You can change the location of this file or turn off loading
@@ -7,11 +7,10 @@
77
// You can read more here:
88
// https://on.cypress.io/plugins-guide
99
// ***********************************************************
10-
1110
// This function is called when a project is opened or re-opened (e.g. due to
1211
// the project's config changing)
13-
14-
module.exports = (on: Cypress.Actions, config: Cypress.ConfigOptions) => {
12+
module.exports = function(on, config) {
13+
on('file:preprocessor', preprocessTypescript(config));
1514
// `on` is used to hook into various events Cypress emits
1615
// `config` is the resolved Cypress config
1716
};

‎apps/react-app-e2e/cypress.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"fileServerFolder": "../../dist/out-tsc/apps/react-app-e2e",
3-
"fixturesFolder": "../../dist/out-tsc/apps/react-app-e2e/src/fixtures",
4-
"integrationFolder": "../../dist/out-tsc/apps/react-app-e2e/src/integration",
5-
"pluginsFile": "../../dist/out-tsc/apps/react-app-e2e/src/plugins/index.js",
2+
"fileServerFolder": "./",
3+
"fixturesFolder": "./src/fixtures",
4+
"integrationFolder": "./src/integration",
5+
"pluginsFile": "./src/plugins/index.js",
66
"supportFile": false,
77
"video": true,
88
"videosFolder": "../../dist/out-tsc/apps/react-app-e2e/videos",

‎apps/react-app-e2e/src/plugins/index.ts renamed to ‎apps/react-app-e2e/src/plugins/index.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ***********************************************************
1+
const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor'); // ***********************************************************
22
// This example plugins/index.js can be used to load plugins
33
//
44
// You can change the location of this file or turn off loading
@@ -7,11 +7,10 @@
77
// You can read more here:
88
// https://on.cypress.io/plugins-guide
99
// ***********************************************************
10-
1110
// This function is called when a project is opened or re-opened (e.g. due to
1211
// the project's config changing)
13-
14-
module.exports = (on: Cypress.Actions, config: Cypress.ConfigOptions) => {
12+
module.exports = function(on, config) {
13+
on('file:preprocessor', preprocessTypescript(config));
1514
// `on` is used to hook into various events Cypress emits
1615
// `config` is the resolved Cypress config
1716
};

‎apps/react-app/src/app/app.spec.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import * as React from "react";
2-
import { render, cleanup } from "react-testing-library";
1+
import * as React from 'react';
2+
import { render, cleanup } from '@testing-library/react';
33

4-
import { App } from "./app";
4+
import { App } from './app';
55

6-
describe("App", () => {
6+
describe('App', () => {
77
afterEach(cleanup);
88

9-
it("should render successfully", () => {
9+
it('should render successfully', () => {
1010
const { baseElement } = render(<App />);
1111
expect(baseElement).toBeTruthy();
1212
});
1313

14-
it("should have a greeting as the title", () => {
14+
it('should have a greeting as the title', () => {
1515
const { getByText } = render(<App />);
16-
expect(getByText("Welcome to react-app!")).toBeTruthy();
16+
expect(getByText('Welcome to react-app!')).toBeTruthy();
1717
});
1818
});

‎jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ module.exports = {
55
},
66
resolver: '@nrwl/jest/plugins/resolver',
77
moduleFileExtensions: ['ts', 'js', 'html'],
8-
collectCoverage: true,
98
coverageReporters: ['html']
109
};

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"start": "ng serve",
88
"build": "ng build",
99
"test": "ng test",
10-
"lint": "./node_modules/.bin/nx lint && ng lint",
10+
"lint": "./node_modules/.bin/nx workspace-lint && ng lint",
1111
"e2e": "ng e2e",
1212
"affected:apps": "./node_modules/.bin/nx affected:apps",
1313
"affected:libs": "./node_modules/.bin/nx affected:libs",
@@ -24,7 +24,8 @@
2424
"update:check": "ng update",
2525
"workspace-schematic": "./node_modules/.bin/nx workspace-schematic",
2626
"dep-graph": "./node_modules/.bin/nx dep-graph",
27-
"help": "./node_modules/.bin/nx help"
27+
"help": "./node_modules/.bin/nx help",
28+
"nx": "nx"
2829
},
2930
"private": true,
3031
"dependencies": {
@@ -39,41 +40,40 @@
3940
"core-js": "^2.5.4",
4041
"rxjs": "6.5.3",
4142
"zone.js": "^0.10.2",
42-
"react": "16.8.3",
43-
"react-dom": "16.8.3",
44-
"@nrwl/angular": "8.0.0"
43+
"react": "16.8.6",
44+
"react-dom": "16.8.6",
45+
"@nrwl/angular": "8.4.13"
4546
},
4647
"devDependencies": {
4748
"jest-preset-angular": "7.0.0",
4849
"@angular/compiler-cli": "8.2.5",
4950
"@angular/language-service": "8.2.5",
50-
"@angular-devkit/build-angular": "0.803.3",
51-
"@angular-devkit/build-ng-packagr": "0.803.3",
51+
"@angular-devkit/build-angular": "^0.801.1",
52+
"@angular-devkit/build-ng-packagr": "~0.801.1",
5253
"@angular-devkit/core": "8.3.3",
5354
"codelyzer": "~4.5.0",
54-
"@angular/cli": "8.3.3",
55-
"@nrwl/angular": "^8.4.13",
55+
"@angular/cli": "8.1.1",
5656
"@types/jest": "24.0.9",
5757
"@types/jquery": "3.3.6",
5858
"@types/node": "~8.9.4",
59-
"@types/react": "16.8.4",
60-
"@types/react-dom": "16.8.2",
61-
"cypress": "3.1.0",
59+
"@types/react": "16.8.23",
60+
"@types/react-dom": "16.8.5",
61+
"cypress": "3.4.0",
6262
"dotenv": "6.2.0",
6363
"jest": "24.1.0",
6464
"ng-packagr": "^5.5.0",
6565
"prettier": "1.15.2",
66-
"react-testing-library": "8.0.1",
6766
"ts-jest": "24.0.0",
6867
"ts-node": "~7.0.0",
6968
"tsickle": ">=0.34.0",
7069
"tslib": "^1.9.0",
7170
"tslint": "~5.11.0",
7271
"typescript": "3.5.3",
73-
"@nrwl/workspace": "8.0.0",
74-
"@nrwl/react": "8.0.0",
75-
"@nrwl/web": "8.0.0",
76-
"@nrwl/jest": "8.0.0",
77-
"@nrwl/cypress": "8.0.0"
72+
"@nrwl/workspace": "8.4.13",
73+
"@nrwl/react": "8.4.13",
74+
"@nrwl/web": "8.4.13",
75+
"@nrwl/jest": "8.4.13",
76+
"@nrwl/cypress": "8.4.13",
77+
"@testing-library/react": "8.0.5"
7878
}
7979
}

0 commit comments

Comments
 (0)