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

Feature/workspaces #63

Merged
merged 18 commits into from
Apr 4, 2024
Merged

Feature/workspaces #63

merged 18 commits into from
Apr 4, 2024

Conversation

elliot-sabitov
Copy link
Contributor

feat: Utilizing npm workspaces to simplify multi npm package local dependencies
feat: Adjusting Docker related files to expose debugger port
chore: Created run configuration support files to run Docker and attach debugger

Elliot Sabitov and others added 10 commits March 11, 2024 16:58
…pendencies

feat: Adjusting Docker related files to expose debugger port
chore: Created run configuration support files to run Docker and attach debugger
* rc-1.1.0:
  exporting websocket config
  including env var changes to system config
  adding todo
  fixing typo
  adjusting configs to match new format, fixing calls which reference config
  fix EVSEType value

# Conflicts:
#	Server/src/config/envs/docker.ts
#	Server/src/config/envs/local.ts
#	Server/src/index.ts
#	Swarm/src/config/envs/local.ts
#	Swarm/src/index.ts
* rc-1.1.0: (55 commits)
  adding interfaces for locations repo, exporting interface
  adding locations repository impl
  added missing relation (Locations have one or more Charging Stations; Stations have at most one Location)
  expanded authenticator to handle unknown/known chargers and duplicate charger connections; system config also expanded to accomodate accept unknown chargers
  adding Location and ChargingStation entities
  adding ocpp router to unix install scripts, updating comments to refer to ocpp router instead of central system
  Update Server/src/index.ts
  fix: Upgrade setup build action due to deprication notice
  fix: PR sanity build job with correct path
  fix: add in no cache to avoid npm issues with the tarballs
  adding admin api to swarm
  adjusting swarm for new class structure
  Removing INetworkConnection, combining IMessageRouter and ICentralSystem
  fix: only trigger for a version tag push and set higher version of builder image to move up from node16 which is deprecated in github
  Update Swarm/src/index.ts
  improved comment
  improved logging and variable management in directus hook
  pr feedback--better comment, removing problematic defaults for directus username/password
  feature: add a workflow that runs a build without pushing when a PR is opened
  feature: add a workflow that builds and pushes the server docker image to Github container registry when a commit is tagged with `v*`
  ...

# Conflicts:
#	.gitignore
#	00_Base/src/index.ts
#	00_Base/src/interfaces/messages/index.ts
#	02_Util/package.json
#	02_Util/src/queue/google-pubsub/receiver.ts
#	02_Util/src/queue/kafka/receiver.ts
#	02_Util/src/queue/rabbit-mq/receiver.ts
#	02_Util/src/server/example/router.ts
#	02_Util/src/server/example/server.ts
#	03_Modules/Configuration/src/module/api.ts
#	03_Modules/EVDriver/src/module/module.ts
#	03_Modules/Reporting/src/module/module.ts
#	Server/docker-compose.yml
#	Server/docker/Dockerfile
#	Server/package.json
#	Server/src/config/envs/local.ts
#	Server/src/index.ts
#	Server/unix-init-install-all.sh
#	Swarm/docker/Dockerfile
#	Swarm/package.json
#	Swarm/src/config/envs/local.ts
#	Swarm/src/index.ts
#	Swarm/unix-init-install-all.sh
@elliot-sabitov elliot-sabitov changed the title Feature/workspaces WIP Feature/workspaces Mar 27, 2024
Copy link
Contributor

@ChrisWeissmann ChrisWeissmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test build in the GitHub workflow seems broken now. We should probably fix this.

00_Base/package.json Show resolved Hide resolved
01_Data/tsconfig.json Show resolved Hide resolved
01_Data/src/index.ts Outdated Show resolved Hide resolved
02_Util/src/server/example/server.ts Outdated Show resolved Hide resolved
package.json Show resolved Hide resolved
@elliot-sabitov elliot-sabitov changed the title WIP Feature/workspaces Feature/workspaces Mar 29, 2024
Copy link
Collaborator

@thanaParis thanaParis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is doing too much at the moment. I'd appreciate if we could focus on what's needed to move towards an npm workspace, and remove references to IntelliJ as we previously discussed. The tsconfig inheritance changes can stay--I think they're related enough.

.idea/runConfigurations/Attach_Debugger.xml Outdated Show resolved Hide resolved
00_Base/package.json Show resolved Hide resolved
00_Base/src/interfaces/messages/index.ts Show resolved Hide resolved
01_Data/src/index.ts Outdated Show resolved Hide resolved
03_Modules/Configuration/src/module/api.ts Outdated Show resolved Hide resolved
03_Modules/Monitoring/src/module/api.ts Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
Server/.dockerignore Outdated Show resolved Hide resolved
Swarm/.eslintrc.json Outdated Show resolved Hide resolved
Server/docker-compose.yml Show resolved Hide resolved
@thanaParis thanaParis merged commit 980da6d into rc-1.1.0 Apr 4, 2024
1 check passed
@ChrisWeissmann ChrisWeissmann deleted the feature/workspaces branch June 5, 2024 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants