Skip to content

Commit

Permalink
upgrade to Angular 11 and Node 14 - Udemy update dates
Browse files Browse the repository at this point in the history
  • Loading branch information
jhades committed Nov 17, 2020
1 parent 97af941 commit 5485b99
Show file tree
Hide file tree
Showing 11 changed files with 5,358 additions and 4,397 deletions.
1 change: 0 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand Down
2 changes: 1 addition & 1 deletion e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
Expand Down
9,633 changes: 5,306 additions & 4,327 deletions package-lock.json

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,51 +18,51 @@
},
"private": true,
"dependencies": {
"@angular/animations": "10.0.2",
"@angular/cdk": "^10.0.1",
"@angular/common": "10.0.2",
"@angular/compiler": "10.0.2",
"@angular/core": "10.0.2",
"@angular/forms": "10.0.2",
"@angular/material": "^10.0.1",
"@angular/material-moment-adapter": "10.0.1",
"@angular/platform-browser": "10.0.2",
"@angular/platform-browser-dynamic": "10.0.2",
"@angular/router": "10.0.2",
"@angular/animations": "11.0.0",
"@angular/cdk": "^11.0.0",
"@angular/common": "11.0.0",
"@angular/compiler": "11.0.0",
"@angular/core": "11.0.0",
"@angular/forms": "11.0.0",
"@angular/material": "^11.0.0",
"@angular/material-moment-adapter": "11.0.0",
"@angular/platform-browser": "11.0.0",
"@angular/platform-browser-dynamic": "11.0.0",
"@angular/router": "11.0.0",
"body-parser": "^1.18.3",
"core-js": "^2.4.1",
"cypress": "^3.2.0",
"cypress": "^5.6.0",
"express": "^4.16.2",
"http-server": "^0.12.1",
"http-server": "^0.12.3",
"moment": "^2.22.2",
"npm-run-all": "^4.1.5",
"rxjs": "6.5.4",
"tslib": "^2.0.0",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.0",
"@angular/cli": "^10.0.0",
"@angular/compiler-cli": "10.0.2",
"@angular/language-service": "10.0.2",
"@angular-devkit/build-angular": "^0.1100.1",
"@angular/cli": "^11.0.1",
"@angular/compiler-cli": "11.0.0",
"@angular/language-service": "11.0.0",
"@cypress/webpack-preprocessor": "^4.0.3",
"@types/express": "^4.0.39",
"@types/jasmine": "~2.5.53",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.2",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~3.5.0",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma": "~5.1.1",
"karma-chrome-launcher": "~3.1.0",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~3.3.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~7.0.0",
"start-server-and-test": "^1.9.1",
"ts-node": "~3.2.0",
"tslint": "~6.1.0",
"typescript": "3.9.5"
"typescript": "4.0.5"
}
}
2 changes: 1 addition & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const routes: Routes = [
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
exports: [RouterModule]
})
export class AppRoutingModule { }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {CoursesCardListComponent} from './courses-card-list.component';
import {CoursesModule} from '../courses.module';
import {COURSES} from '../../../../server/db-data';
Expand All @@ -16,7 +16,7 @@ describe('CoursesCardListComponent', () => {
let fixture: ComponentFixture<CoursesCardListComponent>;
let el: DebugElement;

beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [CoursesModule]
})
Expand Down
6 changes: 3 additions & 3 deletions src/app/courses/home/home.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, fakeAsync, flush, flushMicrotasks, TestBed, tick} from '@angular/core/testing';
import { ComponentFixture, fakeAsync, flush, flushMicrotasks, TestBed, tick, waitForAsync } from '@angular/core/testing';
import {CoursesModule} from '../courses.module';
import {DebugElement} from '@angular/core';

Expand Down Expand Up @@ -31,7 +31,7 @@ describe('HomeComponent', () => {



beforeEach(async(() => {
beforeEach(waitForAsync(() => {

const coursesServiceSpy = jasmine.createSpyObj('CoursesService', ['findAllCourses'])

Expand Down Expand Up @@ -124,7 +124,7 @@ describe('HomeComponent', () => {
}));


it("should display advanced courses when tab clicked - async", async(() => {
it("should display advanced courses when tab clicked - async", waitForAsync(() => {

coursesService.findAllCourses.and.returnValue(of(setupCourses()));

Expand Down
2 changes: 1 addition & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
Expand Down
2 changes: 1 addition & 1 deletion src/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"baseUrl": "./",
Expand Down
21 changes: 0 additions & 21 deletions tsconfig.base.json

This file was deleted.

36 changes: 20 additions & 16 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"files": [],
"references": [
{
"path": "./src/tsconfig.app.json"
},
{
"path": "./src/tsconfig.spec.json"
}
]
}
"compileOnSave": false,
"compilerOptions": {
"module": "esnext",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"dom",
"ES2017.object"
]
}
}

0 comments on commit 5485b99

Please sign in to comment.