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

Fix docker install #2925

Merged
merged 8 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/ci-front.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
path: front/node_modules
key: front-node_modules-${{hashFiles('front/yarn.lock')}}
restore-keys: front-node_modules-
- name: Cache twenty-eslint-plugin node modules
- name: Cache eslint-plugin-twenty node modules
uses: actions/cache@v3
with:
path: packages/twenty-eslint-plugin/node_modules
key: twenty-eslint-plugin-node_modules-${{hashFiles('packages/twenty-eslint-plugin/yarn.lock')}}
restore-keys: twenty-eslint-plugin-node_modules-
path: packages/eslint-plugin-twenty/node_modules
key: eslint-plugin-twenty-node_modules-${{hashFiles('packages/eslint-plugin-twenty/yarn.lock')}}
restore-keys: eslint-plugin-twenty-node_modules-
- name: Front / Install Dependencies
run: cd front && yarn
front-pages-sb-test:
Expand Down Expand Up @@ -58,12 +58,12 @@ jobs:
path: front/node_modules
key: front-node_modules-${{hashFiles('front/yarn.lock')}}
restore-keys: front-node_modules-
- name: Cache twenty-eslint-plugin node modules
- name: Cache eslint-plugin-twenty node modules
uses: actions/cache@v3
with:
path: packages/twenty-eslint-plugin/node_modules
key: twenty-eslint-plugin-node_modules-${{hashFiles('packages/twenty-eslint-plugin/yarn.lock')}}
restore-keys: twenty-eslint-plugin-node_modules-
path: packages/eslint-plugin-twenty/node_modules
key: eslint-plugin-twenty-node_modules-${{hashFiles('packages/eslint-plugin-twenty/yarn.lock')}}
restore-keys: eslint-plugin-twenty-node_modules-
- name: Install dependencies
run: yarn
- name: Install Playwright
Expand Down Expand Up @@ -100,12 +100,12 @@ jobs:
path: front/node_modules
key: front-node_modules-${{hashFiles('front/yarn.lock')}}
restore-keys: front-node_modules-
- name: Cache twenty-eslint-plugin node modules
- name: Cache eslint-plugin-twenty node modules
uses: actions/cache@v3
with:
path: packages/twenty-eslint-plugin/node_modules
key: twenty-eslint-plugin-node_modules-${{hashFiles('packages/twenty-eslint-plugin/yarn.lock')}}
restore-keys: twenty-eslint-plugin-node_modules-
path: packages/eslint-plugin-twenty/node_modules
key: eslint-plugin-twenty-node_modules-${{hashFiles('packages/eslint-plugin-twenty/yarn.lock')}}
restore-keys: eslint-plugin-twenty-node_modules-
- name: Install Playwright
run: cd front && npx playwright install
- name: Build Storybook
Expand Down Expand Up @@ -136,12 +136,12 @@ jobs:
path: front/node_modules
key: front-node_modules-${{hashFiles('front/yarn.lock')}}
restore-keys: front-node_modules-
- name: Cache twenty-eslint-plugin node modules
- name: Cache eslint-plugin-twenty node modules
uses: actions/cache@v3
with:
path: packages/twenty-eslint-plugin/node_modules
key: twenty-eslint-plugin-node_modules-${{hashFiles('packages/twenty-eslint-plugin/yarn.lock')}}
restore-keys: twenty-eslint-plugin-node_modules-
path: packages/eslint-plugin-twenty/node_modules
key: eslint-plugin-twenty-node_modules-${{hashFiles('packages/eslint-plugin-twenty/yarn.lock')}}
restore-keys: eslint-plugin-twenty-node_modules-
- name: Front / Install Dependencies
run: cd front && yarn
- name: Front / Run linter
Expand All @@ -167,11 +167,11 @@ jobs:
path: front/node_modules
key: front-node_modules-${{hashFiles('front/yarn.lock')}}
restore-keys: front-node_modules-
- name: Cache twenty-eslint-plugin node modules
- name: Cache eslint-plugin-twenty node modules
uses: actions/cache@v3
with:
path: packages/twenty-eslint-plugin/node_modules
key: twenty-eslint-plugin-node_modules-${{hashFiles('packages/twenty-eslint-plugin/yarn.lock')}}
restore-keys: twenty-eslint-plugin-node_modules-
path: packages/eslint-plugin-twenty/node_modules
key: eslint-plugin-twenty-node_modules-${{hashFiles('packages/eslint-plugin-twenty/yarn.lock')}}
restore-keys: eslint-plugin-twenty-node_modules-
- name: Front / Run jest
run: cd front && yarn test
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "AGPL-3.0",
"workspaces": {
"packages": [
"packages/twenty-eslint-plugin",
"packages/eslint-plugin-twenty",
"packages/twenty-front",
"packages/twenty-docs",
"packages/twenty-server"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "twenty-eslint-plugin",
"name": "eslint-plugin-twenty",
"version": "1.0.3",
"description": "",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-docker/dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
volumes:
- ../../../packages/twenty-front:/app/packages/twenty-front
- ../../../packages/twenty-server:/app/packages/twenty-server
- ../../../packages/twenty-eslint-plugin:/app/packages/twenty-eslint-plugin
- ../../../packages/eslint-plugin-twenty:/app/packages/eslint-plugin-twenty
- twenty_dev_node_modules_root:/app/node_modules
- twenty_dev_node_modules_yarn:/app/.yarn
- twenty_dev_node_modules_front:/app/packages/twenty-front/node_modules
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-docker/dev/twenty-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY ../../../../.yarnrc.yml .
COPY ../../../packages/twenty-front/package.json /app/packages/twenty-front/package.json
COPY ../../../packages/twenty-server/package.json /app/packages/twenty-server/package.json
COPY ../../../packages/twenty-server/patches /app/packages/twenty-server/patches
COPY ../../../packages/twenty-eslint-plugin/package.json /app/packages/twenty-eslint-plugin/package.json
COPY ../../../packages/eslint-plugin-twenty/package.json /app/packages/eslint-plugin-twenty/package.json

RUN corepack enable
RUN yarn set version 4.0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ twenty
└───twenty-front // contains the frontend code for the application
└───twenty-server // contains the backend code for the application
└───twenty-docker // contains docker configurations for development and production build
└───many other packages your are invited to discover such as twenty-docs, twenty-ui, twenty-eslint-plugin, twenty-zapier...
└───many other packages your are invited to discover such as twenty-docs, twenty-ui, eslint-plugin-twenty, twenty-zapier...
```

## IDE Setup
Expand Down
4 changes: 2 additions & 2 deletions packages/twenty-front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "tsc && vite build && yarn build:inject-runtime-env",
"build:inject-runtime-env": "./scripts/inject-runtime-env.sh",
"preview": "vite preview",
"eslint-plugin:setup": "cd ../packages/twenty-eslint-plugin/ && yarn && yarn build && cd ../../front/ && yarn upgrade twenty-eslint-plugin",
"eslint-plugin:setup": "cd ../packages/eslint-plugin-twenty/ && yarn && yarn build && cd ../../front/ && yarn upgrade eslint-plugin-twenty",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"fmt:fix": "prettier --cache --write \"src/**/*.ts\" \"src/**/*.tsx\"",
"fmt": "prettier --check \"src/**/*.ts\" \"src/**/*.tsx\"",
Expand Down Expand Up @@ -140,6 +140,7 @@
"eslint-plugin-react-refresh": "^0.4.4",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-storybook": "^0.6.15",
"eslint-plugin-twenty": "file:../eslint-plugin-twenty",
"eslint-plugin-unused-imports": "^3.0.0",
"http-server": "^14.1.1",
"jest": "29.7.0",
Expand All @@ -150,7 +151,6 @@
"storybook": "^7.6.3",
"storybook-addon-cookie": "^3.1.0",
"storybook-addon-pseudo-states": "^2.1.2",
"twenty-eslint-plugin": "file:../twenty-eslint-plugin",
"typescript": "^5.2.2",
"vite": "^5.0.0",
"vite-plugin-svgr": "^4.2.0"
Expand Down
4 changes: 0 additions & 4 deletions packages/twenty-server/.vscode/settings.json

This file was deleted.

68 changes: 34 additions & 34 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18955,6 +18955,39 @@ __metadata:
languageName: node
linkType: hard

"eslint-plugin-twenty@file:../eslint-plugin-twenty::locator=twenty-front%40workspace%3Apackages%2Ftwenty-front":
version: 1.0.3
resolution: "eslint-plugin-twenty@file:../eslint-plugin-twenty#../eslint-plugin-twenty::hash=8c2438&locator=twenty-front%40workspace%3Apackages%2Ftwenty-front"
checksum: f8fcae09e4d1434abf95a36a716f54772b42c84a3638fbcf53df745045bf336cf32016c02880ad3bc738fe1e1a4d68d7fe98917ec4fce7d4bf1a37ae39530ec2
languageName: node
linkType: hard

"eslint-plugin-twenty@workspace:packages/eslint-plugin-twenty":
version: 0.0.0-use.local
resolution: "eslint-plugin-twenty@workspace:packages/eslint-plugin-twenty"
dependencies:
"@types/jest": "npm:^29.5.4"
"@typescript-eslint/eslint-plugin": "npm:^6.7.0"
"@typescript-eslint/parser": "npm:^6.7.0"
"@typescript-eslint/rule-tester": "npm:^6.7.0"
"@typescript-eslint/utils": "npm:^6.7.0"
eslint: "npm:^8.49.0"
eslint-config-prettier: "npm:^9.0.0"
eslint-config-standard-with-typescript: "npm:^39.0.0"
eslint-plugin-import: "npm:^2.28.1"
eslint-plugin-prefer-arrow: "npm:^1.2.3"
eslint-plugin-prettier: "npm:^5.0.0"
eslint-plugin-simple-import-sort: "npm:^10.0.0"
eslint-plugin-unused-imports: "npm:^3.0.0"
jest: "npm:^28.1.3"
postcss: "npm:^8.4.29"
prettier: "npm:^3.0.3"
ts-jest: "npm:^29.1.1"
ts-node: "npm:^10.9.1"
typescript: "npm:^5.2.2"
languageName: unknown
linkType: soft

"eslint-plugin-unused-imports@npm:^3.0.0":
version: 3.0.0
resolution: "eslint-plugin-unused-imports@npm:3.0.0"
Expand Down Expand Up @@ -33915,39 +33948,6 @@ __metadata:
languageName: unknown
linkType: soft

"twenty-eslint-plugin@file:../twenty-eslint-plugin::locator=twenty-front%40workspace%3Apackages%2Ftwenty-front":
version: 1.0.3
resolution: "twenty-eslint-plugin@file:../twenty-eslint-plugin#../twenty-eslint-plugin::hash=028e48&locator=twenty-front%40workspace%3Apackages%2Ftwenty-front"
checksum: 4a97c00ebdc4c6c474acdf1994441c89936f82490122ec5d2018a87543b230fa3a64853e5a9aff37ab0cc33a029a6c5e4375a9f79faf9d9da976e484c7b4540d
languageName: node
linkType: hard

"twenty-eslint-plugin@workspace:packages/twenty-eslint-plugin":
version: 0.0.0-use.local
resolution: "twenty-eslint-plugin@workspace:packages/twenty-eslint-plugin"
dependencies:
"@types/jest": "npm:^29.5.4"
"@typescript-eslint/eslint-plugin": "npm:^6.7.0"
"@typescript-eslint/parser": "npm:^6.7.0"
"@typescript-eslint/rule-tester": "npm:^6.7.0"
"@typescript-eslint/utils": "npm:^6.7.0"
eslint: "npm:^8.49.0"
eslint-config-prettier: "npm:^9.0.0"
eslint-config-standard-with-typescript: "npm:^39.0.0"
eslint-plugin-import: "npm:^2.28.1"
eslint-plugin-prefer-arrow: "npm:^1.2.3"
eslint-plugin-prettier: "npm:^5.0.0"
eslint-plugin-simple-import-sort: "npm:^10.0.0"
eslint-plugin-unused-imports: "npm:^3.0.0"
jest: "npm:^28.1.3"
postcss: "npm:^8.4.29"
prettier: "npm:^3.0.3"
ts-jest: "npm:^29.1.1"
ts-node: "npm:^10.9.1"
typescript: "npm:^5.2.2"
languageName: unknown
linkType: soft

"twenty-front@workspace:packages/twenty-front":
version: 0.0.0-use.local
resolution: "twenty-front@workspace:packages/twenty-front"
Expand Down Expand Up @@ -34021,6 +34021,7 @@ __metadata:
eslint-plugin-react-refresh: "npm:^0.4.4"
eslint-plugin-simple-import-sort: "npm:^10.0.0"
eslint-plugin-storybook: "npm:^0.6.15"
eslint-plugin-twenty: "file:../eslint-plugin-twenty"
eslint-plugin-unused-imports: "npm:^3.0.0"
framer-motion: "npm:^10.12.17"
graphql: "npm:^16.6.0"
Expand Down Expand Up @@ -34062,7 +34063,6 @@ __metadata:
storybook-addon-cookie: "npm:^3.1.0"
storybook-addon-pseudo-states: "npm:^2.1.2"
ts-key-enum: "npm:^2.0.12"
twenty-eslint-plugin: "file:../twenty-eslint-plugin"
type-fest: "npm:^4.1.0"
typescript: "npm:^5.2.2"
uuid: "npm:^9.0.0"
Expand Down
Loading