Skip to content
This repository was archived by the owner on Feb 15, 2026. It is now read-only.

Commit fedc15a

Browse files
committed
fix: upgrade to Angular v13
1 parent 79032a7 commit fedc15a

8 files changed

Lines changed: 5121 additions & 5299 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
3232
.history/*
3333

3434
# misc
35+
/.angular
3536
/.sass-cache
3637
/connect.lock
3738
/coverage

package-lock.json

Lines changed: 5087 additions & 5259 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "~12.0.0",
15-
"@angular/cdk": "^12.0.0",
16-
"@angular/common": "^12.0.0",
17-
"@angular/compiler": "^12.0.0",
18-
"@angular/core": "^12.0.0",
19-
"@angular/forms": "^12.0.0",
20-
"@angular/google-maps": "^12.0.0",
21-
"@angular/material": "^12.0.0",
22-
"@angular/platform-browser": "^12.0.0",
23-
"@angular/platform-browser-dynamic": "^12.0.0",
24-
"@angular/router": "~12.0.0",
25-
"rxjs": "~6.6.0",
14+
"@angular/animations": "~13.0.1",
15+
"@angular/cdk": "^13.0.1",
16+
"@angular/common": "^13.0.1",
17+
"@angular/compiler": "^13.0.1",
18+
"@angular/core": "^13.0.1",
19+
"@angular/forms": "^13.0.1",
20+
"@angular/google-maps": "^13.0.1",
21+
"@angular/material": "^13.0.1",
22+
"@angular/platform-browser": "^13.0.1",
23+
"@angular/platform-browser-dynamic": "^13.0.1",
24+
"@angular/router": "~13.0.1",
25+
"rxjs": "^7.4.0",
2626
"tslib": "^2.0.0",
2727
"zone.js": "~0.11.4"
2828
},
2929
"devDependencies": {
30-
"@angular-devkit/build-angular": "~12.0.0",
31-
"@angular/cli": "~12.0.0",
32-
"@angular/compiler-cli": "~12.0.0",
30+
"@angular-devkit/build-angular": "~13.0.2",
31+
"@angular/cli": "~13.0.2",
32+
"@angular/compiler-cli": "~13.0.1",
3333
"@types/jasmine": "~3.6.0",
3434
"@types/node": "^12.11.1",
35-
"@typescript-eslint/eslint-plugin": "4.16.1",
36-
"@typescript-eslint/parser": "4.16.1",
35+
"@typescript-eslint/eslint-plugin": "5.4.0",
36+
"@typescript-eslint/parser": "5.4.0",
3737
"eslint": "^7.6.0",
3838
"jasmine-core": "~3.6.0",
3939
"jasmine-spec-reporter": "~5.0.0",
@@ -45,14 +45,14 @@
4545
"protractor": "~7.0.0",
4646
"ts-node": "~8.3.0",
4747
"tslint": "~6.1.0",
48-
"typescript": "~4.2.3",
48+
"typescript": "~4.4.4",
4949
"eslint-plugin-import": "2.22.1",
5050
"eslint-plugin-jsdoc": "30.7.6",
5151
"eslint-plugin-prefer-arrow": "1.2.2",
52-
"@angular-eslint/builder": "^4.0.0",
53-
"@angular-eslint/eslint-plugin": "^4.0.0",
54-
"@angular-eslint/eslint-plugin-template": "^4.0.0",
55-
"@angular-eslint/schematics": "12.0.0",
56-
"@angular-eslint/template-parser": "^4.0.0"
52+
"@angular-eslint/builder": "13.0.0-alpha.0",
53+
"@angular-eslint/eslint-plugin": "13.0.0-alpha.0",
54+
"@angular-eslint/eslint-plugin-template": "13.0.0-alpha.0",
55+
"@angular-eslint/schematics": "13.0.0-alpha.0",
56+
"@angular-eslint/template-parser": "13.0.0-alpha.0"
5757
}
5858
}

src/app/shop/dumpling/dumpling.component.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
*/
1616

1717
// Adapted from https://codepen.io/osermay/pen/wrKQOd
18+
19+
@use 'sass:math';
20+
1821
$dumpling-light: #efd7b8;
1922
$dumpling-dark: darken(#efd7b8, 15%);
2023
$dumpling-size: 100px;
@@ -39,7 +42,7 @@ $fold-size: 20px;
3942
@include center;
4043
background-color: $dumpling-light;
4144
width: $dumpling-size;
42-
height: $dumpling-size/2;
45+
height: math.div($dumpling-size, 2);
4346
border-top-left-radius: $dumpling-size;
4447
border-top-right-radius: $dumpling-size;
4548
border: #ffe9e9 solid 2px;

src/app/shop/shop.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
@use '~@angular/material' as mat;
16+
@use '@angular/material' as mat;
1717

1818
// TODO: #12. Enable HighContrast mode
1919

src/polyfills.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@
3333
* BROWSER POLYFILLS
3434
*/
3535

36-
/**
37-
* IE11 requires the following for NgClass support on SVG elements
38-
*/
39-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
40-
41-
/**
42-
* Web Animations `@angular/platform-browser/animations`
43-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
44-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
45-
*/
46-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
47-
4836
/**
4937
* By default, zone.js will patch all possible macroTask and DomEvents
5038
* user can disable parts of macroTask/DomEvents patch by setting following flags

src/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
@use '~@angular/material' as mat;
16+
@use '@angular/material' as mat;
1717

1818
@import url('https://fonts.googleapis.com/css2?family=Vollkorn:ital,wght@1,700&Lato:wght@400;700;900&display=swap');
1919
$vollkorn-font-family: 'Vollkorn', serif;

src/test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@ import {
2424

2525
declare const require: {
2626
context(path: string, deep?: boolean, filter?: RegExp): {
27-
keys(): string[];
2827
<T>(id: string): T;
28+
keys(): string[];
2929
};
3030
};
3131

3232
// First, initialize the Angular testing environment.
3333
getTestBed().initTestEnvironment(
3434
BrowserDynamicTestingModule,
35-
platformBrowserDynamicTesting()
35+
platformBrowserDynamicTesting(), {
36+
teardown: { destroyAfterEach: false }
37+
}
3638
);
3739
// Then we find all the tests.
3840
const context = require.context('./', true, /\.spec\.ts$/);

0 commit comments

Comments
 (0)