Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TPv2 Update Angular and make compilation stricter #6391

Merged
merged 15 commits into from
Dec 17, 2021
Merged

TPv2 Update Angular and make compilation stricter #6391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3579f71
Fix broken jasmine-core peer dependency
ocket8888 Nov 20, 2021
a765e99
update Angular to 12
ocket8888 Nov 20, 2021
29c700f
Update Angular to version 13
ocket8888 Nov 20, 2021
66c28a9
alphabetize compiler options, stop emitting decorator metadata
ocket8888 Nov 20, 2021
9648fb9
Update lib to ES2020, now targeting ES2017
ocket8888 Nov 20, 2021
9337dd5
Update gitignore for new Angular cache location
ocket8888 Nov 20, 2021
0819991
Update engine restriction, stop using deprecated ng build option
ocket8888 Nov 21, 2021
f2a480f
More strict compilation, including for templates
ocket8888 Dec 2, 2021
68feac3
Fix compilation errors
ocket8888 Dec 2, 2021
e800021
Squash warning about known commonJS dependency
ocket8888 Dec 2, 2021
f6b3a4f
Fix tests
ocket8888 Dec 2, 2021
8905a70
Fix end-to-end tests
ocket8888 Dec 2, 2021
f5a0e1a
make end-to-end tests compile more strict
ocket8888 Dec 2, 2021
e578c30
Update package-lock because somehow that didn't happen
ocket8888 Dec 2, 2021
7068893
Update node typings to match required Node version
ocket8888 Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions experimental/traffic-portal/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

# compiled output
/dist
/tmp
/out-tsc
/.angular
# Only exists if Bazel was run
/bazel-out

Expand Down
3 changes: 3 additions & 0 deletions experimental/traffic-portal/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"allowedCommonJsDependencies": [
"chart.js"
],
"outputPath": "dist/traffic-portal/browser",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down
12 changes: 8 additions & 4 deletions experimental/traffic-portal/e2e/src/app.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,20 @@ describe("workspace-project App", () => {
});

it("should allow login", async done => {
await page.usernameInput.sendKeys("admin");
await page.passwordInput.sendKeys("twelve12");
// TODO: put this in a config somewhere
await Promise.all([
page.usernameInput.sendKeys("admin"),
page.passwordInput.sendKeys("twelve12")
]);
await page.loginButton.click();
const loggedInURL = `${browser.baseUrl}core`;
try {
await browser.wait(until.urlIs(browser.baseUrl), 1000);
await browser.wait(until.urlIs(loggedInURL), 1000);
} catch(e) {
done.fail(`page did not navigate after login: ${e}`);
return;
}
expect(browser.getCurrentUrl()).toBe(browser.baseUrl);
expect(browser.getCurrentUrl()).toBe(loggedInURL);
done();
});

Expand Down
8 changes: 7 additions & 1 deletion experimental/traffic-portal/e2e/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"allowUnreachableCode": false,
"allowUnusedLabels": false,
"module": "commonjs",
"noImplicitReturns": true,
"noImplicitOverride": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"outDir": "../out-tsc/e2e",
"strict": true,
"target": "es2018",
"types": [
Expand Down
Loading