From 720aef8db4768595fd02987f282c7e09152fff7e Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Mon, 22 Jul 2024 11:32:20 +0200 Subject: [PATCH] chore: Fix more imports --- packages/compas-open-scd/src/compas-wizards/scl.ts | 7 ++++--- .../compas-open-scd/src/compas/CompasImportFromApi.ts | 6 +++--- packages/compas-open-scd/src/compas/CompasSclList.ts | 6 +++--- .../compas-open-scd/src/compas/CompasUploadVersion.ts | 4 ++-- packages/compas-open-scd/src/compas/foundation.ts | 3 ++- packages/compas-open-scd/src/compas/private.ts | 2 +- .../compas-open-scd/src/locamation/LocamationIEDList.ts | 2 +- .../compas-open-scd/src/locamation/LocamationLNEdit.ts | 6 +++--- packages/compas-open-scd/src/menu/CompasAutoAlignment.ts | 2 +- packages/compas-open-scd/src/menu/CompasCimMapping.ts | 8 +++----- packages/compas-open-scd/src/menu/CompasImportIEDs.ts | 2 +- .../integration/compas-editors/autogen-substation.test.ts | 4 ++-- .../test/integration/compas-editors/sitipe-bay.test.ts | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/compas-open-scd/src/compas-wizards/scl.ts b/packages/compas-open-scd/src/compas-wizards/scl.ts index 1a8c19cb29..ef2b117053 100644 --- a/packages/compas-open-scd/src/compas-wizards/scl.ts +++ b/packages/compas-open-scd/src/compas-wizards/scl.ts @@ -2,15 +2,16 @@ import { html, TemplateResult } from 'lit-element'; import { get, translate } from 'lit-translate'; import { - cloneElement, - ComplexAction, - EditorAction, getValue, Wizard, WizardActor, WizardInputElement, } from '@openscd/open-scd/src/foundation.js'; +import { cloneElement } from '@openscd/xml'; + +import { ComplexAction, EditorAction } from "@openscd/core/foundation/deprecated/editor.js"; + import '../compas/CompasLabelsField.js'; import { diff --git a/packages/compas-open-scd/src/compas/CompasImportFromApi.ts b/packages/compas-open-scd/src/compas/CompasImportFromApi.ts index b763e2888e..2412e811fa 100644 --- a/packages/compas-open-scd/src/compas/CompasImportFromApi.ts +++ b/packages/compas-open-scd/src/compas/CompasImportFromApi.ts @@ -3,12 +3,12 @@ import { customElement, html, LitElement, TemplateResult } from 'lit-element'; import '@material/mwc-list/mwc-list-item'; import { - newOpenDocEvent, - newPendingStateEvent, newWizardEvent, } from '@openscd/open-scd/src/foundation.js'; +import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js'; +import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js'; -import 'open-scd/src/filtered-list.js'; +import '@openscd/open-scd/src/filtered-list.js'; import { createLogEvent, diff --git a/packages/compas-open-scd/src/compas/CompasSclList.ts b/packages/compas-open-scd/src/compas/CompasSclList.ts index 294ffcb4d4..56ce6a356e 100644 --- a/packages/compas-open-scd/src/compas/CompasSclList.ts +++ b/packages/compas-open-scd/src/compas/CompasSclList.ts @@ -14,10 +14,10 @@ import '@material/mwc-icon'; import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; -import { SelectedItemsChangedEvent } from 'open-scd/src/oscd-filter-button.js'; +import { SelectedItemsChangedEvent } from '@openscd/open-scd/src/oscd-filter-button.js'; -import 'open-scd/src/filtered-list.js'; -import 'open-scd/src/oscd-filter-button.js'; +import '@openscd/open-scd/src/filtered-list.js'; +import '@openscd/open-scd/src/oscd-filter-button.js'; import { CompasSclDataService, diff --git a/packages/compas-open-scd/src/compas/CompasUploadVersion.ts b/packages/compas-open-scd/src/compas/CompasUploadVersion.ts index 102bfa07ff..15fe818b59 100644 --- a/packages/compas-open-scd/src/compas/CompasUploadVersion.ts +++ b/packages/compas-open-scd/src/compas/CompasUploadVersion.ts @@ -6,12 +6,12 @@ import '@material/mwc-list/mwc-list-item'; import '@material/mwc-button'; import { - newLogEvent, - newPendingStateEvent, newWizardEvent, Wizard, WizardInputElement, } from '@openscd/open-scd/src/foundation.js'; +import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js'; +import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js'; import 'open-scd/src/wizard-textfield.js'; diff --git a/packages/compas-open-scd/src/compas/foundation.ts b/packages/compas-open-scd/src/compas/foundation.ts index e49ad2f651..e87e51e126 100644 --- a/packages/compas-open-scd/src/compas/foundation.ts +++ b/packages/compas-open-scd/src/compas/foundation.ts @@ -1,6 +1,7 @@ import { get } from 'lit-translate'; -import { newLogEvent, newOpenDocEvent } from '@openscd/open-scd/src/foundation.js'; +import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js'; +import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js'; import { COMPAS_SCL_PRIVATE_TYPE, getCompasSclFileType, diff --git a/packages/compas-open-scd/src/compas/private.ts b/packages/compas-open-scd/src/compas/private.ts index 8f0e0676f7..3593129746 100644 --- a/packages/compas-open-scd/src/compas/private.ts +++ b/packages/compas-open-scd/src/compas/private.ts @@ -1,4 +1,4 @@ -import { SCL_NAMESPACE } from 'open-scd/src/schemas.js'; +import { SCL_NAMESPACE } from '@openscd/open-scd/src/schemas.js'; export const COMPAS_NAMESPACE = 'https://www.lfenergy.org/compas/extension/v1'; export const COMPAS_PREFIX = 'compas'; diff --git a/packages/compas-open-scd/src/locamation/LocamationIEDList.ts b/packages/compas-open-scd/src/locamation/LocamationIEDList.ts index 4651b16151..b95298c069 100644 --- a/packages/compas-open-scd/src/locamation/LocamationIEDList.ts +++ b/packages/compas-open-scd/src/locamation/LocamationIEDList.ts @@ -5,7 +5,7 @@ import '@material/mwc-list'; import '@material/mwc-list/mwc-list-item'; import {newSubWizardEvent, newWizardEvent, Wizard, WizardInputElement} from '@openscd/open-scd/src/foundation.js'; -import {isSCLNamespace} from "open-scd/src/schemas.js"; +import {isSCLNamespace} from "@openscd/open-scd/src/schemas.js"; import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js"; import {iedHeader, lDeviceHeader, LOCAMATION_MANUFACTURER, LOCAMATION_PRIVATE} from "./foundation.js"; diff --git a/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts b/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts index ce44c8dfe0..4bc113cf2c 100644 --- a/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts +++ b/packages/compas-open-scd/src/locamation/LocamationLNEdit.ts @@ -1,10 +1,10 @@ import {css, customElement, html, LitElement, property, TemplateResult} from 'lit-element'; import {get, translate} from "lit-translate"; -import {patterns} from "open-scd/src/wizards/foundation/limits.js"; +import { patterns } from "@openscd/open-scd/src/foundation.js"; +import { ComplexAction } from "@openscd/core/foundation/deprecated/editor.js"; import { checkValidity, - ComplexAction, Wizard, WizardAction, WizardInputElement, @@ -12,7 +12,7 @@ import { } from '@openscd/open-scd/src/foundation.js'; import {Nsdoc} from "@openscd/open-scd/src/foundation/nsdoc.js"; -import 'open-scd/src/wizard-textfield.js'; +import '@openscd/open-scd/src/wizard-textfield.js'; import { createEditorAction, diff --git a/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts b/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts index bf82969ca9..fb07d6068f 100644 --- a/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts +++ b/packages/compas-open-scd/src/menu/CompasAutoAlignment.ts @@ -1,8 +1,8 @@ import { html, LitElement, property } from 'lit-element'; import { get } from 'lit-translate'; +import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js'; import { - newPendingStateEvent, newWizardEvent, Wizard, WizardInputElement, diff --git a/packages/compas-open-scd/src/menu/CompasCimMapping.ts b/packages/compas-open-scd/src/menu/CompasCimMapping.ts index be1b75bedb..6b22e64445 100644 --- a/packages/compas-open-scd/src/menu/CompasCimMapping.ts +++ b/packages/compas-open-scd/src/menu/CompasCimMapping.ts @@ -1,10 +1,8 @@ import { css, html, LitElement, query, TemplateResult } from 'lit-element'; -import { - newLogEvent, - newOpenDocEvent, - newPendingStateEvent, -} from '@openscd/open-scd/src/foundation.js'; +import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js'; +import { newOpenDocEvent } from '@openscd/core/foundation/deprecated/open-event.js'; +import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js'; import { stripExtensionFromName } from '../compas/foundation.js'; import { diff --git a/packages/compas-open-scd/src/menu/CompasImportIEDs.ts b/packages/compas-open-scd/src/menu/CompasImportIEDs.ts index 8a14c4adbe..6f4c755313 100644 --- a/packages/compas-open-scd/src/menu/CompasImportIEDs.ts +++ b/packages/compas-open-scd/src/menu/CompasImportIEDs.ts @@ -2,7 +2,7 @@ import { html, query, TemplateResult } from 'lit-element'; import { translate } from 'lit-translate'; import { DocRetrievedEvent } from '../compas/CompasOpen.js'; -import ImportingIedPlugin from 'open-scd/src/menu/ImportIEDs.js'; +import ImportingIedPlugin from '@openscd/plugins/src/menu/ImportIEDs.js'; import '../compas/CompasOpen.js'; import { Dialog } from '@material/mwc-dialog'; diff --git a/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts b/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts index e07561e5db..c7386d3ae2 100644 --- a/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts +++ b/packages/compas-open-scd/test/integration/compas-editors/autogen-substation.test.ts @@ -1,7 +1,7 @@ import { expect, fixture, html } from '@open-wc/testing'; -import 'open-scd/test/unit/mock-editor.js'; -import { MockEditor } from 'open-scd/test/unit/mock-editor.js'; +import '@openscd/open-scd/test/unit/mock-editor.js'; +import { MockEditor } from '@openscd/open-scd/test/unit/mock-editor.js'; import '../../../src/compas-editors/autogen-substation.js'; import CompasAutogenerateSubstation from '../../../src/compas-editors/autogen-substation.js'; diff --git a/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts b/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts index 3ea4729b67..62a364f196 100644 --- a/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts +++ b/packages/compas-open-scd/test/integration/compas-editors/sitipe-bay.test.ts @@ -1,9 +1,9 @@ import { expect, fixture, html } from '@open-wc/testing'; import { stub } from 'sinon'; -import 'open-scd/test/unit/mock-editor.js'; +import '@openscd/open-scd/test/unit/mock-editor.js'; import { SitipeBay } from '../../../src/compas-editors/sitipe/sitipe-bay.js'; -import { MockEditor } from 'open-scd/test/unit/mock-editor.js'; +import { MockEditor } from '@openscd/open-scd/test/unit/mock-editor.js'; describe('sitipe-bay-integration', () => { if (customElements.get('sitipe-bay') === undefined) {