Skip to content

Commit 86b6023

Browse files
author
Rajat Saxena
committed
Merge branch 'main' into switch-to-pnpm
2 parents 4692cdc + 3ae1c62 commit 86b6023

329 files changed

Lines changed: 3664 additions & 741 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/code-quality.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ jobs:
99
- uses: actions/setup-node@v1
1010
with:
1111
node-version: '18.x'
12-
- run: npm install -g yarn@2
13-
- run: yarn install
12+
- uses: pnpm/action-setup@v2
13+
with:
14+
version: 8
15+
- run: pnpm install
1416
- name: Linting and prettifying
1517
run: |
16-
yarn lint
17-
yarn prettier
18+
pnpm lint
19+
pnpm prettier
1820
working-directory: ./

.github/workflows/publish-packages.yaml

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,34 @@ jobs:
2525
LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
2626
git checkout $LATEST_TAG
2727
28+
- name: Setup pnpm
29+
uses: pnpm/action-setup@v2
30+
with:
31+
version: 8
32+
2833
- name: Install Packages
29-
run: yarn install
34+
run: pnpm install
3035

3136
- name: Authenticate with Registry
3237
run: |
33-
yarn npm logout
34-
echo "npmAuthToken: $NPM_TOKEN" >> .yarnrc.yml
35-
yarn npm whoami
38+
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc
39+
pnpm whoami
3640
env:
3741
NPM_TOKEN: ${{ secrets.NPM }}
3842

3943
- name: Build packages
4044
run: |
41-
yarn workspace @courselit/icons build
42-
yarn workspace @courselit/common-models build
43-
yarn workspace @courselit/utils build
44-
yarn workspace @courselit/text-editor build
45-
yarn workspace @courselit/state-management build
46-
yarn workspace @courselit/components-library build
47-
yarn workspace @courselit/common-widgets build
45+
pnpm --filter @courselit/icons build
46+
pnpm --filter @courselit/common-models build
47+
pnpm --filter @courselit/utils build
48+
pnpm --filter @courselit/text-editor build
49+
pnpm --filter @courselit/state-management build
50+
pnpm --filter @courselit/components-library build
51+
pnpm --filter @courselit/common-widgets build
4852
4953
- name: Publish package
5054
run: |
51-
yarn publish
55+
pnpm publish
5256
env:
5357
GH_TOKEN: ${{ secrets.PAT }}
5458
GITHUB_TOKEN: ${{ secrets.PAT }}
@@ -81,12 +85,6 @@ jobs:
8185
with:
8286
images: codelit/courselit-app
8387

84-
- name: Docker meta for the proxy
85-
id: metaproxy
86-
uses: docker/metadata-action@v3
87-
with:
88-
images: codelit/courselit-proxy
89-
9088
- name: Docker meta for the queue
9189
id: metaqueue
9290
uses: docker/metadata-action@v3
@@ -105,18 +103,6 @@ jobs:
105103
- name: Image digest
106104
run: echo ${{ steps.docker_build_app.outputs.digest }}
107105

108-
- name: Build and push proxy
109-
id: docker_build_proxy
110-
uses: docker/build-push-action@v2
111-
with:
112-
context: .
113-
file: ./services/proxy/Dockerfile
114-
push: true
115-
tags: ${{ steps.metaproxy.outputs.tags }}
116-
117-
- name: Image digest
118-
run: echo ${{ steps.docker_build_proxy.outputs.digest }}
119-
120106
- name: Build and push queue
121107
id: docker_build_queue
122108
uses: docker/build-push-action@v2

.github/workflows/test.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Testing
2+
on: [push]
3+
4+
jobs:
5+
test:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v2
9+
- uses: actions/setup-node@v1
10+
with:
11+
node-version: '23.x'
12+
- uses: pnpm/action-setup@v2
13+
with:
14+
version: 8
15+
- run: pnpm install
16+
- name: Build packages
17+
run: |
18+
pnpm --filter @courselit/icons build
19+
pnpm --filter @courselit/common-models build
20+
pnpm --filter @courselit/utils build
21+
pnpm --filter @courselit/text-editor build
22+
pnpm --filter @courselit/state-management build
23+
pnpm --filter @courselit/components-library build
24+
pnpm --filter @courselit/common-widgets build
25+
- name: Running tests
26+
run: |
27+
pnpm test
28+
working-directory: ./

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ logs
44
npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
7-
lerna-debug.log*
87

98
# Dependencies
109
node_modules

.husky/pre-commit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
yarn dlx lint-staged
4+
pnpm exec lint-staged
5+
pnpm test
39.2 KB
Binary file not shown.
Binary file not shown.
252 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)