Skip to content

Commit

Permalink
Angular 15 and all JS deps #9282
Browse files Browse the repository at this point in the history
Except:

- @types/node, we run on node 16
  • Loading branch information
PowerKiKi committed Jan 31, 2023
1 parent 948ad58 commit 9931ab9
Show file tree
Hide file tree
Showing 11 changed files with 2,774 additions and 2,479 deletions.
17 changes: 0 additions & 17 deletions .browserslistrc

This file was deleted.

8 changes: 8 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,13 @@
}
}
}
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
}
}
62 changes: 31 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,47 @@
"build-demo": "yarn build-lib && ng build demo --aot --base-href /fab-speed-dial/ && cp dist/demo/index.html dist/demo/404.html"
},
"dependencies": {
"@angular/animations": "^14.1.1",
"@angular/cdk": "^14.1.1",
"@angular/common": "^14.1.1",
"@angular/compiler": "^14.1.1",
"@angular/core": "^14.1.1",
"@angular/forms": "^14.1.1",
"@angular/material": "^14.1.1",
"@angular/platform-browser": "^14.1.1",
"@angular/platform-browser-dynamic": "^14.1.1",
"rxjs": "~7.5.6",
"tslib": "^2.4.0",
"zone.js": "~0.11.7"
"@angular/animations": "^15.1.2",
"@angular/cdk": "^15.1.2",
"@angular/common": "^15.1.2",
"@angular/compiler": "^15.1.2",
"@angular/core": "^15.1.2",
"@angular/forms": "^15.1.2",
"@angular/material": "^15.1.2",
"@angular/platform-browser": "^15.1.2",
"@angular/platform-browser-dynamic": "^15.1.2",
"rxjs": "~7.8.0",
"tslib": "^2.5.0",
"zone.js": "~0.12.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.1.1",
"@angular-eslint/builder": "14.0.2",
"@angular-eslint/eslint-plugin": "14.0.2",
"@angular-eslint/eslint-plugin-template": "14.0.2",
"@angular-eslint/schematics": "14.0.2",
"@angular-eslint/template-parser": "14.0.2",
"@angular/cli": "^14.1.1",
"@angular/compiler-cli": "^14.1.1",
"@angular/language-service": "^14.1.1",
"@playwright/test": "^1.24.2",
"@types/jasmine": "~4.0.3",
"@angular-devkit/build-angular": "^15.1.3",
"@angular-eslint/builder": "15.2.0",
"@angular-eslint/eslint-plugin": "15.2.0",
"@angular-eslint/eslint-plugin-template": "15.2.0",
"@angular-eslint/schematics": "15.2.0",
"@angular-eslint/template-parser": "15.2.0",
"@angular/cli": "^15.1.3",
"@angular/compiler-cli": "^15.1.2",
"@angular/language-service": "^15.1.2",
"@playwright/test": "^1.30.0",
"@types/jasmine": "~4.3.1",
"@types/jasminewd2": "~2.0.10",
"@types/node": "^16.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.43.0",
"codelyzer": "^6.0.2",
"eslint": "^8.18.0",
"jasmine-core": "~4.3.0",
"eslint": "^8.28.0",
"jasmine-core": "~4.5.0",
"jasmine-spec-reporter": "~7.0.0",
"karma": "~6.4.0",
"karma": "~6.4.1",
"karma-chrome-launcher": "~3.1.1",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^14.1.0",
"prettier": "2.7.1",
"ng-packagr": "^15.1.1",
"prettier": "2.8.3",
"ts-node": "~10.9.1",
"typescript": "~4.7.4"
"typescript": "~4.9.4"
}
}
6 changes: 3 additions & 3 deletions projects/fab-speed-dial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"license": "MIT",
"repository": "github:Ecodev/fab-speed-dial",
"peerDependencies": {
"@angular/common": "^14.1.0",
"@angular/core": "^14.1.0",
"@angular/material": "^14.1.0",
"@angular/common": "^15.1.0",
"@angular/core": "^15.1.0",
"@angular/material": "^15.1.0",
"rxjs": "^7.4.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion projects/fab-speed-dial/src/lib/fab-speed-dial.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
Renderer2,
ViewEncapsulation,
} from '@angular/core';
import {MatButton} from '@angular/material/button';
import {MatLegacyButton as MatButton} from '@angular/material/legacy-button';
import {CommonModule, DOCUMENT} from '@angular/common';
import {forkJoin, fromEvent, Subscription} from 'rxjs';
import {take} from 'rxjs/operators';
Expand Down
7 changes: 0 additions & 7 deletions projects/fab-speed-dial/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@ import 'zone.js/testing';
import {getTestBed} from '@angular/core/testing';
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';

// eslint-disable-next-line @typescript-eslint/no-explicit-any
declare const require: any;

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: {destroyAfterEach: true},
});
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
14 changes: 7 additions & 7 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {FormsModule} from '@angular/forms';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
import {MatLegacyButtonModule as MatButtonModule} from '@angular/material/legacy-button';
import {MatButtonToggleModule} from '@angular/material/button-toggle';
import {MatInputModule} from '@angular/material/input';
import {MatRadioModule} from '@angular/material/radio';
import {MatLegacyInputModule as MatInputModule} from '@angular/material/legacy-input';
import {MatLegacyRadioModule as MatRadioModule} from '@angular/material/legacy-radio';
import {MatToolbarModule} from '@angular/material/toolbar';
import {MatCheckboxModule} from '@angular/material/checkbox';
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import {MatTooltipModule} from '@angular/material/tooltip';
import {MatCardModule} from '@angular/material/card';
import {MatLegacyCheckboxModule as MatCheckboxModule} from '@angular/material/legacy-checkbox';
import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';
import {MatLegacyTooltipModule as MatTooltipModule} from '@angular/material/legacy-tooltip';
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';

import {AppComponent} from './app.component';
import {EcoFabSpeedDialModule} from '@ecodev/fab-speed-dial';
Expand Down
14 changes: 7 additions & 7 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import {AppComponent} from './app.component';

import {EcoFabSpeedDialModule} from '@ecodev/fab-speed-dial';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
import {MatLegacyButtonModule as MatButtonModule} from '@angular/material/legacy-button';
import {MatButtonToggleModule} from '@angular/material/button-toggle';
import {MatInputModule} from '@angular/material/input';
import {MatRadioModule} from '@angular/material/radio';
import {MatLegacyInputModule as MatInputModule} from '@angular/material/legacy-input';
import {MatLegacyRadioModule as MatRadioModule} from '@angular/material/legacy-radio';
import {MatToolbarModule} from '@angular/material/toolbar';
import {MatCheckboxModule} from '@angular/material/checkbox';
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import {MatTooltipModule} from '@angular/material/tooltip';
import {MatCardModule} from '@angular/material/card';
import {MatLegacyCheckboxModule as MatCheckboxModule} from '@angular/material/legacy-checkbox';
import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';
import {MatLegacyTooltipModule as MatTooltipModule} from '@angular/material/legacy-tooltip';
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';

@NgModule({
declarations: [AppComponent],
Expand Down
7 changes: 0 additions & 7 deletions src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@ import 'zone.js/testing';
import {getTestBed} from '@angular/core/testing';
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';

// eslint-disable-next-line @typescript-eslint/no-explicit-any
declare const require: any;

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
teardown: {destroyAfterEach: true},
});
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2020",
"target": "ES2022",
"module": "es2020",
"lib": ["es2020", "dom"]
"lib": ["es2020", "dom"],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,
Expand Down
Loading

0 comments on commit 9931ab9

Please sign in to comment.