fix: use core from npm package

Author: noraeb

package-lock.json

@@ -18,6 +18,8 @@
   "module": "open-scd.js",
   "type": "module",
   "dependencies": {
+    "@compas-oscd/core": "^0.1.4",
+    "@compas-oscd/xml": "^0.0.1",
     "@material/mwc-dialog": "0.22.1",
     "@material/mwc-drawer": "0.22.1",
     "@material/mwc-fab": "0.22.1",
@@ -36,17 +38,16 @@
     "@material/mwc-textarea": "0.22.1",
     "@material/mwc-textfield": "0.22.1",
     "@material/mwc-top-app-bar-fixed": "0.22.1",
+    "@openscd/addons": "*",
+    "@openscd/open-scd": "*",
+    "@openscd/plugins": "*",
     "ace-custom-element": "^1.6.5",
     "csv-stringify": "^6.2.0",
     "lit-element": "2.5.1",
     "lit-html": "1.4.1",
     "lit-translate": "^1.2.1",
     "marked": "^4.0.10",
-    "panzoom": "^9.4.2",
-    "@compas-oscd/xml": "^0.0.1",
-    "@openscd/open-scd": "*",
-    "@openscd/plugins": "*",
-    "@openscd/addons": "*"
+    "panzoom": "^9.4.2"
   },
   "scripts": {
     "lint:eslint": "eslint --ext .ts,.html . --ignore-path .gitignore",
@@ -106,7 +107,7 @@
     "tslib": "^2.3.1",
     "typedoc": "^0.21.10",
     "typedoc-plugin-markdown": "3.10.4",
-    "typescript": "4.3.5",
+    "typescript": "4.9.5",
     "web-component-analyzer": "^1.1.6",
     "workbox-cli": "^6.2.4"
   },

packages/compas-open-scd/package.json

@@ -1,8 +1,4 @@
-import {
-  html,
-  TemplateResult,
-  customElement,
-} from 'lit-element';
+import { html, TemplateResult, customElement } from 'lit-element';
 
 import '@material/mwc-button';
 import '@material/mwc-dialog';
@@ -15,11 +11,12 @@ import '@material/mwc-snackbar';
 
 import '@openscd/open-scd/src/filtered-list.js';
 
-import {
-  IssueDetail,
-} from '@openscd/core/foundation/deprecated/history.js';
+import { IssueDetail } from '@compas-oscd/core/foundation/deprecated/history.js';
 
-import { HistoryUIDetail, OscdHistory } from '@openscd/open-scd/src/addons/History.js';
+import {
+  HistoryUIDetail,
+  OscdHistory,
+} from '@openscd/open-scd/src/addons/History.js';
 import { wizards } from '@openscd/plugins/src/wizards/wizard-library';
 import { newWizardEvent, SCLTag } from '@openscd/open-scd/src/foundation';
 import { nothing } from 'lit-html';
@@ -100,16 +97,15 @@ export class CompasHistory extends OscdHistory {
         <span> ${issue.title}</span>
         <span slot="secondary">${issue.message}</span>
         ${this.hasEditWizard(issue.element)
-            ? html` <span slot="meta">
-                <mwc-icon-button
-                  icon="edit"
-                  @click=${() => this.openEditWizard(issue.element)}
-                ></mwc-icon-button>
-              </span>`
-            : nothing}
+          ? html` <span slot="meta">
+              <mwc-icon-button
+                icon="edit"
+                @click=${() => this.openEditWizard(issue.element)}
+              ></mwc-icon-button>
+            </span>`
+          : nothing}
       </mwc-list-item>
-    </abbr
-    >`;
+    </abbr>`;
   }
 }
 

packages/compas-open-scd/src/addons/CompasHistory.ts

@@ -23,13 +23,10 @@ import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 
 import '@openscd/open-scd/src/plain-compare-list.js';
 
-import { newLogEvent } from "@openscd/core/foundation/deprecated/history.js";
-import { newOpenDocEvent } from "@openscd/core/foundation/deprecated/open-event.js";
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
 
-import {
-  newWizardEvent,
-  Wizard,
-} from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js';
 
 import {
   CompasSclDataService,
@@ -43,7 +40,7 @@ import {
 } from '../compas/foundation.js';
 import { addVersionToCompasWizard } from '../compas/CompasUploadVersion.js';
 import { getElementByName, styles } from './foundation.js';
-import { editCompasSCLWizard } from "../compas-wizards/scl.js";
+import { editCompasSCLWizard } from '../compas-wizards/scl.js';
 
 /** An editor [[`plugin`]] for selecting the `Substation` section. */
 export default class CompasVersionsPlugin extends LitElement {

packages/compas-open-scd/src/compas-editors/CompasVersions.ts

@@ -1,9 +1,7 @@
 import { LitElement, property } from 'lit-element';
-import {
-  newActionEvent,
-} from '@openscd/core/foundation/deprecated/editor.js';
+import { newActionEvent } from '@compas-oscd/core/foundation/deprecated/editor.js';
 import { createElement } from '@compas-oscd/xml';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 import { get } from 'lit-translate';
 
 let cbNum = 1;

packages/compas-open-scd/src/compas-editors/autogen-substation.ts

@@ -18,11 +18,14 @@ import '@material/mwc-icon-button';
 import { IconButton } from '@material/mwc-icon-button';
 
 import { isPublic } from '@openscd/open-scd/src/foundation.js';
-import { newActionEvent } from '@openscd/core/foundation/deprecated/editor.js';
+import { newActionEvent } from '@compas-oscd/core/foundation/deprecated/editor.js';
 import { createElement } from '@compas-oscd/xml';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 
-import { ComplexAction, SimpleAction } from "@openscd/core/foundation/deprecated/editor.js";
+import {
+  ComplexAction,
+  SimpleAction,
+} from '@compas-oscd/core/foundation/deprecated/editor.js';
 
 import '@openscd/open-scd/src/action-pane.js';
 import '@openscd/open-scd/src/action-icon.js';

packages/compas-open-scd/src/compas-editors/sitipe/sitipe-bay.ts

@@ -1,4 +1,4 @@
-import { newPendingStateEvent } from '@openscd/core/foundation/deprecated/waiter.js';
+import { newPendingStateEvent } from '@compas-oscd/core/foundation/deprecated/waiter.js';
 import {
   APPLICATION_ERROR,
   extractErrorMessage,

packages/compas-open-scd/src/compas-services/Websocket.ts

@@ -1,5 +1,5 @@
 import { get } from 'lit-translate';
-import { newLogEvent } from '@openscd/core/foundation/deprecated/history.js';
+import { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
 
 export const NOT_FOUND_ERROR = 'NotFoundError';
 export const APPLICATION_ERROR = 'ApplicationError';

packages/compas-open-scd/src/compas-services/foundation.ts

@@ -10,7 +10,10 @@ import {
 
 import { cloneElement } from '@compas-oscd/xml';
 
-import { ComplexAction, EditorAction } from "@openscd/core/foundation/deprecated/editor.js";
+import {
+  ComplexAction,
+  EditorAction,
+} from '@compas-oscd/core/foundation/deprecated/editor.js';
 
 import '../compas/CompasLabelsField.js';
 

packages/compas-open-scd/src/compas-wizards/scl.ts

@@ -12,8 +12,8 @@ import '@material/mwc-list';
 import '@material/mwc-list/mwc-check-list-item';
 
 import { newWizardEvent } 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 { newLogEvent } from '@compas-oscd/core/foundation/deprecated/history.js';
+import { newOpenDocEvent } from '@compas-oscd/core/foundation/deprecated/open-event.js';
 
 import { CompasSclAutoAlignmentService } from '../compas-services/CompasSclAutoAlignmentService.js';
 import { createLogEvent } from '../compas-services/foundation.js';