Skip to content

Commit

Permalink
build: update to Angular and CLI v12 next.7 and Components v12 next.5
Browse files Browse the repository at this point in the history 
- fix typing change in `ActivatedRoute.fragment`
- fix [breaking change](angular/angular-cli#20361)
  to no longer allow the styles `bundleName` to include a path in the ng build config
  • Loading branch information
@Splaktar
Splaktar committed Apr 8, 2021
1 parent f3713b7 commit fb4a322
Show file tree
Hide file tree
Showing 9 changed files with 450 additions and 306 deletions.
16 changes: 8 additions & 8 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@
{
"inject": false,
"input": "src/styles/custom-themes/pink-bluegrey.scss",
"bundleName": "assets/pink-bluegrey"
"bundleName": "pink-bluegrey"
},
{
"inject": false,
"input": "src/styles/custom-themes/deeppurple-amber.scss",
"bundleName": "assets/deeppurple-amber"
"bundleName": "deeppurple-amber"
},
{
"inject": false,
"input": "src/styles/custom-themes/indigo-pink.scss",
"bundleName": "assets/indigo-pink"
"bundleName": "indigo-pink"
},
{
"inject": false,
"input": "src/styles/custom-themes/purple-green.scss",
"bundleName": "assets/purple-green"
"bundleName": "purple-green"
}
],
"stylePreprocessorOptions": {
Expand Down Expand Up @@ -136,22 +136,22 @@
{
"inject": false,
"input": "src/styles/custom-themes/pink-bluegrey.scss",
"bundleName": "assets/pink-bluegrey"
"bundleName": "pink-bluegrey"
},
{
"inject": false,
"input": "src/styles/custom-themes/deeppurple-amber.scss",
"bundleName": "assets/deeppurple-amber"
"bundleName": "deeppurple-amber"
},
{
"inject": false,
"input": "src/styles/custom-themes/indigo-pink.scss",
"bundleName": "assets/indigo-pink"
"bundleName": "indigo-pink"
},
{
"inject": false,
"input": "src/styles/custom-themes/purple-green.scss",
"bundleName": "assets/purple-green"
"bundleName": "purple-green"
}
],
"stylePreprocessorOptions": {
Expand Down
38 changes: 19 additions & 19 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,33 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^12.0.0-next.5",
"@angular/cdk": "^12.0.0-next.4",
"@angular/cdk-experimental": "^12.0.0-next.4",
"@angular/common": "^12.0.0-next.5",
"@angular/compiler": "^12.0.0-next.5",
"@angular/animations": "^12.0.0-next.7",
"@angular/cdk": "^12.0.0-next.5",
"@angular/cdk-experimental": "^12.0.0-next.5",
"@angular/common": "^12.0.0-next.7",
"@angular/compiler": "^12.0.0-next.7",
"@angular/components-examples": "angular/material2-docs-content#master",
"@angular/core": "^12.0.0-next.5",
"@angular/forms": "^12.0.0-next.5",
"@angular/google-maps": "^12.0.0-next.4",
"@angular/material": "^12.0.0-next.4",
"@angular/material-experimental": "^12.0.0-next.4",
"@angular/material-moment-adapter": "^12.0.0-next.4",
"@angular/platform-browser": "^12.0.0-next.5",
"@angular/platform-browser-dynamic": "^12.0.0-next.5",
"@angular/router": "^12.0.0-next.5",
"@angular/youtube-player": "^12.0.0-next.4",
"@angular/core": "^12.0.0-next.7",
"@angular/forms": "^12.0.0-next.7",
"@angular/google-maps": "^12.0.0-next.5",
"@angular/material": "^12.0.0-next.5",
"@angular/material-experimental": "^12.0.0-next.5",
"@angular/material-moment-adapter": "^12.0.0-next.5",
"@angular/platform-browser": "^12.0.0-next.7",
"@angular/platform-browser-dynamic": "^12.0.0-next.7",
"@angular/router": "^12.0.0-next.7",
"@angular/youtube-player": "^12.0.0-next.5",
"material-components-web": "10.0.0-canary.2ed2d829b.0",
"moment": "^2.29.1",
"rxjs": "^6.6.6",
"tslib": "^2.1.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.1200.0-next.5",
"@angular/cli": "^12.0.0-next.5",
"@angular/compiler-cli": "^12.0.0-next.5",
"@angular/localize": "^12.0.0-next.5",
"@angular-devkit/build-angular": "^0.1200.0-next.7",
"@angular/cli": "^12.0.0-next.7",
"@angular/compiler-cli": "^12.0.0-next.7",
"@angular/localize": "^12.0.0-next.7",
"@types/imagemin": "^7.0.0",
"@types/jasmine": "^3.6.6",
"@types/node": "^12.20.6",
Expand Down
10 changes: 6 additions & 4 deletions src/app/shared/table-of-contents/table-of-contents.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ export class TableOfContents implements OnInit, AfterViewInit, OnDestroy {
}));

this.subscriptions.add(this._route.fragment.subscribe(fragment => {
this._urlFragment = fragment;
if (fragment != null) {
this._urlFragment = fragment;

const target = document.getElementById(this._urlFragment);
if (target) {
target.scrollIntoView();
const target = document.getElementById(this._urlFragment);
if (target) {
target.scrollIntoView();
}
}
}));
}
Expand Down
3 changes: 1 addition & 2 deletions src/app/shared/theme-picker/theme-picker.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {waitForAsync, TestBed} from '@angular/core/testing';
import {ThemePicker, ThemePickerModule} from './theme-picker';
import {DocsAppTestingModule} from '../../testing/testing-module';


describe('ThemePicker', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
Expand All @@ -17,6 +16,6 @@ describe('ThemePicker', () => {
spyOn(component.styleManager, 'setStyle');
component.selectTheme(name);
expect(component.styleManager.setStyle).toHaveBeenCalled();
expect(component.styleManager.setStyle).toHaveBeenCalledWith('theme', `assets/${name}.css`);
expect(component.styleManager.setStyle).toHaveBeenCalledWith('theme', `${name}.css`);
});
});
2 changes: 1 addition & 1 deletion src/app/shared/theme-picker/theme-picker.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class ThemePicker implements OnInit, OnDestroy {
if (theme.isDefault) {
this.styleManager.removeStyle('theme');
} else {
this.styleManager.setStyle('theme', `assets/${theme.name}.css`);
this.styleManager.setStyle('theme', `${theme.name}.css`);
}

if (this.currentTheme) {
Expand Down
4 changes: 2 additions & 2 deletions src/assets/stack-blitz-tests/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"zone.js": "^0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1200.0-next.5",
"@angular/cli": "^12.0.0-next.5",
"@angular-devkit/build-angular": "0.1200.0-next.7",
"@angular/cli": "^12.0.0-next.7",
"@angular/compiler-cli": "^12.0.0-next.0",
"@angular/language-service": "^12.0.0-next.0",
"@angular/localize": "^12.0.0-next.0",
Expand Down
4 changes: 2 additions & 2 deletions src/assets/stack-blitz/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"zone.js": "^0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.1200.0-next.5",
"@angular/cli": "^12.0.0-next.5",
"@angular-devkit/build-angular": "^0.1200.0-next.7",
"@angular/cli": "^12.0.0-next.7",
"@angular/compiler-cli": "^12.0.0-next.0",
"@angular/language-service": "^12.0.0-next.0",
"@angular/localize": "^12.0.0-next.0",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/versions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
},
{
"url": "https://next.material.angular.io/",
"title": "12.0.0-next.4"
"title": "12.0.0-next.5"
}
]
Loading

0 comments on commit fb4a322

Please sign in to comment.