Skip to content

Commit 1c7fe94

Browse files
SpaceEECSpaceEEC
authored
Merge branch 'main' into patch-1
2 parents dc35b09 + e7cbc1b commit 1c7fe94

File tree

32 files changed

+1235
-1005
lines changed

32 files changed

+1235
-1005
lines changed

‎.github/workflows/documentation.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ jobs:
3838
uses: actions/setup-node@v3
3939
with:
4040
node-version: 16
41-
cache: 'yarn'
4241

4342
- name: Install dependencies
44-
run: yarn --immutable
43+
uses: ./packages/actions/src/yarnCache
4544

4645
- name: Build dependencies
4746
run: yarn build
@@ -81,10 +80,9 @@ jobs:
8180
uses: actions/setup-node@v3
8281
with:
8382
node-version: 16
84-
cache: 'yarn'
8583

8684
- name: Install dependencies
87-
run: yarn --immutable
85+
uses: ./packages/actions/src/yarnCache
8886

8987
- name: Build actions
9088
run: yarn workspace @discordjs/actions build

‎.github/workflows/npm-auto-deprecate.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ jobs:
1616
uses: actions/setup-node@v3
1717
with:
1818
node-version: 16
19-
cache: 'yarn'
2019

2120
- name: Install dependencies
22-
run: yarn --immutable
21+
uses: ./packages/actions/src/yarnCache
2322

2423
- name: Deprecate versions
2524
run: 'yarn npm-deprecate --name "*dev*" --package @discordjs/brokers @discordjs/builders @discordjs/collection discord.js @discordjs/proxy @discordjs/rest @discordjs/util @discordjs/voice @discordjs/ws'

‎.github/workflows/publish-dev.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,9 @@ jobs:
4242
with:
4343
node-version: 16
4444
registry-url: https://registry.npmjs.org/
45-
cache: 'yarn'
4645

4746
- name: Install dependencies
48-
run: yarn --immutable
47+
uses: ./packages/actions/src/yarnCache
4948

5049
- name: Build dependencies
5150
run: yarn build

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ jobs:
2020
uses: actions/setup-node@v3
2121
with:
2222
node-version: 16
23-
cache: 'yarn'
2423

2524
- name: Install dependencies
26-
run: yarn install --immutable
25+
uses: ./packages/actions/src/yarnCache
2726

2827
- name: Build dependencies
2928
run: yarn build

‎apps/guide/package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
},
3535
"homepage": "https://discord.js.org",
3636
"dependencies": {
37-
"@astrojs/image": "^0.9.3",
37+
"@astrojs/image": "^0.10.0",
3838
"@astrojs/mdx": "^0.11.4",
39-
"@astrojs/react": "^1.2.0",
39+
"@astrojs/react": "^1.2.1",
4040
"@code-hike/mdx": "^0.7.4",
4141
"@discordjs/ui": "workspace:^",
4242
"ariakit": "^2.0.0-next.41",
@@ -45,43 +45,43 @@
4545
"react": "^17.0.2",
4646
"react-custom-scrollbars-2": "^4.5.0",
4747
"react-dom": "^17.0.2",
48-
"react-icons": "^4.4.0",
48+
"react-icons": "^4.6.0",
4949
"react-use": "^17.4.0",
5050
"sharp": "^0.31.1",
5151
"shiki": "^0.11.1"
5252
},
5353
"devDependencies": {
54-
"@astrojs/prefetch": "^0.0.8",
54+
"@astrojs/prefetch": "^0.1.0",
5555
"@testing-library/react": "^13.4.0",
5656
"@testing-library/user-event": "^14.4.3",
57-
"@types/node": "16.11.64",
57+
"@types/node": "16.11.68",
5858
"@types/react": "^17.0.50",
5959
"@types/react-dom": "^17.0.17",
6060
"@types/react-syntax-highlighter": "^15.5.5",
61-
"@unocss/cli": "^0.45.29",
62-
"@unocss/reset": "^0.45.29",
61+
"@unocss/cli": "^0.45.30",
62+
"@unocss/reset": "^0.45.30",
6363
"@vitejs/plugin-react": "^2.1.0",
64-
"@vitest/coverage-c8": "^0.24.1",
65-
"astro": "^1.4.7",
66-
"astro-compress": "^1.0.11",
64+
"@vitest/coverage-c8": "^0.24.3",
65+
"astro": "^1.5.2",
66+
"astro-compress": "^1.0.12",
6767
"astro-critters": "^1.0.5",
6868
"cross-env": "^7.0.3",
6969
"eslint": "^8.25.0",
70-
"eslint-config-neon": "^0.1.38",
70+
"eslint-config-neon": "^0.1.39",
7171
"eslint-formatter-pretty": "^4.1.0",
72-
"happy-dom": "^7.5.6",
72+
"happy-dom": "^7.6.0",
7373
"hast-util-to-string": "^2.0.0",
7474
"hastscript": "^7.1.0",
7575
"html-escaper": "^3.0.3",
7676
"prettier": "^2.7.1",
77-
"prettier-plugin-astro": "^0.5.5",
77+
"prettier-plugin-astro": "^0.6.0",
7878
"prettier-plugin-tailwindcss": "^0.1.13",
7979
"rehype-autolink-headings": "^6.1.1",
8080
"rehype-slug": "^5.0.1",
8181
"typescript": "^4.8.4",
82-
"unocss": "^0.45.29",
83-
"vercel": "^28.4.9",
84-
"vitest": "^0.24.1"
82+
"unocss": "^0.45.30",
83+
"vercel": "^28.4.12",
84+
"vitest": "^0.24.3"
8585
},
8686
"engines": {
8787
"node": ">=16.9.0"

‎apps/website/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@discordjs/ui": "workspace:^",
4646
"@microsoft/api-extractor-model": "7.24.0",
4747
"@microsoft/tsdoc": "0.14.1",
48-
"@vercel/og": "^0.0.15",
48+
"@vercel/og": "^0.0.19",
4949
"@vscode/codicons": "^0.0.32",
5050
"ariakit": "^2.0.0-next.41",
5151
"cmdk": "^0.1.20",
@@ -57,11 +57,11 @@
5757
"react": "^18.2.0",
5858
"react-custom-scrollbars-2": "^4.5.0",
5959
"react-dom": "^18.2.0",
60-
"react-icons": "^4.4.0",
60+
"react-icons": "^4.6.0",
6161
"react-syntax-highlighter": "^15.5.0",
6262
"react-use": "^17.4.0",
6363
"rehype-ignore": "^1.0.1",
64-
"rehype-pretty-code": "^0.3.2",
64+
"rehype-pretty-code": "^0.4.0",
6565
"rehype-raw": "^6.1.1",
6666
"rehype-slug": "^5.0.1",
6767
"remark-gfm": "^3.0.1",
@@ -72,26 +72,26 @@
7272
"devDependencies": {
7373
"@testing-library/react": "^13.4.0",
7474
"@testing-library/user-event": "^14.4.3",
75-
"@types/node": "16.11.64",
75+
"@types/node": "16.11.68",
7676
"@types/react": "^18.0.21",
7777
"@types/react-dom": "^18.0.6",
7878
"@types/react-syntax-highlighter": "^15.5.5",
79-
"@unocss/cli": "^0.45.29",
80-
"@unocss/reset": "^0.45.29",
79+
"@unocss/cli": "^0.45.30",
80+
"@unocss/reset": "^0.45.30",
8181
"@vitejs/plugin-react": "^2.1.0",
82-
"@vitest/coverage-c8": "^0.24.1",
82+
"@vitest/coverage-c8": "^0.24.3",
8383
"concurrently": "^7.4.0",
8484
"cross-env": "^7.0.3",
8585
"eslint": "^8.25.0",
86-
"eslint-config-neon": "^0.1.38",
86+
"eslint-config-neon": "^0.1.39",
8787
"eslint-formatter-pretty": "^4.1.0",
88-
"happy-dom": "^7.5.6",
88+
"happy-dom": "^7.6.0",
8989
"prettier": "^2.7.1",
9090
"prettier-plugin-tailwindcss": "^0.1.13",
9191
"typescript": "^4.8.4",
92-
"unocss": "^0.45.29",
93-
"vercel": "^28.4.9",
94-
"vitest": "^0.24.1"
92+
"unocss": "^0.45.30",
93+
"vercel": "^28.4.12",
94+
"vitest": "^0.24.3"
9595
},
9696
"engines": {
9797
"node": ">=16.9.0"

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
"husky": "^8.0.1",
4747
"is-ci": "^3.0.1",
4848
"lint-staged": "^13.0.3",
49-
"tsup": "^6.2.3",
49+
"tsup": "^6.3.0",
5050
"turbo": "^1.5.6",
5151
"typescript": "^4.8.4",
52-
"unocss": "^0.45.29",
53-
"vitest": "^0.24.1"
52+
"unocss": "^0.45.30",
53+
"vitest": "^0.24.3"
5454
},
5555
"resolutions": {
5656
"@microsoft/tsdoc-config": "patch:@microsoft/tsdoc-config@npm:0.16.1#.yarn/patches/@microsoft-tsdoc-config-npm-0.16.1-81031b1bbf.patch"

‎packages/actions/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@
4343
"tslib": "^2.4.0"
4444
},
4545
"devDependencies": {
46-
"@types/node": "16.11.64",
47-
"@vitest/coverage-c8": "^0.24.1",
46+
"@types/node": "16.11.68",
47+
"@vitest/coverage-c8": "^0.24.3",
4848
"cross-env": "^7.0.3",
4949
"eslint": "^8.25.0",
50-
"eslint-config-neon": "^0.1.38",
50+
"eslint-config-neon": "^0.1.39",
5151
"eslint-formatter-pretty": "^4.1.0",
5252
"prettier": "^2.7.1",
53-
"tsup": "^6.2.3",
53+
"tsup": "^6.3.0",
5454
"typescript": "^4.8.4",
55-
"vitest": "^0.24.1"
55+
"vitest": "^0.24.3"
5656
},
5757
"engines": {
5858
"node": ">=16.9.0"

‎packages/actions/src/yarnCache/action.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: 'yarn install'
2+
description: 'Run yarn install with node_modules linker and cache enabled'
3+
runs:
4+
using: 'composite'
5+
steps:
6+
- name: Expose yarn config as "$GITHUB_OUTPUT"
7+
id: yarn-config
8+
shell: bash
9+
run: |
10+
echo "CACHE_FOLDER=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
11+
12+
- name: Restore yarn cache
13+
uses: actions/cache@v3
14+
id: yarn-download-cache
15+
with:
16+
path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
17+
key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
18+
restore-keys: |
19+
yarn-download-cache-
20+
21+
- name: Restore yarn install state
22+
id: yarn-install-state-cache
23+
uses: actions/cache@v3
24+
with:
25+
path: .yarn/ci-cache/
26+
key: ${{ runner.os }}-yarn-install-state-cache-${{ hashFiles('yarn.lock', '.yarnrc.yml') }}
27+
28+
- name: Install dependencies
29+
shell: bash
30+
run: |
31+
yarn install --immutable --inline-builds
32+
env:
33+
YARN_ENABLE_GLOBAL_CACHE: 'false'
34+
YARN_NM_MODE: 'hardlinks-local'
35+
YARN_INSTALL_STATE_PATH: .yarn/ci-cache/install-state.gz

‎packages/api-extractor-utils/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
"@microsoft/tsdoc": "0.14.1"
3636
},
3737
"devDependencies": {
38-
"@types/node": "16.11.64",
38+
"@types/node": "16.11.68",
3939
"cross-env": "^7.0.3",
4040
"eslint": "^8.25.0",
41-
"eslint-config-neon": "^0.1.38",
41+
"eslint-config-neon": "^0.1.39",
4242
"eslint-formatter-pretty": "^4.1.0",
4343
"prettier": "^2.7.1",
44-
"tsup": "^6.2.3",
44+
"tsup": "^6.3.0",
4545
"typescript": "^4.8.4"
4646
},
4747
"engines": {

0 commit comments

Comments
 (0)