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

Refactoring codebase (Part1) #424

Merged
merged 6 commits into from
Jun 29, 2021

Conversation

alexandruandrei91
Copy link
Contributor

The goal is to get to a similar setup as https://github.com/equinor/webviz-core-components
See also equinor/webviz-core-components#90 and equinor/webviz-core-components#125 for more details.

The main changes in this PR are:

  • Move the web components and everything related (storybook, linting/typescript/webpack/node config etc) into the react/ folder, updating package.json and and webpack.config.js for it.
  • Remove R code generation.
  • Change package name to @webviz/subsurface-components to match the convention in core-components.
  • Change license name in package.json from LGPL to MPL.

I've decided to push this refactoring in two parts to get the most disruptive part (moving react stuff into another folder) in as soon as possible, to minimize the merge conflicts.
Next I'll address the other changes needed, in a different PR.

Adds to #411

* update output dir for dash components
* update license in package.json
* update package name to use the same convention as core components
* disable generation of R dash components
@alexandruandrei91 alexandruandrei91 self-assigned this Jun 29, 2021
@alexandruandrei91 alexandruandrei91 added AspenTech Task owned by AspenTech maintenance map-component Issues related to the map component. labels Jun 29, 2021
@anders-kiaer
Copy link
Collaborator

anders-kiaer commented Jun 29, 2021

I've decided to push this refactoring in two parts to get the most disruptive part (moving react stuff into another folder) in as soon as possible, to minimize the merge conflicts.

Good plan @alexandruandrei91 👍

Regarding the 🔴 from CI - I guess that is easily solved by instructing the CI workflow to know that package-lock.json is now not in root of the repo anymore, but instead in ./react.

In webviz-core-components this was accomplished by adding --prefix ./react to npm ci.

@alexandruandrei91 alexandruandrei91 merged commit 36763b7 into equinor:master Jun 29, 2021
@alexandruandrei91 alexandruandrei91 deleted the repo-refactor branch June 29, 2021 13:32
hkfb pushed a commit to hkfb/webviz-subsurface-components that referenced this pull request Nov 29, 2021
* Move react stuff to react/
* Update output dir for dash components
* Update license in package.json
* Update package name to use the same convention as core components
* Disable generation of R dash components
* Temporary disable the python tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AspenTech Task owned by AspenTech maintenance map-component Issues related to the map component.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants