Skip to content

Commit

Permalink
Merge pull request #496 from shanmukhateja/feat-ng-11
Browse files Browse the repository at this point in the history
Angular 11 support
  • Loading branch information
santoshyadavdev authored Jan 31, 2021
2 parents 64461f8 + 8061b11 commit cbd1285
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 21 deletions.
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
},
"private": true,
"dependencies": {
"@angular/animations": "10.2.4",
"@angular/common": "10.2.4",
"@angular/compiler": "10.2.4",
"@angular/core": "10.2.4",
"@angular/forms": "10.2.4",
"@angular/platform-browser": "10.2.4",
"@angular/platform-browser-dynamic": "10.2.4",
"@angular/router": "10.2.4",
"@angular/animations": "11.1.0",
"@angular/common": "11.1.0",
"@angular/compiler": "11.1.0",
"@angular/core": "11.1.0",
"@angular/forms": "11.1.0",
"@angular/platform-browser": "11.1.0",
"@angular/platform-browser-dynamic": "11.1.0",
"@angular/router": "11.1.0",
"@fortawesome/fontawesome-svg-core": "1.2.30",
"@fortawesome/free-solid-svg-icons": "5.14.0",
"@fortawesome/react-fontawesome": "0.1.11",
Expand All @@ -40,7 +40,7 @@
"font-awesome": "4.7.0",
"marked": "1.1.1",
"ng-samurai": "2.0.5",
"ngx-markdown": "9.1.1",
"ngx-markdown": "11.0.1",
"prism-themes": "1.4.0",
"renamer": "2.0.1",
"rxjs": "6.6.2",
Expand All @@ -49,11 +49,11 @@
"zone.js": "0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1002.1",
"@angular-devkit/build-angular": "0.1101.1",
"@angular-devkit/build-ng-packagr": "0.1002.1",
"@angular/cli": "10.2.1",
"@angular/compiler-cli": "10.2.4",
"@angular/language-service": "10.2.4",
"@angular/cli": "11.1.1",
"@angular/compiler-cli": "11.1.0",
"@angular/language-service": "11.1.0",
"@commitlint/cli": "9.1.1",
"@commitlint/config-conventional": "9.1.1",
"@fortawesome/fontawesome-free": "5.14.0",
Expand All @@ -74,12 +74,12 @@
"jasmine-spec-reporter": "5.0.2",
"jest": "26.4.0",
"jest-preset-angular": "8.2.1",
"karma": "5.1.1",
"karma": "5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "3.3.1",
"karma-jasmine-html-reporter": "1.5.4",
"ng-packagr": "10.1.2",
"ng-packagr": "11.1.2",
"prettier": "2.0.5",
"pretty-quick": "2.0.1",
"protractor": "7.0.0",
Expand Down
10 changes: 7 additions & 3 deletions projects/bulma-app/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ const routes: Routes = [
},
{
path: 'elements/table',
loadChildren: () =>
import('./table/table.module').then((table) => table.TableModule),
loadChildren: () => import('./table/table.module').then((table) => table.TableModule),
},
{
path: 'layout/container',
Expand Down Expand Up @@ -124,7 +123,12 @@ const routes: Routes = [
];

@NgModule({
imports: [RouterModule.forRoot(routes, { scrollPositionRestoration: 'top' })],
imports: [
RouterModule.forRoot(routes, {
scrollPositionRestoration: 'top',
relativeLinkResolution: 'legacy',
}),
],
exports: [RouterModule],
})
export class AppRoutingModule {}
2 changes: 1 addition & 1 deletion projects/bulma-app/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, TestBed } from '@angular/core/testing';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';

Expand Down
4 changes: 2 additions & 2 deletions projects/ngx-bulma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"save": "dependencies"
},
"peerDependencies": {
"@angular/common": "^8.2.7 || ^9.0.0",
"@angular/core": "^8.2.7 || ^9.0.0"
"@angular/common": "^11.1.0",
"@angular/core": "^11.1.0"
}
}

0 comments on commit cbd1285

Please sign in to comment.