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

[PM-4347] Upgrade angular to 17 #11031

Merged
merged 15 commits into from
Nov 4, 2024
+3,972 −6,856
Merged

[PM-4347] Upgrade angular to 17 #11031

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
46bc7cc
Upgrade angular to 17
Hinton Sep 8, 2024
73a50bb
Handle routing loop on vault page
Hinton Sep 13, 2024
9635dfc
Change @typescript-eslint version
Hinton Sep 13, 2024
b8f9b46
Merge branch 'main' of github.com:bitwarden/clients into ps/angular17
Hinton Oct 11, 2024
cc8be03
Update TypeScript
justindbaur Oct 14, 2024
2098f21
Merge remote-tracking branch 'origin/main' into ps/angular17
justindbaur Oct 16, 2024
2bb307c
Remove `isActive` Check
justindbaur Oct 17, 2024
f607438
Remove Extraneous Change
justindbaur Oct 17, 2024
b67de9f
Merge branch 'main' into ps/angular17
justindbaur Oct 17, 2024
fb65e47
Work Around `test:types`
justindbaur Oct 21, 2024
d0b9a46
Merge remote-tracking branch 'origin/main' into ps/angular17
justindbaur Oct 21, 2024
a1c1d1a
Fix Story
justindbaur Oct 22, 2024
7285a86
Update Story Documentation
justindbaur Oct 22, 2024
020ab71
Merge branch 'main' of github.com:bitwarden/clients into ps/angular17
Hinton Nov 4, 2024
1b2f846
Merge branch 'main' of github.com:bitwarden/clients into ps/angular17
Hinton Nov 4, 2024
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
4 changes: 2 additions & 2 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "test-storybook:build:production"
"buildTarget": "test-storybook:build:production"
},
"development": {
"browserTarget": "test-storybook:build:development"
"buildTarget": "test-storybook:build:development"
}
},
"defaultConfiguration": "development"
Expand Down
3 changes: 1 addition & 2 deletions apps/web/src/polyfills.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import "core-js/stable";
require("zone.js/dist/zone");
import "zone.js";

Check warning on line 2 in apps/web/src/polyfills.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/polyfills.ts#L2 

Added line #L2 was not covered by tests

if (process.env.NODE_ENV === "production") {
// Production
} else {
// Development and test
Error["stackTraceLimit"] = Infinity;
require("zone.js/dist/long-stack-trace-zone");
}
3 changes: 2 additions & 1 deletion libs/common/src/platform/state/implementations/default-active-user-state.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ describe("DefaultActiveUserState", () => {
it("should not emit a previous users value if that user is no longer active", async () => {
const user1Data: Jsonify<TestState> = {
date: "2020-09-21T13:14:17.648Z",
array: ["value"],
// NOTE: `as any` is here until we migrate to Nx: https://bitwarden.atlassian.net/browse/PM-6493
array: ["value"] as any,
};
const user2Data: Jsonify<TestState> = {
date: "2020-09-21T13:14:17.648Z",
Expand Down
3 changes: 2 additions & 1 deletion libs/common/src/platform/state/key-definition.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ describe("KeyDefinition", () => {
expect(arrayDefinition).toBeTruthy();
expect(arrayDefinition.deserializer).toBeTruthy();

const deserializedValue = arrayDefinition.deserializer([false, true]);
// NOTE: `as any` is here until we migrate to Nx: https://bitwarden.atlassian.net/browse/PM-6493
const deserializedValue = arrayDefinition.deserializer([false, true] as any);

expect(deserializedValue).toBeTruthy();
expect(deserializedValue).toHaveLength(2);
Expand Down
3 changes: 2 additions & 1 deletion libs/common/src/vault/models/domain/login.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ describe("Login DTO", () => {
password: "myPassword" as EncryptedString,
passwordRevisionDate: passwordRevisionDate.toISOString(),
totp: "myTotp" as EncryptedString,
// NOTE: `as any` is here until we migrate to Nx: https://bitwarden.atlassian.net/browse/PM-6493
fido2Credentials: [
{
credentialId: "keyId" as EncryptedString,
Expand All @@ -167,7 +168,7 @@ describe("Login DTO", () => {
discoverable: "discoverable" as EncryptedString,
creationDate: fido2CreationDate.toISOString(),
},
],
] as any,
});

expect(actual).toEqual({
Expand Down
2 changes: 1 addition & 1 deletion libs/components/src/item/item.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ The content can be a button, anchor, or static container.
<bit-item>
<button bit-item-content type="button">
<bit-avatar slot="start" text="Foo"></bit-avatar>
foo@bitwarden.com
Copy link
Member

@justindbaur justindbaur Oct 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bitwarden/team-design-system Since this is just rendering text it would be fine for us to have @ for readability or also switch it to &#64; so we aren't showing off invalid HTML, any preference?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm I am fine with either, just not really understanding why it broke 🤔 I guess it's a reserved character for Angular html?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's always technically not right to use it but likely angular got much more strict about it with the addition of the new control flow syntax: https://angular.dev/guide/templates/control-flow

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay that makes sense. Then yes I agree with not showing invalid html in the docs file!

foo&#64;bitwarden.com
<span bitBadge variant="primary" slot="default-trailing">Auto-fill</span>
<ng-container slot="secondary">
<div>Bitwarden.com</div>
Expand Down
18 changes: 9 additions & 9 deletions libs/components/src/item/item.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export const ContentSlots: Story = {
slot="start"
[text]="'Foo'"
></bit-avatar>
foo@bitwarden.com
foo&#64;bitwarden.com
<ng-container slot="secondary">
<div>Bitwarden.com</div>
<div><em>locked</em></div>
Expand Down Expand Up @@ -285,37 +285,37 @@ export const SingleActionList: Story = {
<a bit-item-content href="#">
Foobar
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
<bit-item>
<a bit-item-content href="#">
Foobar
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
<bit-item>
<a bit-item-content href="#">
Foobar
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
<bit-item>
<a bit-item-content href="#">
Foobar
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
<bit-item>
<a bit-item-content href="#">
Foobar
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
<bit-item>
<a bit-item-content href="#">
Foobar
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
</bit-item-group>
`,
Expand All @@ -332,14 +332,14 @@ export const SingleActionWithBadge: Story = {
Foobar
<span bitBadge variant="primary" slot="default-trailing">Auto-fill</span>
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
<bit-item>
<a bit-item-content href="#">
Helloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo!
<span bitBadge variant="primary" slot="default-trailing">Auto-fill</span>
<i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
</a>
</a>
</bit-item>
</bit-item-group>
`,
Expand Down
Loading
Loading