Skip to content

Commit

Permalink
Merge branch 'next-26696/rename-sdk' into 'trunk'
Browse files Browse the repository at this point in the history
NEXT-26696 - Rename SDK

See merge request shopware/6/product/platform!12539
  • Loading branch information
seggewiss committed Jan 17, 2024
2 parents f73838a + 2b6d118 commit df6da23
Show file tree
Hide file tree
Showing 70 changed files with 99 additions and 98 deletions.
1 change: 1 addition & 0 deletions Resources/app/administration/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ module.exports = {
moduleNameMapper: {
'^test(.*)$': '<rootDir>/test$1',
'^\@shopware-ag\/admin-extension-sdk\/es\/(.*)': '<rootDir>/node_modules/@shopware-ag/admin-extension-sdk/umd/$1',
'^\@shopware-ag\/meteor-admin-sdk\/es\/(.*)': '<rootDir>/node_modules/@shopware-ag/meteor-admin-sdk/umd/$1',
'^lodash-es$': 'lodash',
vue$: '@vue/compat/dist/vue.cjs.js',
},
Expand Down
28 changes: 14 additions & 14 deletions Resources/app/administration/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Resources/app/administration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"safari >= 7"
],
"dependencies": {
"@shopware-ag/admin-extension-sdk": "3.0.16",
"@shopware-ag/meteor-admin-sdk": "^3.0.16",
"@shopware-ag/meteor-icon-kit": "5.2.0",
"@shopware-ag/webpack-copy-after-build": "1.0.1",
"@shopware-ag/webpack-kill-process-on-failed-build": "1.0.0",
Expand Down Expand Up @@ -131,7 +131,7 @@
"@babel/register": "7.21.0",
"@lhci/cli": "0.11.0",
"@shopware-ag/eslint-config-base": "2.0.0",
"@shopware-ag/jest-preset-sw6-admin": "4.2.2",
"@shopware-ag/jest-preset-sw6-admin": "4.2.3",
"@testing-library/jest-dom": "5.16.5",
"@types/lodash": "4.14.192",
"@types/node": "18.15.10",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import Vue from 'vue';
import { mount } from '@vue/test-utils';
import { location } from '@shopware-ag/admin-extension-sdk';
import { location } from '@shopware-ag/meteor-admin-sdk';

let $routeMock = {
query: {},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PropType } from 'vue';
import type { Entity } from '@shopware-ag/admin-extension-sdk/es/data/_internals/Entity';
import type { Entity } from '@shopware-ag/meteor-admin-sdk/es/data/_internals/Entity';
import template from './sw-sortable-list.html.twig';
import './sw-sortable-list.scss';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MAIN_HIDDEN } from '@shopware-ag/admin-extension-sdk/es/location';
import { MAIN_HIDDEN } from '@shopware-ag/meteor-admin-sdk/es/location';
import template from './sw-hidden-iframes.html.twig';

const { Component } = Shopware;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { buttonProps } from '@shopware-ag/admin-extension-sdk/es/ui/modal';
import type { buttonProps } from '@shopware-ag/meteor-admin-sdk/es/ui/modal';
import type { ModalItemEntry } from 'src/app/state/modals.store';
import template from './sw-modals-renderer.html.twig';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @package content
*/
import type { Entity } from '@shopware-ag/admin-extension-sdk/es/data/_internals/Entity';
import type { Entity } from '@shopware-ag/meteor-admin-sdk/es/data/_internals/Entity';

Shopware.Filter.register('thumbnailSize', (value: Entity<'media_thumbnail_size'>) => {
if (!value || !(value.getEntityName() === 'media_thumbnail_size')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import AdminWorker from 'src/core/worker/admin-worker.shared-worker';
import WorkerNotificationListener from 'src/core/worker/worker-notification-listener';
import AdminNotificationWorker from 'src/core/worker/admin-notification-worker';
import getRefreshTokenHelper from 'src/core/helper/refresh-token.helper';
import type { ApiContext } from '@shopware-ag/admin-extension-sdk/es/data/_internals/EntityCollection';
import type { ApiContext } from '@shopware-ag/meteor-admin-sdk/es/data/_internals/EntityCollection';
import type { App } from 'vue';
import type { LoginService } from '../../core/service/login.service';
import type { ContextState } from '../state/context.store';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initActionButtons from 'src/app/init/action-button.init';
import { add } from '@shopware-ag/admin-extension-sdk/es/ui/actionButton';
import { add } from '@shopware-ag/meteor-admin-sdk/es/ui/actionButton';
import actionButtonStore from '../state/action-button.store';

describe('src/app/init/action-button.init.ts', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initActions from 'src/app/init/actions.init';
import { actionExecute } from '@shopware-ag/admin-extension-sdk/es/app/action';
import { actionExecute } from '@shopware-ag/meteor-admin-sdk/es/app/action';
import ExtensionSdkService from '../../core/service/api/extension-sdk.service';
import extensionsStore from '../state/extensions.store';

Expand Down
2 changes: 1 addition & 1 deletion Resources/app/administration/src/app/init/cms.init.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import initCms from 'src/app/init/cms.init';
import 'src/module/sw-cms/service/cms.service';
import { registerCmsElement } from '@shopware-ag/admin-extension-sdk/es/ui/cms';
import { registerCmsElement } from '@shopware-ag/meteor-admin-sdk/es/ui/cms';
import extensionsStore from '../state/extensions.store';

describe('src/app/init/cms.init.ts', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initContext from 'src/app/init/context.init';
import { getCurrency, getEnvironment, getLocale, getShopwareVersion, getModuleInformation, getAppInformation, getUserInformation } from '@shopware-ag/admin-extension-sdk/es/context';
import { getCurrency, getEnvironment, getLocale, getShopwareVersion, getModuleInformation, getAppInformation, getUserInformation } from '@shopware-ag/meteor-admin-sdk/es/context';
import extensionsStore from '../state/extensions.store';

describe('src/app/init/context.init.ts', () => {
Expand Down
2 changes: 1 addition & 1 deletion Resources/app/administration/src/app/init/context.init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

/* Is covered by E2E tests */
import { publish } from '@shopware-ag/admin-extension-sdk/es/channel';
import { publish } from '@shopware-ag/meteor-admin-sdk/es/channel';

// eslint-disable-next-line sw-deprecation-rules/private-feature-declarations
export default function initializeContext(): void {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initializeExtensionComponentSections from 'src/app/init/extension-component-sections.init';
import { send } from '@shopware-ag/admin-extension-sdk/es/channel';
import { send } from '@shopware-ag/meteor-admin-sdk/es/channel';

describe('src/app/init/extension-component-sections.init.ts', () => {
initializeExtensionComponentSections();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initializeExtensionDataLoader from 'src/app/init/extension-data-handling.init';
import { send } from '@shopware-ag/admin-extension-sdk/es/channel';
import { send } from '@shopware-ag/meteor-admin-sdk/es/channel';
import Criteria from 'src/core/data/criteria.data';

describe('src/app/init/extension-data-handling.init.ts', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package admin
*/

import type { Entity } from '@shopware-ag/admin-extension-sdk/es/data/_internals/Entity';
import type { Entity } from '@shopware-ag/meteor-admin-sdk/es/data/_internals/Entity';
import type EntityCollection from '../../core/data/entity-collection.data';
import type Repository from '../../core/data/repository.data';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ui } from '@shopware-ag/admin-extension-sdk';
import { ui } from '@shopware-ag/meteor-admin-sdk';
import initMainModules from 'src/app/init/main-module.init';

let stateDispatchBackup = null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initMenuItems from 'src/app/init/menu-item.init';
import { ui } from '@shopware-ag/admin-extension-sdk';
import { ui } from '@shopware-ag/meteor-admin-sdk';

let stateDispatchBackup = null;
describe('src/app/init/menu-item.init.ts', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initializeModal from 'src/app/init/modals.init';
import { ui } from '@shopware-ag/admin-extension-sdk';
import { ui } from '@shopware-ag/meteor-admin-sdk';

let stateDispatchBackup;
describe('src/app/init/modals.init.ts', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initializeNotifications from 'src/app/init/notification.init';
import { notification } from '@shopware-ag/admin-extension-sdk';
import { notification } from '@shopware-ag/meteor-admin-sdk';

describe('src/app/init/notification.init.ts', () => {
beforeAll(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import initializeSettingItems from 'src/app/init/settings-item.init';
import { ui } from '@shopware-ag/admin-extension-sdk';
import { ui } from '@shopware-ag/meteor-admin-sdk';

let stateDispatchBackup = null;
describe('src/app/init/settings-item.init.ts', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Vue from 'vue';
import { createRouter, createWebHistory } from 'vue-router';
import initTabs from 'src/app/init/tabs.init';
import { ui } from '@shopware-ag/admin-extension-sdk';
import { ui } from '@shopware-ag/meteor-admin-sdk';

describe('src/app/init/tabs.init', () => {
let routerMock;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @package admin
*/
import type Criteria from '@shopware-ag/admin-extension-sdk/es/data/Criteria';
import type Criteria from '@shopware-ag/meteor-admin-sdk/es/data/Criteria';
import { defineComponent } from 'vue';
import type RuleConditionService from '../service/rule-condition.service';
import createCriteriaFromArray from '../service/criteria-helper.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

/* @private */
import type Criteria from '@shopware-ag/admin-extension-sdk/es/data/Criteria';
import type Criteria from '@shopware-ag/meteor-admin-sdk/es/data/Criteria';
import { defineComponent } from 'vue';
import type { LocationQuery, RouteLocationNamedRaw } from 'vue-router';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import type Repository from 'src/core/data/repository.data';
import Criteria from 'src/core/data/criteria.data';
import type EntityCollection from '@shopware-ag/admin-extension-sdk/es/data/_internals/EntityCollection';
import type EntityCollection from '@shopware-ag/meteor-admin-sdk/es/data/_internals/EntityCollection';
import { defineComponent } from 'vue';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Criteria from '@shopware-ag/admin-extension-sdk/es/data/Criteria';
import Criteria from '@shopware-ag/meteor-admin-sdk/es/data/Criteria';

/**
* @private
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Criteria from '@shopware-ag/admin-extension-sdk/es/data/Criteria';
import Criteria from '@shopware-ag/meteor-admin-sdk/es/data/Criteria';
import createCriteriaFromArray from './criteria-helper.service';

describe('src/app/service/criteria-helper.service.ts', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Entity } from '@shopware-ag/admin-extension-sdk/es/data/_internals/Entity';
import type { Entity } from '@shopware-ag/meteor-admin-sdk/es/data/_internals/Entity';
import type ChangesetGenerator from 'src/core/data/changeset-generator.data';
import type EntityDefinition from 'src/core/data/entity-definition.data';
import type ErrorResolver from 'src/core/data/error-resolver.data';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type EntityCollection from '@shopware-ag/admin-extension-sdk/es/data/_internals/EntityCollection';
import type EntityCollection from '@shopware-ag/meteor-admin-sdk/es/data/_internals/EntityCollection';

const { Criteria } = Shopware.Data;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import type { Module } from 'vuex';
import type { actionButtonAdd } from '@shopware-ag/admin-extension-sdk/es/ui/actionButton';
import type { actionButtonAdd } from '@shopware-ag/meteor-admin-sdk/es/ui/actionButton';

type ActionButtonConfig = Omit<actionButtonAdd, 'responseType'>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package admin
*/

import type { privileges } from '@shopware-ag/admin-extension-sdk/es/privileges/privilege-resolver';
import type { privileges } from '@shopware-ag/meteor-admin-sdk/es/privileges/privilege-resolver';
import type { Module } from 'vuex';

type ApiAuthToken = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import Vue from 'vue';
import type { Module } from 'vuex';
import type { uiComponentSectionRenderer } from '@shopware-ag/admin-extension-sdk/es/ui/componentSection';
import type { uiComponentSectionRenderer } from '@shopware-ag/meteor-admin-sdk/es/ui/componentSection';

type ComponentSectionEntry = Omit<uiComponentSectionRenderer, 'responseType' | 'positionId'>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/* Is covered by E2E tests */
/* istanbul ignore file */
import type { Module } from 'vuex';
import type { smartBarButtonAdd } from '@shopware-ag/admin-extension-sdk/es/ui/mainModule';
import type { smartBarButtonAdd } from '@shopware-ag/meteor-admin-sdk/es/ui/mainModule';

// eslint-disable-next-line sw-deprecation-rules/private-feature-declarations
export type ExtensionSdkModule = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Vue from 'vue';
import type { Module } from 'vuex';
import type { extension } from '@shopware-ag/admin-extension-sdk/es/privileges/privilege-resolver';
import type { extensions } from '@shopware-ag/admin-extension-sdk/es/channel';
import { setExtensions } from '@shopware-ag/admin-extension-sdk/es/channel';
import type { extension } from '@shopware-ag/meteor-admin-sdk/es/privileges/privilege-resolver';
import type { extensions } from '@shopware-ag/meteor-admin-sdk/es/channel';
import { setExtensions } from '@shopware-ag/meteor-admin-sdk/es/channel';

/**
* @package admin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import type { Module } from 'vuex';
import type { menuItemAdd } from '@shopware-ag/admin-extension-sdk/es/ui/menu';
import type { menuItemAdd } from '@shopware-ag/meteor-admin-sdk/es/ui/menu';

// eslint-disable-next-line sw-deprecation-rules/private-feature-declarations
export type MenuItemEntry = Omit<menuItemAdd, 'responseType' | 'locationId' | 'displaySearchBar'> & { moduleId: string };
Expand Down
2 changes: 1 addition & 1 deletion Resources/app/administration/src/app/state/modals.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import type { Module } from 'vuex';
import type { uiModalOpen } from '@shopware-ag/admin-extension-sdk/es/ui/modal';
import type { uiModalOpen } from '@shopware-ag/meteor-admin-sdk/es/ui/modal';

// eslint-disable-next-line sw-deprecation-rules/private-feature-declarations
export type ModalItemEntry = Omit<uiModalOpen, 'responseType'> & { baseUrl: string };
Expand Down
2 changes: 1 addition & 1 deletion Resources/app/administration/src/app/state/tabs.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package admin
*/
import type { Module } from 'vuex';
import type { uiTabsAddTabItem } from '@shopware-ag/admin-extension-sdk/es/ui/tabs';
import type { uiTabsAddTabItem } from '@shopware-ag/meteor-admin-sdk/es/ui/tabs';

// eslint-disable-next-line sw-deprecation-rules/private-feature-declarations
export type TabItemEntry = Omit<uiTabsAddTabItem, 'responseType' | 'positionId'>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package admin
*/

import Criteria from '@shopware-ag/admin-extension-sdk/es/data/Criteria';
import Criteria from '@shopware-ag/meteor-admin-sdk/es/data/Criteria';

// eslint-disable-next-line sw-deprecation-rules/private-feature-declarations
export default Criteria;
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package admin
*/

import EntityCollection from '@shopware-ag/admin-extension-sdk/es/data/_internals/EntityCollection';
import EntityCollection from '@shopware-ag/meteor-admin-sdk/es/data/_internals/EntityCollection';

// eslint-disable-next-line sw-deprecation-rules/private-feature-declarations
export default EntityCollection;
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import types from 'src/core/service/utils/types.utils';
import type { AxiosResponse } from 'axios';
import type { Entity } from '@shopware-ag/admin-extension-sdk/es/data/_internals/Entity';
import type { Entity } from '@shopware-ag/meteor-admin-sdk/es/data/_internals/Entity';
import EntityClass from './entity.data';
import Criteria from './criteria.data';
import EntityCollection from './entity-collection.data';
Expand Down
Loading

0 comments on commit df6da23

Please sign in to comment.