Skip to content

Commit

Permalink
feat(build): bump angular to 8.x #56
Browse files Browse the repository at this point in the history
  • Loading branch information
why520crazy committed Dec 24, 2019
1 parent bf551dc commit 52d6bdf
Show file tree
Hide file tree
Showing 6 changed files with 5,926 additions and 2,295 deletions.
46 changes: 14 additions & 32 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
}
},
"serve": {
"builder": "@angular-builders/dev-server:generic",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "portal:build",
"proxyConfig": "proxy.conf.js",
Expand Down Expand Up @@ -137,24 +137,14 @@
"prefix": "app1",
"schematics": {},
"architect": {
"build-webpack": {
"builder": "@angular-devkit/build-webpack:webpack",
"options": {
"webpackConfig": "./examples/app1/webpack.config.js"
}
},
"serve-webpack": {
"builder": "@angular-devkit/build-webpack:webpack-dev-server",
"options": {
"webpackConfig": "./examples/app1/webpack.config.js"
}
},
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"customWebpackConfig": {
"path": "./examples/app1/extra-webpack.config.js",
"mergeStrategies": { "module.rules": "prepend" },
"mergeStrategies": {
"module.rules": "prepend"
},
"replaceDuplicatePlugins": true
},
"outputPath": "dist/app1",
Expand Down Expand Up @@ -194,10 +184,11 @@
}
},
"serve": {
"builder": "@angular-builders/dev-server:generic",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "app1:build",
"port": 3001
"port": 3001,
"vendorChunk": false
},
"configurations": {
"production": {
Expand Down Expand Up @@ -239,24 +230,14 @@
"prefix": "app2",
"schematics": {},
"architect": {
"build-webpack": {
"builder": "@angular-devkit/build-webpack:webpack",
"options": {
"webpackConfig": "./examples/app2/webpack.config.js"
}
},
"serve-webpack": {
"builder": "@angular-devkit/build-webpack:webpack-dev-server",
"options": {
"webpackConfig": "./examples/app2/webpack.config.js"
}
},
"build": {
"builder": "@angular-builders/custom-webpack:browser",
"options": {
"customWebpackConfig": {
"path": "./examples/app1/extra-webpack.config.js",
"mergeStrategies": { "module.rules": "prepend" },
"path": "./examples/app2/extra-webpack.config.js",
"mergeStrategies": {
"module.rules": "prepend"
},
"replaceDuplicatePlugins": true
},
"outputPath": "dist/app2",
Expand Down Expand Up @@ -296,10 +277,11 @@
}
},
"serve": {
"builder": "@angular-builders/dev-server:generic",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "app2:build",
"port": 3002
"port": 3002,
"vendorChunk": false
},
"configurations": {
"production": {
Expand Down
2 changes: 1 addition & 1 deletion examples/app1/src/app/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ThyDialog } from 'ngx-tethys';
templateUrl: './dashboard.component.html'
})
export class DashboardComponent {
@ViewChild('container') containerElementRef: ElementRef<HTMLDivElement>;
@ViewChild('container', { static: true }) containerElementRef: ElementRef<HTMLDivElement>;

private componentRef: PlanetComponentRef;

Expand Down
3 changes: 3 additions & 0 deletions examples/app2/extra-webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
const WebpackAssetsManifest = require('webpack-assets-manifest');

module.exports = {
optimization: {
runtimeChunk: false
},
plugins: [new WebpackAssetsManifest()]
};
6 changes: 4 additions & 2 deletions extra-webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
module.exports = {

}
optimization: {
runtimeChunk: false
}
};
Loading

0 comments on commit 52d6bdf

Please sign in to comment.