Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1734fb0

Browse files
committed
build: upgrade Angular to 11 and Cesium to 1.75
1 parent 03cb700 commit 1734fb0

File tree

14 files changed

+3274
-1685
lines changed

14 files changed

+3274
-1685
lines changed

‎angular.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"optimization": true,
4949
"outputHashing": "all",
5050
"sourceMap": false,
51-
"extractCss": true,
5251
"namedChunks": false,
5352
"extractLicenses": true,
5453
"vendorChunk": false,
@@ -134,6 +133,7 @@
134133
}
135134
}
136135
}
137-
}},
136+
}
137+
},
138138
"defaultProject": "cesium-angular-example"
139139
}

‎e2e/protractor.conf.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ exports.config = {
1616
browserName: 'chrome'
1717
},
1818
directConnect: true,
19+
SELENIUM_PROMISE_MANAGER: false,
1920
baseUrl: 'http://localhost:4200/',
2021
framework: 'jasmine',
2122
jasmineNodeOpts: {

‎e2e/src/app.e2e-spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ describe('workspace-project App', () => {
88
page = new AppPage();
99
});
1010

11-
it('should display welcome message', () => {
12-
page.navigateTo();
13-
expect(page.getTitleText()).toEqual('cesium-angular-example app is running!');
11+
it('should display welcome message', async() => {
12+
awaitpage.navigateTo();
13+
expect(awaitpage.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(): Promise<unknown> {
5-
return browser.get(browser.baseUrl)asPromise<unknown>;
4+
asyncnavigateTo(): Promise<unknown> {
5+
return browser.get(browser.baseUrl);
66
}
77

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

‎e2e/tsconfig.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/* To learn more about this file see: https://angular.io/config/tsconfig. */
22
{
3-
"extends": "../tsconfig.base.json",
3+
"extends": "../tsconfig.json",
44
"compilerOptions": {
55
"outDir": "../out-tsc/e2e",
66
"module": "commonjs",
77
"target": "es2018",
88
"types": [
99
"jasmine",
10-
"jasminewd2",
1110
"node"
1211
]
1312
}

‎karma.conf.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,22 @@ module.exports = function (config) {
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
12-
require('karma-coverage-istanbul-reporter'),
12+
require('karma-coverage'),
1313
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client: {
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
18-
coverageIstanbulReporter: {
18+
jasmineHtmlReporter: {
19+
suppressAll: true // removes the duplicated traces
20+
},
21+
coverageReporter: {
1922
dir: require('path').join(__dirname, './coverage/cesium-angular-example'),
20-
reports: ['html', 'lcovonly', 'text-summary'],
21-
fixWebpackSourcePaths: true
23+
subdir: '.',
24+
reporters: [
25+
{ type: 'html' },
26+
{ type: 'text-summary' }
27+
]
2228
},
2329
reporters: ['progress', 'kjhtml'],
2430
port: 9876,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /