Skip to content

Commit 2508f00

Browse files
committed
refactor: rework typing
1 parent d03bc6a commit 2508f00

48 files changed

Lines changed: 429 additions & 189 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"@npm:admin run lint",
6666
"@npm:admin run lint:types",
6767
"@npm:acceptance run lint",
68+
"@npm:acceptance run lint:types",
6869
"@npm:admin run lint:scss"
6970
],
7071
"lint:admin:fix": [

src/Resources/app/administration/eslint.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export default [
7575
'ignorePackages',
7676
{ js: 'never', ts: 'never' },
7777
],
78+
'import-x/no-relative-parent-imports': 'error',
7879
'no-void': 'off',
7980
'no-unused-vars': 'off',
8081
'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],

src/Resources/app/administration/package-lock.json

Lines changed: 40 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Resources/app/administration/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
},
1717
"devDependencies": {
1818
"@eslint/js": "9.39.3",
19+
"@shopware-ag/meteor-admin-sdk": "6.4.0",
1920
"@typescript-eslint/eslint-plugin": "8.56.1",
2021
"@typescript-eslint/parser": "8.56.1",
2122
"axios": "0.30.3",

src/Resources/app/administration/src/core/service/api/swag-migration.api.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type {
88
MigrationPremapping,
99
MigrationCredentials,
1010
MigrationError,
11-
} from '../../../type/types';
11+
} from 'src/type/types';
1212

1313
export type ApiResponse<T> = T extends null | undefined ? AxiosResponse<T> : T;
1414

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* @deprecated tag:v17.0.0 - With Shopware v6.8.0 - `translation.init.ts` will be removed to use automatic language loading with language layer support
33
*/
4-
import deMigrationSnippets from '../module/swag-migration/snippet/de.json';
5-
import enMigrationSnippets from '../module/swag-migration/snippet/en.json';
4+
import deMigrationSnippets from 'src/module/swag-migration/snippet/de.json';
5+
import enMigrationSnippets from 'src/module/swag-migration/snippet/en.json';
66

77
Shopware.Locale.extend('de-DE', deMigrationSnippets);
88
Shopware.Locale.extend('en-GB', enMigrationSnippets);

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-confirm-warning/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import template from './swag-migration-confirm-warning.html.twig';
22
import './swag-migration-confirm-warning.scss';
3-
import { MIGRATION_STORE_ID } from '../../../store/migration.store';
3+
import { MIGRATION_STORE_ID } from 'src/module/swag-migration/store/migration.store';
44

55
const { mapState } = Shopware.Component.getComponentHelper();
66

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-premapping/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import template from './swag-migration-premapping.html.twig';
22
import './swag-migration-premapping.scss';
3-
import type { MigrationPremapping } from '../../../../../type/types';
4-
import { MIGRATION_API_SERVICE } from '../../../../../core/service/api/swag-migration.api.service';
5-
import type { MigrationStore } from '../../../store/migration.store';
6-
import { MIGRATION_STORE_ID } from '../../../store/migration.store';
3+
import type { MigrationPremapping } from 'src/type/types';
4+
import { MIGRATION_API_SERVICE } from 'src/core/service/api/swag-migration.api.service';
5+
import type { MigrationStore } from 'src/module/swag-migration/store/migration.store';
6+
import { MIGRATION_STORE_ID } from 'src/module/swag-migration/store/migration.store';
77

88
const { Store } = Shopware;
99
const { mapState } = Shopware.Component.getComponentHelper();

src/Resources/app/administration/src/module/swag-migration/component/card/swag-migration-shop-information/index.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import template from './swag-migration-shop-information.html.twig';
22
import './swag-migration-shop-information.scss';
3-
import type {
4-
MigrationConnection,
5-
MigrationProfile,
6-
TEntity,
7-
TEntityCollection,
8-
TRepository,
9-
} from '../../../../../type/types';
10-
import { MIGRATION_API_SERVICE } from '../../../../../core/service/api/swag-migration.api.service';
11-
import { MIGRATION_STORE_ID, type MigrationStore } from '../../../store/migration.store';
3+
import type { MigrationConnection, MigrationProfile, TEntity, TEntityCollection, TRepository } from 'src/type/types';
4+
import { MIGRATION_API_SERVICE } from 'src/core/service/api/swag-migration.api.service';
5+
import { MIGRATION_STORE_ID, type MigrationStore } from 'src/module/swag-migration/store/migration.store';
126

137
const { Mixin, Store } = Shopware;
148
const { mapState } = Shopware.Component.getComponentHelper();

src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-result-screen/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import template from './swag-migration-result-screen.html.twig';
22
import './swag-migration-result-screen.scss';
3-
import type { TEntity, TRepository } from '../../../../../type/types';
4-
import { MIGRATION_STORE_ID } from '../../../store/migration.store';
3+
import type { TEntity, TRepository } from 'src/type/types';
4+
import { MIGRATION_STORE_ID } from 'src/module/swag-migration/store/migration.store';
55

66
const { Criteria } = Shopware.Data;
77

0 commit comments

Comments
 (0)