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

Deployment #3175

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
26b5841
use yarn workspaces, move frontend to /apps
elbotho Dec 5, 2023
8c0c53e
prettier
elbotho Dec 5, 2023
69c1522
check actions
elbotho Dec 5, 2023
9fe24f2
move scripts
elbotho Dec 5, 2023
ecfec37
try bundle analyzer with yarn build
elbotho Dec 5, 2023
6708692
switch readmes
elbotho Dec 5, 2023
c16179a
generate prisma before lint
Entkenntnis Dec 5, 2023
e4c6532
overwrite output directory
elbotho Dec 5, 2023
e3f2c13
Merge branch 'yarn-workspaces' of https://github.com/serlo/frontend i…
elbotho Dec 5, 2023
c51ce16
Merge branch 'staging' into yarn-workspaces
elbotho Dec 5, 2023
2c1fe12
cleanup merge
elbotho Dec 5, 2023
e95421c
Merge branch 'staging' into yarn-workspaces
Entkenntnis Dec 5, 2023
9fff2e5
Merge branch 'yarn-workspaces' of https://github.com/serlo/frontend i…
elbotho Dec 5, 2023
8b24c5c
change build command
elbotho Dec 5, 2023
1f7d0b0
deactivate some tests
elbotho Dec 5, 2023
a9d6c84
try fix bundle size
Entkenntnis Dec 5, 2023
52c864f
hack got hackier -_-
Entkenntnis Dec 5, 2023
afe64cd
add prettier to root folder
elbotho Dec 5, 2023
46b89eb
cleanup ignore files
elbotho Dec 5, 2023
5d16af0
move apps/frontend to apps/web
elbotho Dec 5, 2023
f20886e
use frontend readme as main readme again
elbotho Dec 5, 2023
cce4f19
Merge branch 'staging' into yarn-workspaces
elbotho Dec 5, 2023
6492e2b
prettier
elbotho Dec 5, 2023
f580643
try with string
elbotho Dec 5, 2023
49b1ca4
Revert "try with string"
elbotho Dec 5, 2023
1ecc9f0
move tsconfig to package
elbotho Dec 5, 2023
2c2277d
another try
Entkenntnis Dec 5, 2023
7c2db5b
update path for crowdin
elbotho Dec 5, 2023
427f57e
simplify paths
elbotho Dec 5, 2023
76d8c42
fix prettier setup
elbotho Dec 5, 2023
e27384e
fix: client bundle size problem
Entkenntnis Dec 6, 2023
c38f351
fix dependency cycle
Entkenntnis Dec 6, 2023
8040532
Merge branch 'staging' into yarn-workspaces
Entkenntnis Dec 6, 2023
a09fb61
Merge pull request #3174 from serlo/production
Entkenntnis Dec 6, 2023
baa21e1
assign type to fix ts error in IDE
elbotho Dec 6, 2023
f26f08e
Merge pull request #3169 from serlo/yarn-workspaces
elbotho Dec 6, 2023
89f10db
fix logo
elbotho Dec 6, 2023
84103ad
chore(yarn): commit next arm64 specific files
hejtful Dec 6, 2023
5a3c61f
feat(editor): remove fill-in-the-blanks and reset exercise
hejtful Dec 6, 2023
66395e9
add prisma commands to workspace
Entkenntnis Dec 7, 2023
6ec277f
Merge pull request #3181 from serlo/3179-update-prisma-setup-for-work…
Entkenntnis Dec 7, 2023
5dd6569
Merge pull request #3178 from serlo/feat/remove-fill-in-the-blanks
hejtful Dec 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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: echo "ba28ea0a50acdf90223f0ea36add446a857974b5ba6b381e5db2ae4f46b28770 .env" | sha256sum --check --quiet
- run: echo "ba28ea0a50acdf90223f0ea36add446a857974b5ba6b381e5db2ae4f46b28770 apps/web/.env" | sha256sum --check --quiet
production:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: echo "490afcea8853957cd7e19d89c909fb3e2d8c1a74ec24a79f41c5a84add468f57 .env.production" | sha256sum --check --quiet
- run: echo "490afcea8853957cd7e19d89c909fb3e2d8c1a74ec24a79f41c5a84add468f57 apps/web/.env.production" | sha256sum --check --quiet
10 changes: 1 addition & 9 deletions .github/workflows/js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ jobs:
with:
node-version: 18.x
- run: yarn --check-cache
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18.x
- run: yarn
- run: yarn build
eslint:
runs-on: ubuntu-latest
steps:
Expand All @@ -31,6 +22,7 @@ jobs:
with:
node-version: 18.x
- run: yarn
- run: yarn build:prisma
- run: yarn lint:eslint
prettier:
runs-on: ubuntu-latest
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/nextjs_bundle_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,32 +53,32 @@ jobs:
with:
# if you use a custom build directory, replace all instances of `.next` in this file with your build directory
# ex: if your app builds to `dist`, replace `.next` with `dist`
path: .next/cache
path: apps/web/.next/cache
# change this if you prefer a more strict cache
key: ${{ runner.os }}-build-${{ env.cache-name }}

- name: Build next.js app
# change this if your site requires a custom build command
run: ./node_modules/.bin/next build
run: yarn build

# Here's the first place where next-bundle-analysis' own script is used
# This step pulls the raw bundle stats for the current bundle
- name: Analyze bundle
run: npx -p nextjs-bundle-analysis report
run: cd apps/web && npx -p nextjs-bundle-analysis report

- name: Upload bundle
uses: actions/upload-artifact@v3
with:
name: bundle
path: .next/analyze/__bundle_analysis.json
path: apps/web/.next/analyze/__bundle_analysis.json

- name: Download base branch bundle stats
uses: dawidd6/action-download-artifact@v2
if: success() && github.event.number
with:
workflow: nextjs_bundle_analysis.yml
branch: ${{ github.event.pull_request.base.ref }}
path: .next/analyze/base
path: apps/web/.next/analyze/base

# And here's the second place - this runs after we have both the current and
# base branch bundle stats, and will compare them to determine what changed.
Expand All @@ -95,15 +95,15 @@ jobs:
# entry in your package.json file.
- name: Compare with base branch bundle
if: success() && github.event.number
run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
run: ls -laR apps/web/.next/analyze/base && cd apps/web && npx -p nextjs-bundle-analysis compare

- name: Get Comment Body
id: get-comment-body
if: success() && github.event.number
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
run: |
echo "body<<EOF" >> $GITHUB_OUTPUT
echo "$(cat .next/analyze/__bundle_analysis_comment.txt)" >> $GITHUB_OUTPUT
echo "$(cat apps/web/.next/analyze/__bundle_analysis_comment.txt)" >> $GITHUB_OUTPUT
echo EOF >> $GITHUB_OUTPUT

- name: Find Comment
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/repo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Javascript
on:
push:
branches:
- staging
- production
pull_request:
jobs:
prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18.x
- run: yarn
- run: yarn :prettier
19 changes: 9 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
/node_modules
node_modules

# testing
/coverage

# production
/build
/dist
/.next
build
dist
.next

# misc
.DS_Store
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Environment Variables
.env*.local
prisma/.env

.now
.vercel
/.idea
/.vscode
.idea
.vscode
tsconfig.tsbuildinfo

# Yarn
Expand All @@ -35,9 +32,11 @@ tsconfig.tsbuildinfo
!.yarn/releases
!.yarn/sdks
!.yarn/versions
yarn-debug.log*
yarn-error.log*

# asdf-vm
.tool-versions

# nvm
.nvmrc
.nvmrc
22 changes: 3 additions & 19 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
# Third-party

# Transpiled
.next

# Lock files
*.lock

# HTML files
*.html

# Generated files
src/data/*/index.ts
src/fetcher/graphql-types/operations.ts
graphql.schema.json

# Assets
public
# this also checks .gitignore

# Yarn
.yarn/
.yarn
yarn.lock
5 changes: 2 additions & 3 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"semi": false,
"singleQuote": true,
"plugins": ["prettier-plugin-tailwindcss"],
"tailwindFunctions": ["cn"],
"trailingComma": "es5"
"trailingComma": "es5",
"plugins": ["prettier-plugin-packagejson"]
}
Loading