Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngx-builders/ngx-bulma
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f3f740c2f1bb694e12d5ea38fc3687ff76733c19
Choose a base ref
..
head repository: ngx-builders/ngx-bulma
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0679a351835cf663d4a80c5e5efdd707a7432933
Choose a head ref
Showing with 31 additions and 27 deletions.
  1. +21 −21 package.json
  2. +7 −3 projects/bulma-app/src/app/app-routing.module.ts
  3. +1 −1 projects/bulma-app/src/app/app.component.spec.ts
  4. +2 −2 projects/ngx-bulma/package.json
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -22,25 +22,25 @@
},
"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",
"@nrwl/angular": "^10.4.10",
"@nrwl/workspace": "^10.4.10",
"@nrwl/angular": "10.4.12",
"@nrwl/workspace": "10.4.12",
"bulma": "0.9.0",
"core-js": "3.6.5",
"font-awesome": "4.7.0",
"marked": "1.1.1",
"ng-samurai": "^2.0.5",
"ngx-markdown": "9.1.1",
"ng-samurai": "2.0.5",
"ngx-markdown": "11.0.1",
"prism-themes": "1.4.0",
"renamer": "2.0.1",
"rxjs": "6.6.2",
@@ -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",
@@ -74,21 +74,21 @@
"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",
"standard-version": "8.0.2",
"ts-jest": "^26.4.4",
"ts-jest": "26.5.0",
"ts-node": "8.10.2",
"tslint": "^6.1.3",
"tslint": "6.1.3",
"tslint-config-prettier": "1.18.0",
"typescript": "4.1.3"
"typescript": "4.1.4"
},
"husky": {
"hooks": {
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
@@ -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',
@@ -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';

4 changes: 2 additions & 2 deletions projects/ngx-bulma/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}