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

Migratetonewyarn&updatedoc #2642

Merged
merged 4 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/core-module.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
name: Core module

on:
pull_request:
branches:
branches:
- draftbot-v5
paths:
- Core/**
Expand All @@ -20,15 +19,22 @@ jobs:
with:
node-version: '18'

# Repeat the caching step and ESLint check for the Core subproject
- name: Setup Yarn
run: |
corepack enable
yarn set version stable

# Cache Yarn dependencies for Core module
- name: Cache Core dependencies
uses: actions/cache@v3
with:
path: ./Core/node_modules
path: |
./Core/.yarn/cache
./Core/.pnp.cjs
key: ${{ runner.os }}-core-dependencies-${{ hashFiles('./Core/yarn.lock') }}

- name: Install dependencies and Run ESLint in Core folder
working-directory: ./Core
run: |
yarn install
yarn install
yarn eslint
16 changes: 12 additions & 4 deletions .github/workflows/discord-module.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Discord module
on:
pull_request:
branches:
branches:
- draftbot-v5
paths:
- Discord/**
Expand All @@ -19,15 +19,23 @@ jobs:
with:
node-version: '18'

# Install and cache dependencies for the Discord subproject
# Setup Yarn
- name: Setup Yarn
run: |
corepack enable
yarn set version stable

# Cache Yarn dependencies for Discord module
- name: Cache Discord dependencies
uses: actions/cache@v3
with:
path: ./Discord/node_modules
path: |
./Discord/.yarn/cache
./Discord/.pnp.cjs
key: ${{ runner.os }}-discord-dependencies-${{ hashFiles('./Discord/yarn.lock') }}

- name: Install dependencies and Run ESLint in Discord folder
working-directory: ./Discord
run: |
yarn install
yarn install
yarn eslint
23 changes: 15 additions & 8 deletions .github/workflows/lib-module.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: Lib module

on:
pull_request:
branches:
branches:
- draftbot-v5
paths:
paths:
- Lib/**

jobs:
Expand All @@ -20,15 +19,23 @@ jobs:
with:
node-version: '18'

# Repeat the caching step and ESLint check for the Lib subproject
- name: Cache Lib dependencies
# Setup Yarn stable
- name: Setup Yarn
run: |
corepack enable
yarn set version stable

# Cache Yarn dependencies
- name: Cache Yarn dependencies
uses: actions/cache@v3
with:
path: ./Lib/node_modules
key: ${{ runner.os }}-lib-dependencies-${{ hashFiles('./Lib/yarn.lock') }}
path: |
./Lib/.yarn/cache
./Lib/.pnp.cjs
key: ${{ runner.os }}-yarn-${{ hashFiles('./Lib/yarn.lock') }}

- name: Install dependencies and Run ESLint in Lib folder
working-directory: ./Lib
run: |
yarn install
yarn install
yarn eslint
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.idea
.run
mqtt5
**/.yarn
**/.yarn
*/.pnp.cjs
*/.pnp.loader.mjs
3 changes: 3 additions & 0 deletions Core/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
enableGlobalCache: false

nodeLinker: pnp
3 changes: 3 additions & 0 deletions Core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "5.0.0",
"description": "Core package of DraftBot which manages the game mechanics",
"main": "src/index.js",
"packageManager": "[email protected]",
"engines": {
"node": ">=18.19.0"
},
Expand All @@ -19,6 +20,7 @@
"dependencies": {
"@types/node": "20.4.8",
"mariadb": "3.0.2",
"moment": "^2.30.1",
"mqtt": "^5.10.1",
"random-js": "^2.1.0",
"sequelize": "6.32.1",
Expand All @@ -27,6 +29,7 @@
"umzug": "3.2.1"
},
"devDependencies": {
"@types/moment": "^2.13.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint": "^8.56.0",
Expand Down
75 changes: 43 additions & 32 deletions Core/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,29 @@ __metadata:
cacheKey: 10c0

"@babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.24.5":
version: 7.25.7
resolution: "@babel/runtime@npm:7.25.7"
version: 7.26.0
resolution: "@babel/runtime@npm:7.26.0"
dependencies:
regenerator-runtime: "npm:^0.14.0"
checksum: 10c0/86b7829d2fc9343714a9afe92757cf96c4dc799006ca61d73cda62f4b9e29bfa1ce36794955bc6cb4c188f5b10db832c949339895e1bbe81a69022d9d578ce29
checksum: 10c0/12c01357e0345f89f4f7e8c0e81921f2a3e3e101f06e8eaa18a382b517376520cd2fa8c237726eb094dab25532855df28a7baaf1c26342b52782f6936b07c287
languageName: node
linkType: hard

"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
version: 4.4.0
resolution: "@eslint-community/eslint-utils@npm:4.4.0"
version: 4.4.1
resolution: "@eslint-community/eslint-utils@npm:4.4.1"
dependencies:
eslint-visitor-keys: "npm:^3.3.0"
eslint-visitor-keys: "npm:^3.4.3"
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
checksum: 10c0/2aa0ac2fc50ff3f234408b10900ed4f1a0b19352f21346ad4cc3d83a1271481bdda11097baa45d484dd564c895e0762a27a8240be7a256b3ad47129e96528252
languageName: node
linkType: hard

"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
version: 4.11.1
resolution: "@eslint-community/regexpp@npm:4.11.1"
checksum: 10c0/fbcc1cb65ef5ed5b92faa8dc542e035269065e7ebcc0b39c81a4fe98ad35cfff20b3c8df048641de15a7757e07d69f85e2579c1a5055f993413ba18c055654f8
version: 4.12.1
resolution: "@eslint-community/regexpp@npm:4.12.1"
checksum: 10c0/a03d98c246bcb9109aec2c08e4d10c8d010256538dcb3f56610191607214523d4fb1b00aa81df830b6dffb74c5fa0be03642513a289c567949d3e550ca11cdf6
languageName: node
linkType: hard

Expand Down Expand Up @@ -186,6 +186,15 @@ __metadata:
languageName: node
linkType: hard

"@types/moment@npm:^2.13.0":
version: 2.13.0
resolution: "@types/moment@npm:2.13.0"
dependencies:
moment: "npm:*"
checksum: 10c0/b9b668ca4b2584daaa03523a28dd26d542fa4da3de3e976242bbd1568dfc01736142118143a69ed26f62de1b49936ab346579a2ce3979410a1bab229d644cccb
languageName: node
linkType: hard

"@types/ms@npm:*":
version: 0.7.34
resolution: "@types/ms@npm:0.7.34"
Expand All @@ -194,11 +203,11 @@ __metadata:
linkType: hard

"@types/node@npm:*":
version: 22.7.6
resolution: "@types/node@npm:22.7.6"
version: 22.8.7
resolution: "@types/node@npm:22.8.7"
dependencies:
undici-types: "npm:~6.19.2"
checksum: 10c0/d4406a63afce981c363fb1d1954aaf1759ad2d487c0833ebf667565ea4e45ff217d6fab4b5343badbdeccdf9d2e4a0841d633e0c929ceabcb33c288663dd0c73
undici-types: "npm:~6.19.8"
checksum: 10c0/14372885db80059ed6e92c320b2bcd8f7dc271698adce11f51aa0f424a3f82aa1749a4f66321b87043791b894346b2458d514cbb65ce70167c2fd8a78a124947
languageName: node
linkType: hard

Expand All @@ -217,12 +226,12 @@ __metadata:
linkType: hard

"@types/readable-stream@npm:^4.0.0, @types/readable-stream@npm:^4.0.5":
version: 4.0.15
resolution: "@types/readable-stream@npm:4.0.15"
version: 4.0.18
resolution: "@types/readable-stream@npm:4.0.18"
dependencies:
"@types/node": "npm:*"
safe-buffer: "npm:~5.1.1"
checksum: 10c0/7424f747dd62e5c0f686a447e891064b1efdce44a7d55304ac4690b4d240ad194481083f0b07419d5e0295c79d81f0db2a677482c50954c1bbc948cbd40d8725
checksum: 10c0/641e0e91b9ecfeed72f7509089f25923e06e19e79ed36f962785c41c07b0c9ecb2ecfdf6d290a101b9b5a669a3b89ee3aff0cad57b66a05e2a30cd199052e3e1
languageName: node
linkType: hard

Expand All @@ -241,11 +250,11 @@ __metadata:
linkType: hard

"@types/ws@npm:^8.5.9":
version: 8.5.12
resolution: "@types/ws@npm:8.5.12"
version: 8.5.13
resolution: "@types/ws@npm:8.5.13"
dependencies:
"@types/node": "npm:*"
checksum: 10c0/3fd77c9e4e05c24ce42bfc7647f7506b08c40a40fe2aea236ef6d4e96fc7cb4006a81ed1b28ec9c457e177a74a72924f4768b7b4652680b42dfd52bc380e15f9
checksum: 10c0/a5430aa479bde588e69cb9175518d72f9338b6999e3b2ae16fc03d3bdcff8347e486dc031e4ed14601260463c07e1f9a0d7511dfc653712b047c439c680b0b34
languageName: node
linkType: hard

Expand Down Expand Up @@ -398,11 +407,11 @@ __metadata:
linkType: hard

"acorn@npm:^8.9.0":
version: 8.13.0
resolution: "acorn@npm:8.13.0"
version: 8.14.0
resolution: "acorn@npm:8.14.0"
bin:
acorn: bin/acorn
checksum: 10c0/f35dd53d68177c90699f4c37d0bb205b8abe036d955d0eb011ddb7f14a81e6fd0f18893731c457c1b5bd96754683f4c3d80d9a5585ddecaa53cdf84e0b3d68f7
checksum: 10c0/6d4ee461a7734b2f48836ee0fbb752903606e576cc100eb49340295129ca0b452f3ba91ddd4424a1d4406a98adfb2ebb6bd0ff4c49d7a0930c10e462719bbfd7
languageName: node
linkType: hard

Expand Down Expand Up @@ -703,12 +712,14 @@ __metadata:
version: 0.0.0-use.local
resolution: "draftbot_core@workspace:."
dependencies:
"@types/moment": "npm:^2.13.0"
"@types/node": "npm:20.4.8"
"@typescript-eslint/eslint-plugin": "npm:^6.21.0"
"@typescript-eslint/parser": "npm:^6.21.0"
eslint: "npm:^8.56.0"
eslint-config-google: "npm:0.14.0"
mariadb: "npm:3.0.2"
moment: "npm:^2.30.1"
mqtt: "npm:^5.10.1"
random-js: "npm:^2.1.0"
sequelize: "npm:6.32.1"
Expand Down Expand Up @@ -753,7 +764,7 @@ __metadata:
languageName: node
linkType: hard

"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
"eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
version: 3.4.3
resolution: "eslint-visitor-keys@npm:3.4.3"
checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
Expand Down Expand Up @@ -1432,7 +1443,7 @@ __metadata:
languageName: node
linkType: hard

"moment@npm:^2.29.4":
"moment@npm:*, moment@npm:^2.29.4, moment@npm:^2.30.1":
version: 2.30.1
resolution: "moment@npm:2.30.1"
checksum: 10c0/865e4279418c6de666fca7786607705fd0189d8a7b7624e2e56be99290ac846f90878a6f602e34b4e0455c549b85385b1baf9966845962b313699e7cb847543a
Expand Down Expand Up @@ -2013,18 +2024,18 @@ __metadata:
linkType: hard

"ts-api-utils@npm:^1.0.1":
version: 1.3.0
resolution: "ts-api-utils@npm:1.3.0"
version: 1.4.0
resolution: "ts-api-utils@npm:1.4.0"
peerDependencies:
typescript: ">=4.2.0"
checksum: 10c0/f54a0ba9ed56ce66baea90a3fa087a484002e807f28a8ccb2d070c75e76bde64bd0f6dce98b3802834156306050871b67eec325cb4e918015a360a3f0868c77c
checksum: 10c0/1b2bfa50ea52771d564bb143bb69010d25cda03ed573095fbac9b86f717012426443af6647e00e3db70fca60360482a30c1be7cf73c3521c321f6bf5e3594ea0
languageName: node
linkType: hard

"tslib@npm:^2.6.2":
version: 2.8.0
resolution: "tslib@npm:2.8.0"
checksum: 10c0/31e4d14dc1355e9b89e4d3c893a18abb7f90b6886b089c2da91224d0a7752c79f3ddc41bc1aa0a588ac895bd97bb99c5bc2bfdb2f86de849f31caeb3ba79bbe5
version: 2.8.1
resolution: "tslib@npm:2.8.1"
checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
languageName: node
linkType: hard

Expand Down Expand Up @@ -2099,7 +2110,7 @@ __metadata:
languageName: node
linkType: hard

"undici-types@npm:~6.19.2":
"undici-types@npm:~6.19.8":
version: 6.19.8
resolution: "undici-types@npm:6.19.8"
checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344
Expand Down
1 change: 1 addition & 0 deletions Discord/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: pnp
3 changes: 3 additions & 0 deletions Discord/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "5.0.0",
"description": "Discord middleware package of DraftBot",
"main": "src/index.js",
"packageManager": "[email protected]",
"engines": {
"node": ">=18.19.0"
},
Expand All @@ -18,8 +19,10 @@
"interface": "i18next-resources-for-ts interface -i ../Lang/en -o ./src/@types/resources.d.ts"
},
"dependencies": {
"@discordjs/builders": "^1.9.0",
"@types/i18next": "^13.0.0",
"@types/node": "20.4.8",
"discord-api-types": "^0.37.103",
"discord.js": "14.16.3",
"i18next": "^23.16.4",
"i18next-resources-for-ts": "^1.4.0",
Expand Down
Loading
Loading