chore: Fix more imports

openscd · Jul 22, 2024 · 720aef8 · 720aef8
1 parent 9bcee42
commit 720aef8
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,18 +1,18 @@
 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,
   wizardInputSelector
 } 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) {