From 3deba51322871e23d5a09f46bf50e584474369cd Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 28 Jun 2018 13:28:56 +0300 Subject: [PATCH] Updated Angular & Angular Material Increase the Fuse version number Fixed the HMR serve ('npm run start-hmr' and 'npm run start-hmr-sourcemaps') --- angular.json | 15 ++++--- package-lock.json | 92 +++++++++++++++++++++---------------------- package.json | 34 ++++++++-------- src/main.ts | 2 +- src/tsconfig.app.json | 3 +- 5 files changed, 75 insertions(+), 71 deletions(-) diff --git a/angular.json b/angular.json index 37ba479d..aef36c43 100644 --- a/angular.json +++ b/angular.json @@ -49,6 +49,14 @@ "extractLicenses": true, "vendorChunk": false, "buildOptimizer": true + }, + "hmr": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.hmr.ts" + } + ] } } }, @@ -63,12 +71,7 @@ }, "hmr": { "hmr": true, - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.hmr.ts" - } - ] + "browserTarget": "fuse:build:hmr" } } }, diff --git a/package-lock.json b/package-lock.json index b777e013..6fa2d809 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse", - "version": "6.1.2", + "version": "6.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -121,17 +121,17 @@ } }, "@angular/animations": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.5.tgz", - "integrity": "sha512-zW/qX3CvsuRDOcTNFFSf7uXktvq1jRrfKR8LdGQ/DER1GU3o8pR3z3H8gHy8lAFc3PESfETtzXinKUNzvTDfpA==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.7.tgz", + "integrity": "sha512-yOig45sxzpEmlXy+eFgh2v2yxoE/Hh9rn7BX82uj71yobSpCYoe58AEOay1cu0FCcLi/P5qltHepDrRRxNxPMw==", "requires": { "tslib": "^1.9.0" } }, "@angular/cdk": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.3.0.tgz", - "integrity": "sha512-L1NM2hU8xvb35mDKIw+SR9UZGZtbSQl6fmd9X/tedaNYjIvyQ7SIX7iDJ+LqD0xUQopB+SeuhDL7D6IwGMV2bQ==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.3.1.tgz", + "integrity": "sha512-TEf1pstDmoLk4C0H45CxpdkBLunNYRQS1pCyWf7hWOHC0M0m130CYZ+rMt4uVDLe4NxiFUk3XwHITB3AuSlCOQ==", "requires": { "tslib": "^1.7.1" } @@ -174,25 +174,25 @@ } }, "@angular/common": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.5.tgz", - "integrity": "sha512-xL4Aq+uGQcmHYs90WSKsS9vBC1XO042hM5lSVz+zyYtYzYHdt/Qg1CIuR3zkP+8DG+mf1QZqbg5YtQx5XykmgA==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.7.tgz", + "integrity": "sha512-MUCCs3FLwqyp5wuvkUTHVGMTd3bNGDxD5IJNvaLgVliGe4r0IlETRXYqyRPs7gdVFPbiJ97P1DUONArj9xL9XA==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.5.tgz", - "integrity": "sha512-Oe0VRCyKfHLatalRuXjCdgaY6hhiMXEL/ueknMJFC0+xA73mEchmLYXj64/1ed753cjnLOM2qbVVwqhc26tmEg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.7.tgz", + "integrity": "sha512-J9I2U4NiWIBXl0ZOJkBW5G7xXhphggSirTwFLD4yKCTeJXgyldZytJZRkDUx1uouZtI2/PycvaOZoRr85N67AA==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.5.tgz", - "integrity": "sha512-onRlVLWo1mTdyxLMRtW4iPntTUglJl9T0hacRlscKKlAUT8jaSfqIyknCF3jEXJrTnfKdypen053U7g2ajifrA==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.7.tgz", + "integrity": "sha512-nDIo4TtE3oXgZiQ5vJEcr5fi3FuXRDJQSOeOQinpCrtEt3s4pU5WAX5DLFGPSD2C/EXRDvHZgF9OTJeu5U4ErQ==", "dev": true, "requires": { "chokidar": "^1.4.2", @@ -335,9 +335,9 @@ } }, "@angular/core": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.5.tgz", - "integrity": "sha512-yG4Qz5wHWgFYOCtX62F8MmJ1wZwZA1ALbyQC+WAZfi7Y8Asx8TShJ+3QKUDYwO1jj530pqNbfauDTCmPzzPvaQ==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.7.tgz", + "integrity": "sha512-aZ0NvbYsMGqg0zUu7+9vuDxnGzwe++RsBBhlwHZHz1ZZwJmU6VJhUhaI+MuKC7rHyFFr9vUxvJ7ilhGaK2+J7A==", "requires": { "tslib": "^1.9.0" } @@ -351,63 +351,63 @@ } }, "@angular/forms": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.5.tgz", - "integrity": "sha512-d1SdhAQ/W1n3vtm1lp5y16EaUylcZ2wftLUj6MSne3bH/2MJ6JsxJKwX+MfPcQCo+DCfG5bF0UMCa1KAwUQthQ==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.7.tgz", + "integrity": "sha512-bFRdWxLmTiG7z0yZaq22oBHTgVSpJwUJEbZ5ieu21JqTgIDYne+YR/xCJrPj+P2S5NDlEK84g/4y4GoNt/thhQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/http": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.5.tgz", - "integrity": "sha512-N9lx1s1h4wki1ob4qne3FdyAWG3TcCAGnUAjDmZ1+c/hhxtcv0iEJ22nBrGkPIsUxIPXg0JgsD1hKhu5DGEbWg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.7.tgz", + "integrity": "sha512-zk/kjsfEXjEQIRpmsjuJO5wgFNxj7JGY6Bq0nianZuyCuj/mlm0zflww2NLX4O22IMnvVSun2Kx+kDY44n4hfw==", "requires": { "tslib": "^1.9.0" } }, "@angular/language-service": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.0.5.tgz", - "integrity": "sha512-PH06chMTcWTLfVxZqpXksIx9969N/azEghYx0U+MzlGomeaaBXr7RuZWHRVn/lD5XljrqdWAQSMc+abbn1oKgg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.0.7.tgz", + "integrity": "sha512-R96kTy9Hpy5QPHirJz+5JjnzjJZdwbGwZ6rpq79Fe15RYaYfMjFTAAhmmOgWrnTFBug0QWBWyKV7950JcJIr3Q==", "dev": true }, "@angular/material": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.3.0.tgz", - "integrity": "sha512-asSzdfLkDDbQEyM/GKUxrlvuj8OvO5DqrNJ3e3uvi0OmZDpaO50yubQvrJ26nbqgwgRo+qwiGNN6XcFwYTRVPQ==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.3.1.tgz", + "integrity": "sha512-2M5be3Re1EqTl+i5KuS54P/s+i2AQYlv6swR8ukwXR2arwXy8ewtuwiPjUQulpuEaUkKTQ3f6WndXAgP40Ou7A==", "requires": { "tslib": "^1.7.1" } }, "@angular/material-moment-adapter": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.3.0.tgz", - "integrity": "sha512-klnwQFKZzjQhtp6chu07KyDtUnnv+ZmPBUB+i8CtmO5yUUPAPUUkljj99V0R19fVakzyAfjFmUxpaKnA6F9p0w==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.3.1.tgz", + "integrity": "sha512-rttEepHc/eVEUEErz8eg6063KC79vVN6/rATuoabfgtIqtoSEuft18SkwCt7gQz6lWtuJA1oFc3HIXhN8gxKBw==", "requires": { "tslib": "^1.7.1" } }, "@angular/platform-browser": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.5.tgz", - "integrity": "sha512-FSsA9C3cJa7S4SPUAhypKlTQf4uA4hiqx/h65v7frDiyRVHv22oWKX7aKmyyb9oP5FHN/TDeQiRn4m8XNqG6AQ==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.7.tgz", + "integrity": "sha512-CASH1CDr2DD+aBrWN9qpDDFTI3H6p/oqH23h28bEV+LZl7F57r4sj8KXKgaE+mcrOFRQqXTAlPoq3hRCLmhtVA==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.5.tgz", - "integrity": "sha512-TTSLOMVrgRXI29xmBWsnSp8187vbWnbj0YEehuyup2FmltUl+H5Vms7poWV9/6fI3RnW3Yg9Ziv3T5iKqsiADQ==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.7.tgz", + "integrity": "sha512-8G45A9w8UJvX3vPEHqeJHt/sd0zu6w1M+rsnOCo78r35SjsLbrmDNhc4VkLZFJ+iNjgPWtNtdpeXQqtTHE46yw==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.5.tgz", - "integrity": "sha512-M3cb5CDX+WvkM2xmFeP64zPwLJ6by6cyzl5OCfEQjoTGKOFY7N2B4kHAOw5KJN3nIEd0PersSBgf11Y9g7GPwA==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.7.tgz", + "integrity": "sha512-KuQBeIgfiwV3bLafepMhYVJQIAF8cTckCudFh5Z0OqckJgGsWSgtvEdtBctPi+lzt7OQBi7Ym2rOv3X0dOvu0Q==", "requires": { "tslib": "^1.9.0" } @@ -5475,9 +5475,9 @@ "dev": true }, "install": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/install/-/install-0.11.0.tgz", - "integrity": "sha512-30UqvWKr/59SStU2/bRye4wT1S3mzjwa0oV+BxusB0neGqhxUrwLlnXDbt6QtIfBxCNWFqg+ARnGNjFj8XuV5A==" + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/install/-/install-0.11.2.tgz", + "integrity": "sha512-vm3WeuqkmCK/jD56s7pWLKl4QoHMdcIwLlsMAFYV3XAbrz+RdyOJvtIQn/A1LiaNz2djUdwec01/90KLSIaUGg==" }, "internal-ip": { "version": "1.2.0", diff --git a/package.json b/package.json index 810ce816..9b85d441 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "fuse", - "version": "6.1.2", + "version": "6.1.3", "license": "https://themeforest.net/licenses/terms/regular", "scripts": { "ng": "ng", "start": "ng serve --open", - "start-hmr": "ng serve --configuration hmr -sm=false", - "start-hmr-sourcemaps": "ng serve --hmr -e=hmr", + "start-hmr": "ng serve --configuration hmr --source-map=false --hmr-warning=false", + "start-hmr-sourcemaps": "ng serve --configuration hmr --source-map=true --hmr-warning=false", "build": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev", "build-stats": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev --stats-json", "build-prod": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod", @@ -19,19 +19,19 @@ "private": true, "dependencies": { "@agm/core": "1.0.0-beta.3", - "@angular/animations": "6.0.5", - "@angular/cdk": "6.3.0", - "@angular/common": "6.0.5", - "@angular/compiler": "6.0.5", - "@angular/core": "6.0.5", + "@angular/animations": "6.0.7", + "@angular/cdk": "6.3.1", + "@angular/common": "6.0.7", + "@angular/compiler": "6.0.7", + "@angular/core": "6.0.7", "@angular/flex-layout": "6.0.0-beta.16", - "@angular/forms": "6.0.5", - "@angular/http": "6.0.5", - "@angular/material": "6.3.0", - "@angular/material-moment-adapter": "6.3.0", - "@angular/platform-browser": "6.0.5", - "@angular/platform-browser-dynamic": "6.0.5", - "@angular/router": "6.0.5", + "@angular/forms": "6.0.7", + "@angular/http": "6.0.7", + "@angular/material": "6.3.1", + "@angular/material-moment-adapter": "6.3.1", + "@angular/platform-browser": "6.0.7", + "@angular/platform-browser-dynamic": "6.0.7", + "@angular/router": "6.0.7", "@ngrx/effects": "6.0.1", "@ngrx/router-store": "6.0.1", "@ngrx/store": "6.0.1", @@ -63,8 +63,8 @@ }, "devDependencies": { "@angular/cli": "6.0.8", - "@angular/compiler-cli": "6.0.5", - "@angular/language-service": "6.0.5", + "@angular/compiler-cli": "6.0.7", + "@angular/language-service": "6.0.7", "@angular-devkit/build-angular": "0.6.8", "@angularclass/hmr": "2.1.3", "@types/jasmine": "2.8.8", diff --git a/src/main.ts b/src/main.ts index a0509afd..2092031e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -26,5 +26,5 @@ if ( environment.hmr ) } else { - bootstrap(); + bootstrap().catch(err => console.log(err)); } diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index e57578c8..17fb7170 100644 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -2,7 +2,8 @@ "extends": "../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "module": "es2015" + "module": "es2015", + "types": ["node"] }, "exclude": [ "src/test.ts",