Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync CoMPAS-OpenSCD with OpenSCD #291

Merged
merged 22 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
246e50e
infra: switch to monorepo
Sep 25, 2023
2ae1cd3
fix(action): correct source folder
Sep 25, 2023
e5bc0b8
feat(editors/ied): Improve IED editor UI for IED and LN selection (#1…
danyill Sep 25, 2023
a737c42
chore: adds pr to overview board (#1319)
juancho0202 Sep 27, 2023
00e23b0
Chore: Moved mergeSubstation function outside the UpdateSubstation pl…
pascalwilbrink Oct 23, 2023
74fa468
Update foundation.ts (#1340)
pascalwilbrink Oct 25, 2023
370f47a
Split logging (#1334)
pascalwilbrink Oct 31, 2023
83d1d61
feat: Provide ability to see Services section XML (#1346)
juancho0202 Oct 31, 2023
1c2ef60
feat: add ISD file extension (#1351)
pascalwilbrink Nov 2, 2023
2066e4c
fix: supervision updates after ied rename (#1338)
Stef3st Nov 2, 2023
83b3072
Merge branch 'main' into release_v0_33_0_6
Stef3st Nov 2, 2023
76e002d
chore: tidy up merge
Stef3st Nov 6, 2023
2b3cc11
chore: renewed package lock
Stef3st Nov 6, 2023
80ab9d0
chore: preparing open-scd side for the sync
juancho0202 Nov 6, 2023
cde697e
Merge branch 'main' into sync-oscd-side
juancho0202 Nov 6, 2023
5ba46a3
chore: copying as is packages/open-scd
juancho0202 Nov 6, 2023
86c9cb5
chore: missing updates from compas-open-scd/main
juancho0202 Nov 6, 2023
55ff9f8
ci: add root level package-lock.json
juancho0202 Nov 6, 2023
2c9c422
chore: fixing favicon and removing unused svg
juancho0202 Nov 6, 2023
45587ae
chore: added latest oscd changes in compas package
Stef3st Nov 7, 2023
9ef97fd
chore: fixed hosting
Stef3st Nov 7, 2023
023e35c
chore: fixed dependatbot action
Stef3st Nov 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ updates:
interval: "daily"
open-pull-requests-limit: 5
- package-ecosystem: "docker"
directory: "packages/compas-openscd/"
directory: "packages/compas-open-scd/"
schedule:
interval: "daily"
open-pull-requests-limit: 5
2 changes: 1 addition & 1 deletion .github/workflows/test-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
run: |
cd packages/compas-open-scd
npm ci
npm run-script build
npm run-script build
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Test
on:
on:
push:
branches-ignore:
- main
Expand All @@ -20,4 +20,4 @@ jobs:
run: |
cd packages/compas-open-scd
npm ci
npm run-script test
npm run-script test
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ to use the CoMPAS Backend Service to open and save SCL Files and more.

This repository is a [↗ monorepo](https://en.wikipedia.org/wiki/Monorepo), made up of several packages.
To find out more about the development of each packages, such as the base distribution or the plugins, please refer to their respective READMEs:

- [open-scd](packages/open-scd/README.md): provides the (upstream) base distribution available on [openscd.github.io](https://openscd.github.io)
- [compas-open-scd](packages/compas-open-scd/README.md): provides the base distribution available on [demo.compas.energy](https://demo.compas.energy)

## Contributing

A recommended read for every newcomer to the CoMPAS project is [the CoMPAS Contributing guide](https://com-pas.github.io/contributing/).

You can also get in touch by joining the `#compas` channel hosted on [the LF Energy Slack server](https://lfenergy.slack.com/archives/C01926K9D39).
You can also get in touch by joining the `#compas` channel hosted on [the LF Energy Slack server](https://lfenergy.slack.com/archives/C01926K9D39).

## Documentation

Expand Down
33 changes: 33 additions & 0 deletions docs/decisions/0002-use-monorepo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# 2. Use Monorepo

Date: 2023-08

## Status

Accepted

## Context

We want:
- better access management to core functionalities, plugins and ui components
- easier maintainability and refactorability of critical parts
- more shareable code


## Decision

We will use a monorepo to manage the codebase for the time being.

To control access to the codebase we will use CODEOWNERS files.


## Consequences

- it makes the the dependency discovery and management easier between packages
- we can add packages that can be deployed and published independently and still used directly inside the monorepo
- it will allow us to experiment and beta test packages before publishing them
- CI pipeline runs will be faster because changes are more separated
- it will make it harder to bundle and distribute parts of the base distribution
- it moves the complexity of package management into a concentrated place


4 changes: 4 additions & 0 deletions docs/decisions/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Decisions

- [ADR-0001: Record architecture decisions](0001-record-architecture-decisions.md) <kbd>✅ active</kbd>
- [ADR-0002: Use Monorepo](0002-use-monorepo.md) <kbd>✅ active</kbd>
Loading