Skip to content

Commit cae3f6a

Browse files
authored
Merge pull request #260 from n0th1ng-else/deps
fix(social): Update social network icons
2 parents 2b5e7db + d9d80fd commit cae3f6a

39 files changed

+8776
-20697
lines changed

.github/workflows/browserlist.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,21 @@ jobs:
1616
run: echo "GH_BASE_BRANCH=${GITHUB_REF_NAME}" >> $GITHUB_ENV
1717

1818
- name: ⬇️ Checkout
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020

2121
- name: Setup NodeJS using the obtained nvm version
22-
uses: actions/setup-node@v3
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version-file: '.nvmrc'
2525

26-
- name: 📖️ Restore cached node_modules
27-
uses: actions/cache@v2
26+
- uses: pnpm/action-setup@v4
2827
with:
29-
path: '**/node_modules'
30-
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
31-
32-
- name: ▶️ Install Dependencies
33-
run: npm ci
28+
version: 9
29+
run_install: |
30+
args: [--frozen-lockfile]
3431
3532
- name: 🚧 Create a branch
36-
uses: peterjgrainger/action-create-branch@v2.0.1
33+
uses: peterjgrainger/action-create-branch@v3
3734
env:
3835
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3936
with:
@@ -43,9 +40,9 @@ jobs:
4340
run: npx browserslist@latest --update-db
4441

4542
- name: 🚧 Push the branch
46-
uses: EndBug/add-and-commit@v7
43+
uses: EndBug/add-and-commit@v9
4744
with:
48-
add: 'package-lock.json'
45+
add: 'pnpm-lock.yaml'
4946
branch: update-browserlist-db
5047
branch_mode: create
5148
# Determines the way the action fills missing author name and email. Three options are available:

.github/workflows/ci.yml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,21 @@ jobs:
1515
version: ${{ steps.version.outputs.version }}
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1919

2020
- name: Setup NodeJS using the obtained nvm version
21-
uses: actions/setup-node@v3
21+
uses: actions/setup-node@v4
2222
with:
2323
node-version-file: '.nvmrc'
2424

25-
- name: Install Dependencies
26-
run: npm ci
25+
- uses: pnpm/action-setup@v4
26+
with:
27+
version: 9
28+
run_install: |
29+
args: [--frozen-lockfile]
2730
2831
- name: Detect new version (and publish in main branch)
29-
run: npm run version
32+
run: pnpm run version
3033
env:
3134
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3235

@@ -48,18 +51,21 @@ jobs:
4851
cmd: [check, lint, 'format:check']
4952
steps:
5053
- name: Checkout
51-
uses: actions/checkout@v2
54+
uses: actions/checkout@v4
5255

5356
- name: Setup NodeJS using the obtained nvm version
54-
uses: actions/setup-node@v3
57+
uses: actions/setup-node@v4
5558
with:
5659
node-version-file: '.nvmrc'
5760

58-
- name: Install Dependencies
59-
run: npm ci
61+
- uses: pnpm/action-setup@v4
62+
with:
63+
version: 9
64+
run_install: |
65+
args: [--frozen-lockfile]
6066
6167
- name: Run ${{ matrix.cmd }}
62-
run: npm run ${{ matrix.cmd }}
68+
run: pnpm run ${{ matrix.cmd }}
6369

6470
docker:
6571
runs-on: ubuntu-latest
@@ -70,23 +76,23 @@ jobs:
7076
run: echo Picked the app version ${{ needs.version.outputs.version }}-${{ github.sha }}
7177

7278
- name: Checkout
73-
uses: actions/checkout@v2.3.4
79+
uses: actions/checkout@v4
7480

7581
- name: Setup NodeJS using the obtained nvm version
76-
uses: actions/setup-node@v3
82+
uses: actions/setup-node@v4
7783
with:
7884
node-version-file: '.nvmrc'
7985

8086
- name: Login to GitHub Container Registry
81-
uses: docker/login-action@v2
87+
uses: docker/login-action@v3
8288
with:
8389
registry: ghcr.io
8490
username: ${{ github.actor }}
8591
password: ${{ secrets.GITHUB_TOKEN }}
8692

8793
- name: Publish to Registry
8894
if: inputs.docker-tag == ''
89-
uses: docker/build-push-action@v3
95+
uses: docker/build-push-action@v6
9096
with:
9197
context: .
9298
push: true
@@ -106,7 +112,7 @@ jobs:
106112
107113
- name: Publish to Registry
108114
if: inputs.docker-tag != ''
109-
uses: docker/build-push-action@v3
115+
uses: docker/build-push-action@v6
110116
with:
111117
context: .
112118
push: true

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.11.0
1+
20.14.0

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package.json
22
package-lock.json
3+
pnpm-lock.yaml
34
.eslintignore
45
meta/
56
dist/

.prettierrc

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
"arrowParens": "avoid",
66
"printWidth": 100,
77
"plugins": ["prettier-plugin-svelte"],
8-
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }],
8+
"overrides": [
9+
{
10+
"files": "*.svelte",
11+
"options": {
12+
"parser": "svelte"
13+
}
14+
},
15+
{
16+
"files": "*.svg",
17+
"options": {
18+
"parser": "html"
19+
}
20+
}
21+
],
922
"svelteStrictMode": true
1023
}

Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20.11.0 as builder
1+
FROM node:20.14-slim as builder
22

33
ENV NODE_ENV production
44

@@ -31,8 +31,10 @@ ENV GH_AUTHOR_TWITTER ${GH_AUTHOR_TWITTER}
3131
ARG GH_AUTHOR_DEVTO
3232
ENV GH_AUTHOR_DEVTO ${GH_AUTHOR_DEVTO}
3333

34-
COPY package.json package-lock.json svelte.config.js $APP_DIR
35-
RUN npm ci --include=dev && npm cache clean --force
34+
RUN npm install -g pnpm@9
35+
COPY package.json pnpm-lock.yaml svelte.config.js $APP_DIR
36+
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile --prod false
37+
3638

3739
COPY . $APP_DIR
3840

@@ -44,13 +46,13 @@ ENV APP_VERSION ${APP_VERSION}
4446

4547
RUN echo ${APP_VERSION} ${COMMIT_HASH}
4648

47-
RUN npm run meta
49+
RUN pnpm meta
4850

49-
RUN npm run build
51+
RUN pnpm build
5052

5153
# Run stage layer
5254

53-
FROM node:20.11.0
55+
FROM node:20.14-slim
5456

5557
ARG APP_DIR=/usr/src/app/
5658

@@ -73,4 +75,4 @@ EXPOSE 8080
7375

7476
USER node
7577

76-
CMD ["npm", "start"]
78+
CMD ["pnpm", "start"]

0 commit comments

Comments
 (0)