Skip to content

Commit

Permalink
Updated Angular, RxJS and Webpack
Browse files Browse the repository at this point in the history
- updated Angular to v6.0.1 and @nguniversal to v6.0.0
- updated RxJS to v6.0.0 (also added rxjs-compat@v6.0.1)
- updated Webpack to v4.8.3 (also added webpack-cli@v2.1.3)
- added HotModuleReplacement support
  • Loading branch information
bojidaryovchev committed May 16, 2018
1 parent 8820d0e commit b3db783
Show file tree
Hide file tree
Showing 19 changed files with 245 additions and 179 deletions.
86 changes: 0 additions & 86 deletions .angular-cli.json

This file was deleted.

1 change: 0 additions & 1 deletion Procfile

This file was deleted.

139 changes: 139 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"nest-angular": {
"root": "",
"sourceRoot": "src/client",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "./dist/browser",
"index": "./src/client/index.html",
"main": "./src/client/main.ts",
"tsConfig": "./src/client/tsconfig.browser.json",
"polyfills": "./src/client/polyfills.ts",
"assets": [
"./src/client/assets",
"./src/client/favicon.ico"
],
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"./src/client/styles.scss"
],
"scripts": []
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "./src/client/environments/environment.ts",
"with": "./src/client/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "nest-angular:build"
},
"configurations": {
"production": {
"browserTarget": "nest-angular:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "nest-angular:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "./src/client/test.ts",
"karmaConfig": "./src/client/karma.conf.js",
"polyfills": "./src/client/polyfills.ts",
"tsConfig": "./src/client/tsconfig.spec.json",
"scripts": [],
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"./src/client/styles.scss"
],
"assets": [
"./src/client/assets",
"./src/client/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"./src/client/tsconfig.app.json",
"./src/client/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"server": {
"builder": "@angular-devkit/build-angular:server",
"options": {
"outputPath": "./dist/server",
"main": "./src/client/main.server.ts",
"tsConfig": "./src/client/tsconfig.server.json"
}
}
}
},
"nest-angular-e2e": {
"root": "./e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./e2e/protractor.conf.js",
"devServerTarget": "nest-angular:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "./e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "nest-angular",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
File renamed without changes.
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": "../src/tsconfig.json",
"extends": "../src/client/tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
Expand Down
84 changes: 44 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"build:server": "webpack --progress --colors",
"build:server:prod": "webpack -p --progress --colors",
"build": "npm run build:universal && npm run build:server",
"watch:server": "webpack --w --colors",
"build:server": "rimraf ./bin && webpack --progress --colors",
"build:server:prod": "rimraf ./bin && webpack -p --progress --colors",
"build": "rimraf ./bin && npm run build:universal && npm run build:server",
"watch:server": "rimraf ./bin && webpack --w --colors",
"watch:client": "ng serve --proxy-config proxy.conf.json",
"watch": "concurrent \" npm run watch:server \" \" npm run watch:client \" ",
"build:universal": "ng build --prod && ng build --prod --app 1 --output-hashing=false"
"watch": "rimraf ./bin && concurrent \" npm run watch:server \" \" npm run watch:client \" ",
"build:universal": "ng build --prod && ng run nest-angular:server"
},
"repository": {
"type": "git",
Expand All @@ -30,13 +30,14 @@
},
"homepage": "https://github.com/bojidaryovchev/nest-angular#readme",
"devDependencies": {
"@angular/cli": "1.7.3",
"@angular/compiler-cli": "5.2.9",
"@angular/language-service": "5.2.9",
"@angular-devkit/build-angular": "0.6.1",
"@angular/cli": "6.0.1",
"@angular/compiler-cli": "6.0.1",
"@angular/language-service": "6.0.1",
"@types/cookie-parser": "1.4.1",
"@types/express": "4.11.0",
"@types/helmet": "0.0.37",
"@types/jasmine": "2.8.4",
"@types/jasmine": "2.8.6",
"@types/jasminewd2": "2.0.3",
"@types/joi": "13.0.5",
"@types/jsonwebtoken": "7.2.5",
Expand All @@ -45,69 +46,72 @@
"@types/passport": "0.4.2",
"@types/passport-jwt": "3.0.1",
"@types/passport-local": "1.0.32",
"codelyzer": "4.1.0",
"codelyzer": "4.2.1",
"concurrently": "3.5.1",
"jasmine-core": "2.9.1",
"jasmine-spec-reporter": "4.2.1",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-cli": "1.0.1",
"karma-coverage-istanbul-reporter": "1.3.3",
"karma-coverage-istanbul-reporter": "1.4.2",
"karma-jasmine": "1.1.1",
"karma-jasmine-html-reporter": "0.2.2",
"node-sass": "4.7.2",
"nodemon-webpack-plugin": "0.1.6",
"protractor": "5.2.2",
"ts-loader": "3.2.0",
"ts-node": "4.1.0",
"nodemon-webpack-plugin": "4.0.3",
"protractor": "5.3.0",
"rimraf": "2.6.2",
"ts-loader": "4.3.0",
"ts-node": "5.0.1",
"tslint": "5.9.1",
"tslint-loader": "3.5.3",
"typescript": "2.6.2",
"webpack": "3.10.0",
"webpack-node-externals": "1.6.0"
"tslint-loader": "3.6.0",
"typescript": "2.7.2",
"webpack": "4.8.3",
"webpack-cli": "2.1.3",
"webpack-node-externals": "1.7.2"
},
"dependencies": {
"@angular/animations": "5.2.9",
"@angular/cdk": "5.2.4",
"@angular/common": "5.2.9",
"@angular/compiler": "5.2.9",
"@angular/core": "5.2.9",
"@angular/flex-layout": "5.0.0-beta.13",
"@angular/forms": "5.2.9",
"@angular/http": "5.2.9",
"@angular/material": "5.2.4",
"@angular/platform-browser": "5.2.9",
"@angular/platform-browser-dynamic": "5.2.9",
"@angular/platform-server": "5.2.9",
"@angular/router": "5.2.9",
"@angular/animations": "6.0.1",
"@angular/cdk": "6.0.1",
"@angular/common": "6.0.1",
"@angular/compiler": "6.0.1",
"@angular/core": "6.0.1",
"@angular/flex-layout": "6.0.0-beta.15",
"@angular/forms": "6.0.1",
"@angular/http": "6.0.1",
"@angular/material": "6.0.1",
"@angular/platform-browser": "6.0.1",
"@angular/platform-browser-dynamic": "6.0.1",
"@angular/platform-server": "6.0.1",
"@angular/router": "6.0.1",
"@nestjs/common": "4.6.6",
"@nestjs/core": "4.6.6",
"@nestjs/microservices": "4.6.6",
"@nestjs/testing": "4.6.6",
"@nestjs/websockets": "4.6.6",
"@nguniversal/express-engine": "5.0.0-beta.6",
"@nguniversal/module-map-ngfactory-loader": "5.0.0-beta.6",
"@nguniversal/express-engine": "6.0.0",
"@nguniversal/module-map-ngfactory-loader": "6.0.0",
"@types/request": "2.47.0",
"body-parser": "1.18.2",
"bootstrap": "3.3.7",
"cookie-parser": "1.4.3",
"core-js": "2.5.3",
"core-js": "2.5.4",
"express": "4.16.2",
"hammerjs": "2.0.8",
"helmet": "3.11.0",
"joi": "13.1.2",
"jsonwebtoken": "8.1.1",
"mongoose": "4.13.9",
"passport": "0.4.0",
"passport-facebook-token": "^3.3.0",
"passport-facebook-token": "3.3.0",
"passport-google-plus-token": "2.1.0",
"passport-jwt": "3.0.1",
"passport-local": "1.0.0",
"passport-twitter-token": "^1.3.0",
"passport-twitter-token": "1.3.0",
"redis": "2.8.0",
"reflect-metadata": "0.1.10",
"request": "2.85.0",
"rxjs": "5.5.6",
"zone.js": "0.8.20"
"rxjs": "6.1.0",
"rxjs-compat": "6.1.0",
"zone.js": "0.8.26"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { RecipeItem } from '../recipes-list/recipe-item/recipe-item.component';
import { RecipesService } from '../../../services/recipes.service';
import { ActivatedRoute, Params, Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { Observable } from 'rxjs';

@Component({
selector: 'app-recipe-details',
Expand Down
Loading

0 comments on commit b3db783

Please sign in to comment.