Skip to content

Commit 875df9f

Browse files
authored
Merge branch 'main' into master
2 parents 8fcc243 + bb5ff8d commit 875df9f

29 files changed

+17961
-68473
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
# Initializes the CodeQL tools for scanning.
3030
- name: Initialize CodeQL
31-
uses: github/codeql-action/init@v1
31+
uses: github/codeql-action/init@v2
3232
with:
3333
languages: ${{ matrix.language }}
3434
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -39,7 +39,7 @@ jobs:
3939
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4040
# If this step fails, then you should remove it and run the build manually (see below)
4141
- name: Autobuild
42-
uses: github/codeql-action/autobuild@v1
42+
uses: github/codeql-action/autobuild@v2
4343

4444
# ℹ️ Command-line programs to run using the OS shell.
4545
# 📚 https://git.io/JvXDl
@@ -53,4 +53,4 @@ jobs:
5353
# make release
5454

5555
- name: Perform CodeQL Analysis
56-
uses: github/codeql-action/analyze@v1
56+
uses: github/codeql-action/analyze@v2

.github/workflows/test.yml

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,72 +17,49 @@ jobs:
1717
os: [windows-latest, ubuntu-latest]
1818

1919
steps:
20-
- uses: actions/checkout@master
20+
- uses: actions/checkout@v3
2121

22-
- name: Get yarn cache directory path
23-
id: yarn-cache-dir-path
24-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
22+
- run: corepack enable
2523

26-
- uses: actions/cache@v2
27-
id: cache
24+
- uses: actions/setup-node@v3
2825
with:
29-
path: |
30-
node_modules
31-
${{ steps.yarn-cache-dir-path.outputs.dir }}
32-
.yarn/*
33-
!.yarn/releases
34-
!.yarn/plugins
35-
!.yarn/sdks
36-
!.yarn/versions
37-
key: yarn-${{ runner.os }}-node-v${{ matrix.node }}-nuxt-${{ matrix.nuxt }}-${{ hashFiles('**/yarn.lock') }}
38-
restore-keys: |
39-
${{ runner.os }}-node-v${{ matrix.node }}-yarn
40-
${{ runner.os }}-yarn
26+
node-version: "14"
27+
cache: "pnpm"
4128

4229
- name: Install dependencies
43-
if: steps.cache.outputs.cache-hit != 'true'
44-
run: yarn && yarn workspace nuxt-typed-vuex add nuxt@${{ matrix.nuxt }}
30+
run: pnpm install --frozen-lockfile
4531

46-
- name: Install dependencies
47-
if: steps.cache.outputs.cache-hit != 'true'
48-
run: yarn add @babel/preset-env@~7.12.17
32+
- name: Add nuxt
33+
run: pnpm i nuxt@${{ matrix.nuxt }}
34+
working-directory: packages/nuxt-typed-vuex
35+
36+
- name: Build
37+
run: pnpm build
4938

50-
- name: Test project
51-
run: yarn build && yarn test
39+
- name: Test
40+
run: pnpm test
5241

5342
latest:
5443
runs-on: ubuntu-latest
5544

5645
steps:
57-
- uses: actions/checkout@master
46+
- uses: actions/checkout@v3
5847

59-
- name: Get yarn cache directory path
60-
id: yarn-cache-dir-path
61-
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
48+
- run: corepack enable
6249

63-
- uses: actions/cache@v2
64-
id: cache
50+
- uses: actions/setup-node@v3
6551
with:
66-
path: |
67-
node_modules
68-
${{ steps.yarn-cache-dir-path.outputs.dir }}
69-
.yarn/*
70-
!.yarn/releases
71-
!.yarn/plugins
72-
!.yarn/sdks
73-
!.yarn/versions
74-
key: yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
75-
restore-keys: |
76-
${{ runner.os }}-yarn
52+
node-version: "14"
53+
cache: "pnpm"
7754

7855
- name: Install dependencies
79-
if: steps.cache.outputs.cache-hit != 'true'
80-
run: yarn
56+
run: pnpm install --frozen-lockfile
57+
58+
- name: Build
59+
run: pnpm build
8160

82-
- name: Test project
83-
run: yarn build && yarn test
61+
- name: Test
62+
run: pnpm test
8463

8564
- name: Coverage
86-
run: yarn codecov
87-
env:
88-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
65+
uses: codecov/codecov-action@v3

.husky/commit-msg

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

4-
yarn commitlint --edit $1
4+
npx commitlint --edit $1

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shamefully-hoist=true

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 0 additions & 77 deletions
This file was deleted.

.yarn/releases/yarn-3.0.0-rc.6.cjs

Lines changed: 0 additions & 615 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"private": true,
33
"scripts": {
4-
"dev": "npx nuxt dev",
5-
"generate": "npx nuxt generate",
6-
"now-build": "yarn generate"
4+
"dev": "nuxt dev",
5+
"now-build": "nuxt generate"
76
},
87
"devDependencies": {
9-
"docus": "0.5.6"
8+
"docus": "0.5.6",
9+
"nuxt-i18n": "6.27.0"
1010
}
1111
}

0 commit comments

Comments
 (0)