fix: migrate to npm package openscd

package.json

@@ -20,7 +20,8 @@
     "@commitlint/config-conventional": "^19.8.0",
     "husky": "^9.1.7",
     "lerna": "^7.1.4",
-    "nx": "18.3.4"
+    "nx": "18.3.4",
+    "shiki": "^3.15.0"
   },
   "optionalDependencies": {
     "@nx/nx-linux-x64-gnu": "18.3.4"

packages/compas-open-scd/package.json

@@ -19,6 +19,7 @@
   "type": "module",
   "dependencies": {
     "@compas-oscd/core": "^0.1.23",
+    "@compas-oscd/open-scd": "^0.34.42",
     "@compas-oscd/xml": "^0.0.1",
     "@material/mwc-dialog": "0.22.1",
     "@material/mwc-drawer": "0.22.1",
@@ -39,7 +40,6 @@
     "@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",

packages/compas-open-scd/snowpack.config.mjs

@@ -1,6 +1,6 @@
-export default ({
+export default {
   plugins: ['@snowpack/plugin-typescript'],
-  packageOptions : {
+  packageOptions: {
     external: [
       '@web/dev-server-core',
       '@web/dev-server-esbuild',
@@ -11,40 +11,39 @@ export default ({
     ],
   },
   exclude: [
-    "**/node_modules/**/*",
-    ".editorconfig",
-    ".eslintrc.cjs",
-    ".travis.yml",
-    "**/karma.conf.cjs",
-    "**/Dockerfile",
-    "**/package*",
-    "**/tsconfig.json",
-    "**/workbox-config.cjs",
-    "**/*.@(spec|test).@(js|mjs)",
-    "**/__snapshots__/**/*",
-    "**/coverage/**/*",
-    "**/out-tsc/**/*",
-    "**/test/**/*",
-    ".gitignore",
-    "**/.git/**",
-    "**/.github/**",
-    "**/.idea/**",
-    "**/web-test-runner.config.mjs",
-    "**/oscd-plugins/auto-doc/**/*",
+    '**/node_modules/**/*',
+    '.editorconfig',
+    '.eslintrc.cjs',
+    '.travis.yml',
+    '**/karma.conf.cjs',
+    '**/Dockerfile',
+    '**/package*',
+    '**/tsconfig.json',
+    '**/workbox-config.cjs',
+    '**/*.@(spec|test).@(js|mjs)',
+    '**/__snapshots__/**/*',
+    '**/coverage/**/*',
+    '**/out-tsc/**/*',
+    '**/test/**/*',
+    '.gitignore',
+    '**/.git/**',
+    '**/.github/**',
+    '**/.idea/**',
+    '**/web-test-runner.config.mjs',
+    '**/oscd-plugins/auto-doc/**/*',
   ],
-  workspaceRoot: "../../",
+  workspaceRoot: '../../',
   mount: {
     '../openscd/': '/openscd/',
     '../plugins/': '/plugins/',
     '../external-plugins/': '/external-plugins/',
-    "./": "/",
+    './': '/',
   },
   alias: {
     '@openscd/open-scd': '../openscd/',
     '@openscd/plugins': '../plugins/',
   },
   buildOptions: {
     htmlFragments: true,
-  }
-});
-
+  },
+};

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

@@ -9,16 +9,14 @@ import '@material/mwc-list';
 import '@material/mwc-list/mwc-list-item';
 import '@material/mwc-snackbar';
 
-import '@openscd/open-scd/src/filtered-list.js';
+import '@compas-oscd/open-scd/filtered-list.js';
 
 import { IssueDetail } from '@compas-oscd/core';
 
-import {
-  HistoryUIDetail,
-  OscdHistory,
-} from '@openscd/open-scd/src/addons/History.js';
+import { HistoryUIDetail, OscdHistory } from '@compas-oscd/open-scd';
+
 import { wizards } from '@openscd/plugins/src/wizards/wizard-library';
-import { newWizardEvent, SCLTag } from '@openscd/open-scd/src/foundation';
+import { newWizardEvent, SCLTag } from '@compas-oscd/open-scd';
 import { nothing } from 'lit-html';
 
 export enum HistoryUIKind {

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

@@ -1,15 +1,9 @@
-import {
-  customElement,
-  html,
-  property,
-  TemplateResult,
-} from 'lit-element';
+import { customElement, html, property, TemplateResult } from 'lit-element';
 import { get } from 'lit-translate';
 
 import type { UserInfoEvent } from '../compas/foundation';
 
-import { OscdLayout } from '@openscd/open-scd/src/addons/Layout.js';
-
+import { OscdLayout } from '@compas-oscd/open-scd';
 
 @customElement('compas-layout')
 export class CompasLayout extends OscdLayout {
@@ -29,16 +23,16 @@ export class CompasLayout extends OscdLayout {
   protected renderActionItems(): TemplateResult {
     return html`
       ${this.username != undefined
-                ? html`<span
-                    id="userField"
-                    slot="actionItems"
-                    style="font-family:Roboto"
-                    >${get('userinfo.loggedInAs', {
-                      name: this.username,
-                    })}</span
-                  >`
-                : ``}
-        ${this.menu.map(this.renderActionItem)}
+        ? html`<span
+            id="userField"
+            slot="actionItems"
+            style="font-family:Roboto"
+            >${get('userinfo.loggedInAs', {
+              name: this.username,
+            })}</span
+          >`
+        : ``}
+      ${this.menu.map(this.renderActionItem)}
     `;
   }
 }

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

@@ -21,12 +21,12 @@ import '@material/mwc-list/mwc-check-list-item';
 import { Dialog } from '@material/mwc-dialog';
 import { MultiSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 
-import '@openscd/open-scd/src/plain-compare-list.js';
+import '@compas-oscd/open-scd/plain-compare-list.js';
 
 import { newLogEvent } from '@compas-oscd/core';
 import { newOpenDocEvent } from '@compas-oscd/core';
 
-import { newWizardEvent, Wizard } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent, Wizard } from '@compas-oscd/open-scd';
 
 import {
   CompasSclDataService,

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

@@ -2,7 +2,7 @@ import { css, html, LitElement, property, TemplateResult } from 'lit-element';
 import { translate } from 'lit-translate';
 
 import './sitipe/sitipe-substation.js';
-import { isPublic } from '@openscd/open-scd/src/foundation.js';
+import { isPublic } from '@compas-oscd/open-scd';
 
 /** An editor [[`plugin`]] for Sitipe based configuration */
 export default class SitipePlugin extends LitElement {

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

@@ -17,15 +17,15 @@ import '@material/mwc-icon-button';
 
 import { IconButton } from '@material/mwc-icon-button';
 
-import { isPublic } from '@openscd/open-scd/src/foundation.js';
+import { isPublic } from '@compas-oscd/open-scd';
 import { newActionEvent } from '@compas-oscd/core';
 import { createElement } from '@compas-oscd/xml';
 import { newLogEvent } from '@compas-oscd/core';
 
 import { ComplexAction, SimpleAction } from '@compas-oscd/core';
 
-import '@openscd/open-scd/src/action-pane.js';
-import '@openscd/open-scd/src/action-icon.js';
+import '@compas-oscd/open-scd/action-pane.js';
+import '@compas-oscd/open-scd/action-icon.js';
 
 import {
   SIEMENS_SITIPE_IED_REF,

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

@@ -13,8 +13,8 @@ import '@material/mwc-list';
 import '@material/mwc-icon';
 import '@material/mwc-icon-button';
 
-import '@openscd/open-scd/src/action-pane.js';
-import '@openscd/open-scd/src/action-icon.js';
+import '@compas-oscd/open-scd/action-pane.js';
+import '@compas-oscd/open-scd/action-icon.js';
 
 import './sitipe-bay.js';
 

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

@@ -6,7 +6,7 @@ import {
   Wizard,
   WizardActor,
   WizardInputElement,
-} from '@openscd/open-scd/src/foundation.js';
+} from '@compas-oscd/open-scd';
 
 import { cloneElement } from '@compas-oscd/xml';
 

packages/compas-open-scd/src/compas/CompasAutoAlignment.ts

@@ -11,7 +11,7 @@ import { get, translate } from 'lit-translate';
 import '@material/mwc-list';
 import '@material/mwc-list/mwc-check-list-item';
 
-import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent } from '@compas-oscd/open-scd';
 import { newLogEvent } from '@compas-oscd/core';
 import { newOpenDocEvent } from '@compas-oscd/core';
 

packages/compas-open-scd/src/compas/CompasComment.ts

@@ -5,10 +5,10 @@ import {
   LitElement,
   TemplateResult,
 } from 'lit-element';
-import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js";
+import { WizardTextField } from '@compas-oscd/open-scd';
 import { translate } from 'lit-translate';
 
-import "@openscd/open-scd/src/wizard-textfield.js";
+import '@compas-oscd/open-scd/wizard-textfield.js';
 
 @customElement('compas-comment')
 export class CompasCommentElement extends LitElement {

packages/compas-open-scd/src/compas/CompasExistsIn.ts

@@ -1,6 +1,6 @@
 import { property, PropertyValues, state } from 'lit-element';
 
-import { LitElementConstructor, Mixin } from '@openscd/open-scd/src/foundation.js';
+import { LitElementConstructor, Mixin } from '@compas-oscd/open-scd';
 
 import { getTypeFromDocName } from './foundation.js';
 import { CompasSclDataService } from '../compas-services/CompasSclDataService.js';

packages/compas-open-scd/src/compas/CompasImportFromApi.ts

@@ -2,11 +2,11 @@ import { customElement, html, LitElement, TemplateResult } from 'lit-element';
 
 import '@material/mwc-list/mwc-list-item';
 
-import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent } from '@compas-oscd/open-scd';
 import { newOpenDocEvent } from '@compas-oscd/core';
 import { newPendingStateEvent } from '@compas-oscd/core';
 
-import '@openscd/open-scd/src/filtered-list.js';
+import '@compas-oscd/open-scd/filtered-list.js';
 
 import {
   createLogEvent,

packages/compas-open-scd/src/compas/CompasLabelsField.ts

@@ -15,9 +15,9 @@ import '@material/mwc-list/mwc-list-item';
 import '@material/mwc-icon';
 import '@material/mwc-icon-button';
 
-import { WizardTextField } from "@openscd/open-scd/src/wizard-textfield.js";
+import { WizardTextField } from '@compas-oscd/open-scd';
 
-import "@openscd/open-scd/src/wizard-textfield.js";
+import '@compas-oscd/open-scd/wizard-textfield.js';
 
 import {
   COMPAS_LABELS_MAXIMUM,

packages/compas-open-scd/src/compas/CompasOpen.ts

@@ -17,7 +17,7 @@ import { createLogEvent } from '../compas-services/foundation.js';
 import { SclSelectedEvent } from './CompasSclList.js';
 import { TypeSelectedEvent } from './CompasSclTypeList.js';
 
-import '@openscd/open-scd/src/WizardDivider.js';
+import '@compas-oscd/open-scd/WizardDivider.js';
 import './CompasSclTypeList.js';
 import './CompasSclList.js';
 

packages/compas-open-scd/src/compas/CompasSave.ts

@@ -17,7 +17,7 @@ import '@material/mwc-button';
 import { newLogEvent } from '@compas-oscd/core';
 import { saveDocumentToFile } from '../file.js';
 
-import '@openscd/open-scd/src/WizardDivider.js';
+import '@compas-oscd/open-scd/WizardDivider.js';
 
 import { CompasExistsIn } from './CompasExistsIn.js';
 import { CompasChangeSetRadiogroup } from './CompasChangeSetRadiogroup.js';

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 '@openscd/open-scd/src/oscd-filter-button.js';
+import { SelectedItemsChangedEvent } from '@compas-oscd/open-scd';
 
-import '@openscd/open-scd/src/filtered-list.js';
-import '@openscd/open-scd/src/oscd-filter-button.js';
+import '@compas-oscd/open-scd/filtered-list.js';
+import '@compas-oscd/open-scd/oscd-filter-button.js';
 
 import {
   CompasSclDataService,

packages/compas-open-scd/src/compas/CompasSettings.ts

@@ -11,7 +11,7 @@ import { translate } from 'lit-translate';
 import '@material/mwc-textfield';
 import '@material/mwc-button';
 
-import { newWizardEvent } from '@openscd/open-scd/src/foundation.js';
+import { newWizardEvent } from '@compas-oscd/open-scd';
 import { TextFieldBase } from '@material/mwc-textfield/mwc-textfield-base';
 import { Switch } from '@material/mwc-switch';
 

packages/compas-open-scd/src/compas/CompasUploadVersion.ts

@@ -9,11 +9,11 @@ import {
   newWizardEvent,
   Wizard,
   WizardInputElement,
-} from '@openscd/open-scd/src/foundation.js';
+} from '@compas-oscd/open-scd';
 import { newLogEvent } from '@compas-oscd/core';
 import { newPendingStateEvent } from '@compas-oscd/core';
 
-import '@openscd/open-scd/src/wizard-textfield.js';
+import '@compas-oscd/open-scd/wizard-textfield.js';
 
 import { CompasExistsIn } from './CompasExistsIn.js';
 import { CompasSclDataService } from '../compas-services/CompasSclDataService.js';

packages/compas-open-scd/src/compas/private.ts

@@ -1,4 +1,4 @@
-import { SCL_NAMESPACE } from '@openscd/open-scd/src/schemas.js';
+import { SCL_NAMESPACE } from '@compas-oscd/open-scd';
 
 export const COMPAS_NAMESPACE = 'https://www.lfenergy.org/compas/extension/v1';
 export const COMPAS_PREFIX = 'compas';