Skip to content

Commit b3dde2b

Browse files
committed
Upgrade to Angular 9
1 parent 36389eb commit b3dde2b

16 files changed

+9727
-10708
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ indent_size = 2
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11+
[*.ts]
12+
quote_type = single
13+
1114
[*.md]
1215
max_line_length = off
1316
trim_trailing_whitespace = false

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
/node_modules
1212

1313
# profiling files
14-
chrome-profiler-events.json
15-
speed-measure-plugin.json
14+
chrome-profiler-events*.json
15+
speed-measure-plugin*.json
1616

1717
# IDEs and editors
1818
/.idea

angular.json

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"prefix": "app",
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
14+
"builder": "@angular-builders/custom-webpack:browser",
1515
"options": {
1616
"outputPath": "dist/cesium-angular-example",
1717
"index": "src/index.html",
1818
"main": "src/main.ts",
1919
"polyfills": "src/polyfills.ts",
2020
"tsConfig": "tsconfig.app.json",
21-
"aot": false,
21+
"aot": true,
2222
"assets": [
2323
"src/favicon.ico",
2424
"src/assets",
@@ -31,7 +31,11 @@
3131
"styles": [
3232
"node_modules/cesium/Build/Cesium/Widgets/widgets.css",
3333
"src/styles.css"
34-
]
34+
],
35+
"scripts": [],
36+
"customWebpackConfig": {
37+
"path": "./extra-webpack.config.js"
38+
}
3539
},
3640
"configurations": {
3741
"production": {
@@ -46,7 +50,6 @@
4650
"sourceMap": false,
4751
"extractCss": true,
4852
"namedChunks": false,
49-
"aot": true,
5053
"extractLicenses": true,
5154
"vendorChunk": false,
5255
"buildOptimizer": true,
@@ -55,13 +58,18 @@
5558
"type": "initial",
5659
"maximumWarning": "2mb",
5760
"maximumError": "5mb"
61+
},
62+
{
63+
"type": "anyComponentStyle",
64+
"maximumWarning": "6kb",
65+
"maximumError": "10kb"
5866
}
5967
]
6068
}
6169
}
6270
},
6371
"serve": {
64-
"builder": "@angular-devkit/build-angular:dev-server",
72+
"builder": "@angular-builders/custom-webpack:dev-server",
6573
"options": {
6674
"browserTarget": "cesium-angular-example:build"
6775
},
@@ -96,7 +104,8 @@
96104
"styles": [
97105
"node_modules/cesium/Build/Cesium/Widgets/widgets.css",
98106
"src/styles.css"
99-
]
107+
],
108+
"scripts": []
100109
}
101110
},
102111
"lint": {

e2e/protractor.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exports.config = {
1313
'./src/**/*.e2e-spec.ts'
1414
],
1515
capabilities: {
16-
'browserName': 'chrome'
16+
browserName: 'chrome'
1717
},
1818
directConnect: true,
1919
baseUrl: 'http://localhost:4200/',

e2e/src/app.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('workspace-project App', () => {
1010

1111
it('should display welcome message', () => {
1212
page.navigateTo();
13-
expect(page.getTitleText()).toEqual('Welcome to cesium-angular-example!');
13+
expect(page.getTitleText()).toEqual('cesium-angular-example app is running!');
1414
});
1515

1616
afterEach(async () => {

e2e/src/app.po.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { browser, by, element } from 'protractor';
22

33
export class AppPage {
4-
navigateTo() {
5-
return browser.get(browser.baseUrl) as Promise<any>;
4+
navigateTo(): Promise<unknown> {
5+
return browser.get(browser.baseUrl) as Promise<unknown>;
66
}
77

8-
getTitleText() {
9-
return element(by.css('app-root h1')).getText() as Promise<string>;
8+
getTitleText(): Promise<string> {
9+
return element(by.css('app-root .content span')).getText() as Promise<string>;
1010
}
1111
}

extra-webpack.config.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = {
2+
node: {
3+
fs: "empty",
4+
Buffer: false,
5+
http: "empty",
6+
https: "empty",
7+
zlib: "empty"
8+
},
9+
module: {
10+
unknownContextCritical: false
11+
}
12+
};

0 commit comments

Comments
 (0)