Skip to content

Commit 6f928e5

Browse files
RGunningRGunning
authored
Merge pull request #24 from RGunning/update-angular-8
chore(deps): update packages
2 parents e6be655 + 7a4337a commit 6f928e5

20 files changed

+88
-85
lines changed

‎angular.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"architect": {
1717
"build": {
18-
"builder": "@nrwl/builders:web-build",
18+
"builder": "@nrwl/web:build",
1919
"options": {
2020
"outputPath": "dist/apps/react-app",
2121
"index": "apps/react-app/src/index.html",
@@ -55,7 +55,7 @@
5555
}
5656
},
5757
"serve": {
58-
"builder": "@nrwl/builders:web-dev-server",
58+
"builder": "@nrwl/web:dev-server",
5959
"options": {
6060
"buildTarget": "react-app:build"
6161
},
@@ -72,11 +72,11 @@
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": {
79-
"builder": "@nrwl/builders:jest",
79+
"builder": "@nrwl/jest:jest",
8080
"options": {
8181
"jestConfig": "apps/react-app/jest.config.js",
8282
"tsConfig": "apps/react-app/tsconfig.spec.json"
@@ -90,7 +90,7 @@
9090
"prefix": "",
9191
"architect": {
9292
"e2e": {
93-
"builder": "@nrwl/builders:cypress",
93+
"builder": "@nrwl/cypress:cypress",
9494
"options": {
9595
"cypressConfig": "apps/react-app-e2e/cypress.json",
9696
"tsConfig": "apps/react-app-e2e/tsconfig.e2e.json",
@@ -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,11 +131,11 @@
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": {
138-
"builder": "@nrwl/builders:jest",
138+
"builder": "@nrwl/jest:jest",
139139
"options": {
140140
"jestConfig": "libs/test-react/jest.config.js",
141141
"tsConfig": "libs/test-react/tsconfig.spec.json"
@@ -226,11 +226,11 @@
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": {
233-
"builder": "@nrwl/builders:jest",
233+
"builder": "@nrwl/jest:jest",
234234
"options": {
235235
"jestConfig": "apps/angular-app/jest.config.js",
236236
"tsConfig": "apps/angular-app/tsconfig.spec.json",
@@ -245,7 +245,7 @@
245245
"prefix": "",
246246
"architect": {
247247
"e2e": {
248-
"builder": "@nrwl/builders:cypress",
248+
"builder": "@nrwl/cypress:cypress",
249249
"options": {
250250
"cypressConfig": "apps/angular-app-e2e/cypress.json",
251251
"tsConfig": "apps/angular-app-e2e/tsconfig.e2e.json",
@@ -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
}
@@ -272,7 +272,7 @@
272272
"typescriptMismatch": false,
273273
"versionMismatch": false
274274
},
275-
"defaultCollection": "@nrwl/schematics"
275+
"defaultCollection": "@nrwl/angular"
276276
},
277277
"schematics": {
278278
"@nrwl/schematics:application": {

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

+4-4
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

+3-4
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/angular-app-e2e/tsconfig.e2e.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"sourceMap": false,
5-
"outDir": "../../dist/out-tsc/apps/angular-app-e2e/src"
5+
"outDir": "../../dist/out-tsc"
66
},
77
"include": ["src/**/*.ts"]
88
}

‎apps/angular-app/tsconfig.app.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../../dist/out-tsc/apps/angular-app",
4+
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
77
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],

‎apps/angular-app/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../../dist/out-tsc/apps/angular-app/",
4+
"outDir": "../../dist/out-tsc",
55
"module": "commonjs",
66
"types": ["jest", "node"]
77
},

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

+4-4
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

+3-4
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/tsconfig.e2e.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"sourceMap": false,
5-
"outDir": "../../dist/out-tsc/apps/react-app-e2e/src"
5+
"outDir": "../../dist/out-tsc"
66
},
77
"include": ["src/**/*.ts"]
88
}

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

+7-7
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
});

‎apps/react-app/tsconfig.app.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../../dist/out-tsc/apps/react-app",
4+
"outDir": "../../dist/out-tsc",
55
"types": []
66
},
77
"exclude": ["src/test-setup.ts", "**/*.spec.ts"],

‎apps/react-app/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../../dist/out-tsc/apps/react-app/",
4+
"outDir": "../../dist/out-tsc",
55
"module": "commonjs",
66
"types": ["jest", "node"]
77
},

‎jest.config.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
module.exports = {
2-
testMatch: ["**/+(*.)+(spec|test).+(ts|js)?(x)"],
2+
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
33
transform: {
4-
"^.+\\.(ts|js|html)$": "ts-jest"
4+
'^.+\\.(ts|js|html)$': 'ts-jest'
55
},
6-
resolver: "@nrwl/builders/plugins/jest/resolver",
7-
moduleFileExtensions: ["ts", "js", "html"],
8-
collectCoverage: true,
9-
coverageReporters: ["html"]
6+
resolver: '@nrwl/jest/plugins/resolver',
7+
moduleFileExtensions: ['ts', 'js', 'html'],
8+
coverageReporters: ['html']
109
};

‎libs/test-react/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@fcom/test-react",
33
"version": "0.0.1",
44
"peerDependencies": {
5-
"@angular/common": "^7.2.0",
6-
"@angular/core": "^7.2.0"
5+
"@angular/common": "^8.2.5",
6+
"@angular/core": "^8.2.5"
77
}
88
}

‎libs/test-react/tsconfig.lib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../../dist/out-tsc/libs/test-react",
4+
"outDir": "../../dist/out-tsc",
55
"target": "es2015",
66
"module": "es2015",
77
"moduleResolution": "node",
@@ -10,7 +10,7 @@
1010
"inlineSources": true,
1111
"emitDecoratorMetadata": true,
1212
"experimentalDecorators": true,
13-
"allowSyntheticDefaultImports":true,
13+
"allowSyntheticDefaultImports": true,
1414
"importHelpers": true,
1515
"types": [],
1616
"lib": ["dom", "es2018"]

‎libs/test-react/tsconfig.spec.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../../dist/out-tsc/libs/test-react",
4+
"outDir": "../../dist/out-tsc",
55
"module": "commonjs",
66
"types": ["jest", "node"]
77
},

0 commit comments

Comments
 (0)