Skip to content

Monorepo structure - Phase 1 #554

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

Open
wants to merge 51 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
1a14eff
Moved all code to monorepo structure
nielsdejong Aug 9, 2023
515ee6a
Updated readme
nielsdejong Aug 9, 2023
de59050
Updated readme
nielsdejong Aug 9, 2023
d6a696f
added more config in turbo.json and updated readme + package.json upd…
Aug 9, 2023
0b4a180
fixed the linting error
Aug 9, 2023
19031fe
made changes to the deployment files + shifted around dockerfiles
Aug 9, 2023
dc89955
updated paths in all deployfiles
Aug 9, 2023
2b9a68a
added installation of turbo everywhere it was needed
Aug 9, 2023
7ef7206
added a new item in cypress for path to config-file
Aug 10, 2023
38b371a
Merge with 2.3.4 develop
nielsdejong Aug 23, 2023
305c4c9
Merge branch 'develop' into feature/monorepo-2.3
nielsdejong Aug 23, 2023
461bd3d
Clean up and organized files in monorepo structure
nielsdejong Aug 23, 2023
fa6e20d
Fixed reference to staged lint file
nielsdejong Aug 23, 2023
c79d22e
Renamed cypress config file
nielsdejong Aug 23, 2023
1c9659c
Removed old files
nielsdejong Aug 23, 2023
39d66cb
Move cypress config to root folder for execution
nielsdejong Aug 23, 2023
217d316
Fixed typo
nielsdejong Aug 23, 2023
487e0e1
Copying cypress file
nielsdejong Aug 23, 2023
1ae2127
Copying cypress file
nielsdejong Aug 23, 2023
d746898
Housekeeping Bugs 1
BennuFire Aug 23, 2023
fbf95c2
Merge remote-tracking branch 'origin/feature/monorepo-2.3' into featu…
BennuFire Aug 23, 2023
a46d984
Rename cypress config
nielsdejong Aug 23, 2023
2f45994
Fixed github action
nielsdejong Aug 23, 2023
f495b33
Merge branch 'feature/monorepo-2.3' of github.com:neo4j-labs/neodash …
nielsdejong Aug 23, 2023
f7142bb
Fixed docker start script
nielsdejong Aug 23, 2023
92a03ed
Housekeeping Bugs 2
BennuFire Aug 23, 2023
4e390b5
Fix invalid merge
nielsdejong Aug 23, 2023
845bf75
Merge branch 'feature/monorepo-2.3' of github.com:neo4j-labs/neodash …
nielsdejong Aug 23, 2023
89d99c3
Fix merge on dependency version, refactoring
nielsdejong Aug 23, 2023
581f879
Fixing test scripts
nielsdejong Aug 23, 2023
229d547
Revert lockfile
nielsdejong Aug 23, 2023
e66259b
Dropdown fix and housekeep
BennuFire Aug 24, 2023
f2ab01d
Split apps/packages in monorepo structure
nielsdejong Aug 29, 2023
ad3dadf
Split apps/packages in monorepo structure
nielsdejong Aug 29, 2023
5e20f32
Restructuring monorepo files into a stable state
nielsdejong Aug 29, 2023
72fcf7d
Fixed broken tailwind config
nielsdejong Aug 29, 2023
9fa1463
Fixed build script for editor
nielsdejong Aug 29, 2023
a038921
Fixed issues with pointers to invalid css and png files
nielsdejong Aug 30, 2023
90b17c4
Moved store to engineering
nielsdejong Aug 30, 2023
b4e9626
Iterating on the build process of the library
nielsdejong Sep 1, 2023
deda77a
File cleanup
nielsdejong Sep 4, 2023
5e51ce4
using babel to compile package
nielsdejong Sep 4, 2023
dd52c30
Clean up monorepo scripts
nielsdejong Sep 4, 2023
e25c5ff
Upgrade to yarn 3.X
nielsdejong Sep 4, 2023
84fe576
Attempted local webpack config
nielsdejong Sep 5, 2023
c63a9ae
Updating webpack config, preparing for hot-reload
nielsdejong Sep 11, 2023
7537e63
webpack local tweaks
jharris4 Sep 11, 2023
719478b
fix babel config for webpack local
jharris4 Sep 11, 2023
75d0d64
fix package version conflicts caused by ndl
jharris4 Sep 12, 2023
9acd3e4
Fix top await
BennuFire Sep 15, 2023
52376fe
Test rev
BennuFire Sep 18, 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
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

24 changes: 14 additions & 10 deletions .github/workflows/develop-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,23 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Creating Neo4j Container
run: |
chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
./scripts/docker-neo4j-initializer/docker-neo4j.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
sleep 30s
chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
./scripts/docker-neo4j-initializer/start-movies-db.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
- run: yarn global add turbo
- run: yarn install
- name: Eslint check
run: yarn run lint
run: yarn lint:all
- name: Copy cypress config to root folder for execution
run: cp -r apps/neodash-editor/cypress .
- name: Cypress run
uses: cypress-io/github-action@v4
with:
build: yarn run build
start: yarn run dev
config-file: apps/neodash-editor/cypress-config.ts
build: turbo run build --filter neodash-editor
start: turbo run start --filter neodash-editor
wait-on: "http://localhost:3000"
browser: chrome
build-s3:
Expand All @@ -47,12 +51,12 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: yarn install
- run: yarn run build-minimal
- run: turbo run build --filter neodash-editor
- name: Set AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-west-1
- run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
- run: aws s3 rm s3://neodash-test.graphapp.io/ --recursive && aws s3 sync dist s3://neodash-test.graphapp.io/ --acl public-read
- run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > apps/neodash-editor/dist/index.html
- run: aws s3 rm s3://neodash-test.graphapp.io/ --recursive && aws s3 sync apps/neodash-editor/dist s3://neodash-test.graphapp.io/ --acl public-read
20 changes: 12 additions & 8 deletions .github/workflows/develop-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,24 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Creating Neo4j Container
run: |
chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
./scripts/docker-neo4j-initializer/docker-neo4j.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
sleep 30s
chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
./scripts/docker-neo4j-initializer/start-movies-db.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
- run: yarn global add turbo
- run: yarn install
- name: Eslint check
run: yarn run lint
run: yarn lint:all
- name: Copy cypress config to root folder for execution
run: cp -r apps/neodash-editor/cypress .
- name: Cypress run
uses: cypress-io/github-action@v4
with:
build: yarn run build
start: yarn run dev
wait-on: 'http://localhost:3000'
config-file: apps/neodash-editor/cypress-config.ts
build: yarn run build:editor
start: yarn run start:editor
wait-on: "http://localhost:3000"
browser: chrome
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
45 changes: 24 additions & 21 deletions .github/workflows/master-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,23 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Creating Neo4j Container
run: |
chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
./scripts/docker-neo4j-initializer/docker-neo4j.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
sleep 30s
chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
./scripts/docker-neo4j-initializer/start-movies-db.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
- run: yarn global add turbo
- run: yarn install
- name: Eslint check
run: yarn run lint
run: turbo run lint
- name: Copy cypress config to root folder for execution
run: cp -r apps/neodash-editor/cypress .
- name: Cypress run
uses: cypress-io/github-action@v4
with:
build: yarn run build
start: yarn run dev
config-file: apps/neodash-editor/cypress-config.ts
build: turbo run build --filter neodash-editor
start: turbo run start --filter neodash-editor
wait-on: "http://localhost:3000"
browser: chrome
build-s3:
Expand All @@ -45,17 +49,16 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: rm -rf docs
- run: yarn install
- run: yarn run build-minimal
- run: turbo run build --filter neodash-editor
- name: Set AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-west-1
- run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
- run: aws s3 rm s3://neodash.graphapp.io/ --recursive && aws s3 sync dist s3://neodash.graphapp.io/ --acl public-read
- run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > apps/neodash-editor/dist/index.html
- run: aws s3 rm s3://neodash.graphapp.io/ --recursive && aws s3 sync apps/neodash-editor/dist s3://neodash.graphapp.io/ --acl public-read
build-docker:
needs: build-test
runs-on: neodash-runners
Expand All @@ -65,7 +68,6 @@ jobs:
steps:
- name: run Docker
uses: actions/checkout@v2
- run: rm -rf docs
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
Expand All @@ -77,7 +79,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
file: apps/neodash-editor/Dockerfile
push: true
tags: ${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_LABS_USERNAME }}/neodash:2.3.4
build-docker-legacy:
Expand All @@ -89,7 +91,6 @@ jobs:
steps:
- name: run Docker
uses: actions/checkout@v2
- run: rm -rf docs
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
Expand All @@ -101,7 +102,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
file: apps/neodash-editor/Dockerfile
push: true
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/neodash:latest,${{ secrets.DOCKER_HUB_USERNAME }}/neodash:2.3.4
deploy-gallery:
Expand All @@ -115,15 +116,16 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: cd gallery && yarn install
- run: cd gallery && yarn run build
- run: yarn global add turbo
- run: yarn install
- run: turbo run build --filter gallery
- name: Set AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-west-1
- run: aws s3 rm s3://neodash-gallery.graphapp.io/ --recursive && aws s3 sync gallery/build s3://neodash-gallery.graphapp.io/ --acl public-read
- run: aws s3 rm s3://neodash-gallery.graphapp.io/ --recursive && aws s3 sync apps/gallery/build s3://neodash-gallery.graphapp.io/ --acl public-read
deploy-docs:
needs: build-test
runs-on: neodash-runners
Expand All @@ -146,10 +148,11 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: rm -rf docs
- run: yarn global add turbo
- run: yarn install
- run: PRODUCTION=true && yarn run build-minimal
- run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > dist/index.html
- run: PRODUCTION=true && turbo run build --filter neodash-editor
- run: curl ${{ secrets.INDEX_HTML_DEPLOYMENT_URL }} > apps/neodash-editor/dist/index.html
- run: cd apps/neodash-editor/
- run: npm pack
- run: rm -rf target
- run: mkdir target
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/master-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,22 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Creating Neo4j Container
run: |
chmod +x ./scripts/docker-neo4j-initializer/docker-neo4j.sh
./scripts/docker-neo4j-initializer/docker-neo4j.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/docker-neo4j.sh
sleep 30s
chmod +x ./scripts/docker-neo4j-initializer/start-movies-db.sh
./scripts/docker-neo4j-initializer/start-movies-db.sh
chmod +x apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
apps/neodash-editor/docker-files/docker-neo4j-initializer/start-movies-db.sh
- run: yarn global add turbo
- run: yarn install
- name: Eslint check
run: yarn run lint
run: turbo run lint
- name: Copy cypress config to root folder for execution
run: cp -r apps/neodash-editor/cypress .
- name: Cypress run
uses: cypress-io/github-action@v4
with:
build: yarn run build
start: yarn run dev
config-file: apps/neodash-editor/cypress-config.ts
build: turbo run build --filter neodash-editor
start: turbo run start --filter neodash-editor
wait-on: "http://localhost:3000"
browser: chrome
19 changes: 16 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,21 @@ target
/.pnp
.pnp.js
.vscode
.yarn/*
!.yarn/releases
!.yarn/plugins

# testing
/coverage
/.nyc_output
cypress/videos

# production
/build
/dist
**/build
**/dist
**/es
**/lib


# misc
.DS_Store
Expand All @@ -33,10 +39,17 @@ yarn-error.log*
*.tgz

# package directories
node_modules
**/node_modules
jspm_packages

# Serverless directories
.serverless

# Turbo
+ .turbo
*/.turbo
**/.turbo
# Sentry Auth Token
.env.sentry-build-plugin
**/.nyc_output
**/screenshots
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
. "$(dirname -- "$0")/_/husky.sh"
. "$(dirname -- "$0")/common.sh"

yarn run lint-staged
yarn lint-staged:all
Loading