Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-07-24 00:17:23 +00:00
Code Issues Projects Releases Wiki Activity

migrate: remove hammerjs and fix that legacy-peer-deps was required

Browse source
This commit is contained in:
Johannes Millan 2024-06-17 14:03:26 +02:00
parent f402fbbb7d
commit d5044d0144
4 changed files with 1053 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

1260
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

11
package.json
View file

@ -154,7 +154,6 @@
"@schematics/angular": "^14.1.3",
"@types/electron-localshortcut": "^3.1.0",
"@types/file-saver": "^2.0.5",
"@types/hammerjs": "^2.0.45",
"@types/jasmine": "^3.10.2",
"@types/jasminewd2": "~2.0.13",
"@types/lz-string": "^1.5.0",
@ -187,7 +186,6 @@
"eslint-plugin-unused-imports": "^2.0.0",
"file-saver": "^2.0.2",
"glob": "^8.0.3",
"hammerjs": "^2.0.8",
"helpful-decorators": "^2.1.0",
"husky": "^4.2.5",
"ical.js": "^2.0.1",
@ -204,7 +202,7 @@
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.6.0",
"lz-string": "^1.5.0",
"marked": "^13.0.0",
"marked": "^12.0.2",
"moment": "2.29.4",
"moment-duration-format": "^2.2.2",
"nanoid": "^4.0.0",
@ -232,5 +230,12 @@
},
"resolutions": {
"sass": "1.32.6"
},
"overrides": {
"ng2-dragula": {
"@angular/common": "$@angular/common",
"@angular/core": "$@angular/core",
"@angular/animations": "$@angular/animations"
}
}
}

8
src/app/app.module.ts
View file

@ -1,8 +1,4 @@
import {
BrowserModule,
HAMMER_GESTURE_CONFIG,
HammerModule,
} from '@angular/platform-browser';
import { BrowserModule, HammerModule } from '@angular/platform-browser';
import { ErrorHandler, NgModule } from '@angular/core';
import { AppComponent } from './app.component';
import { ServiceWorkerModule } from '@angular/service-worker';
@ -32,7 +28,6 @@ import { NoteModule } from './features/note/note.module';
import { ReminderModule } from './features/reminder/reminder.module';
import { CoreUiModule } from './core-ui/core-ui.module';
import { GlobalErrorHandler } from './core/error-handler/global-error-handler.class';
import { MyHammerConfig } from '../hammer-config.class';
import { ProcrastinationModule } from './features/procrastination/procrastination.module';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
@ -143,7 +138,6 @@ export const createTranslateLoader = (http: HttpClient): TranslateHttpLoader =>
],
providers: [
{ provide: ErrorHandler, useClass: GlobalErrorHandler },
{ provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig },
provideHttpClient(withInterceptorsFromDi()),
],
})

3
src/app/ui/ui.module.ts
View file

@ -78,8 +78,6 @@ import { FullPageSpinnerComponent } from './full-page-spinner/full-page-spinner.
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { FormlyMaterialModule } from '@ngx-formly/material';
import { GlobalErrorHandler } from '../core/error-handler/global-error-handler.class';
import { HAMMER_GESTURE_CONFIG } from '@angular/platform-browser';
import { MyHammerConfig } from '../../hammer-config.class';
import { registerTranslateExtension } from './formly-translate-extension/formly-translate-extension';
import { FormlyTranslatedTemplateComponent } from './formly-translated-template/formly-translated-template.component';
import { MatMomentDateModule } from '@angular/material-moment-adapter';
@ -267,7 +265,6 @@ const markedOptionsFactory = (): MarkedOptions => {
provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
useValue: { appearance: 'outline' },
},
{ provide: HAMMER_GESTURE_CONFIG, useClass: MyHammerConfig },
{
provide: FORMLY_CONFIG,
multi: true,