From bdbc448d1347b962c703eea8de3fe5fe66625492 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter <44733677+ThatOneCalculator@users.noreply.github.com> Date: Wed, 23 Nov 2022 22:39:00 -0800 Subject: refactor: migrate to Yarn Berry (v3.2.1) (#8764) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Yarn berry * Add `.yarn` to dockerignore * Mention in CHANGELOG * Update Dockerfile * Proper upgrade to yarn * use `"packageManager"` * Replace `install-packages.js` with workspaces * Replace `install-packages.js` with workspaces * Typo * `corepack enable` for linting * Remove `packages/*/yarn.lock` * Improve lint workflow * Update .github/workflows/lint.yml Co-authored-by: Acid Chicken (硫酸鶏) * Update .github/workflows/lint.yml Co-authored-by: Acid Chicken (硫酸鶏) * Add `eslint` * Regenerate yarn.lock * 🙏‍ * Update lint.yml :thinking: * Fix workflow! * yarn lint my beloved * corepack enable for mocha/e2e * Update CHANGELOG.md * fix the code that depends on node_modules * tbh * tbh * More yarn workspaces stuff * 🍀 * Change `browser-image-resizer` * :finnadie: * :goberserk: * :godmode: * Remove yarnrc for workspaces * 🙏 * Add proper packages for eslint * Skip extra install * New steps for test.yml too * uhh * Update .dockerignore * Update lint.yml * Update test.yml * Make client/backend lints seperate workflows * package.json names * pnpm = dont change paths * Fix changelog * :bowtie: * I don't know why github workflows hates me... * test * ????? * continue-on-error: true * Fix yarn.lock Co-authored-by: ishowta * add @rollup/pluginutils * add packageExtensions for chartjs_date-fns Co-authored-by: acid-chicken * npm run => yarn * wip * yarn node => node 依存関係の記載不足の解消がかなり多いため、yarn nodeは使わない * fix * fix http-signature * fix * fix * add packageExtensions * :v: * remove `yarn set version berry` * yarn install --immutable Co-authored-by: ishowta * https://github.com/misskey-dev/misskey/pull/8764#discussion_r885749892 * enable actions/setup-node's global cache * Update .gitignore Co-authored-by: iwata * revival gulp build https://github.com/misskey-dev/misskey/pull/8764/files/66ab7591bff9b35255219057e33399a06260aa31#r885899944 * fix lockfile * Update packages/backend/package.json Co-authored-by: iwata * remove packagemanager * `yarn run gulp` in `build` instead of just `gulp` * Update CHANGELOG.md * update lockfile * Add .yarn/cache to gitignore for packages * ? * move resolutions * :v: * update lockfie * update-lockfile * update yarn.lock * fix build * fix * fix * fix: add @tensorflow/tfjs * ダメ * modify lockfile * use yarnrc * update yarnlock * add jest-mock * update-lockfile * update lockfile * update lockfile * move jest-mock, update lockfile Co-authored-by: Acid Chicken (硫酸鶏) Co-authored-by: tamaina Co-authored-by: ishowta --- scripts/build.js | 35 ----------------------------------- scripts/dev.js | 18 +++++++++--------- scripts/install-packages.js | 27 --------------------------- scripts/lint.js | 24 ------------------------ 4 files changed, 9 insertions(+), 95 deletions(-) delete mode 100644 scripts/build.js delete mode 100644 scripts/install-packages.js delete mode 100644 scripts/lint.js (limited to 'scripts') diff --git a/scripts/build.js b/scripts/build.js deleted file mode 100644 index 608648b953..0000000000 --- a/scripts/build.js +++ /dev/null @@ -1,35 +0,0 @@ -const execa = require('execa'); - -(async () => { - console.log('building packages/backend ...'); - - await execa('npm', ['run', 'build'], { - cwd: __dirname + '/../packages/backend', - stdout: process.stdout, - stderr: process.stderr, - }); - - console.log('building packages/client ...'); - - await execa('npm', ['run', 'build'], { - cwd: __dirname + '/../packages/client', - stdout: process.stdout, - stderr: process.stderr, - }); - - console.log('building packages/sw ...'); - - await execa('npm', ['run', 'build'], { - cwd: __dirname + '/../packages/sw', - stdout: process.stdout, - stderr: process.stderr, - }); - - console.log('build finishing ...'); - - await execa('npm', ['run', 'gulp'], { - cwd: __dirname + '/../', - stdout: process.stdout, - stderr: process.stderr, - }); -})(); diff --git a/scripts/dev.js b/scripts/dev.js index c5dbb7b35a..b0fe12ee30 100644 --- a/scripts/dev.js +++ b/scripts/dev.js @@ -1,39 +1,39 @@ const execa = require('execa'); (async () => { - await execa('npm', ['run', 'clean'], { + await execa('yarn', ['clean'], { cwd: __dirname + '/../', stdout: process.stdout, stderr: process.stderr, }); - execa('npx', ['gulp', 'watch'], { + execa('yarn', ['dlx', 'gulp', 'watch'], { cwd: __dirname + '/../', stdout: process.stdout, stderr: process.stderr, }); - execa('npm', ['run', 'watch'], { - cwd: __dirname + '/../packages/backend', + execa('yarn', ['workspace', 'backend', 'watch'], { + cwd: __dirname + '/../', stdout: process.stdout, stderr: process.stderr, }); - execa('npm', ['run', 'watch'], { - cwd: __dirname + '/../packages/client', + execa('yarn', ['workspace', 'client', 'watch'], { + cwd: __dirname + '/../', stdout: process.stdout, stderr: process.stderr, }); - execa('npm', ['run', 'watch'], { - cwd: __dirname + '/../packages/sw', + execa('yarn', ['workspace', 'sw', 'watch'], { + cwd: __dirname + '/../', stdout: process.stdout, stderr: process.stderr, }); const start = async () => { try { - await execa('npm', ['run', 'start'], { + await execa('yarn', ['start'], { cwd: __dirname + '/../', stdout: process.stdout, stderr: process.stderr, diff --git a/scripts/install-packages.js b/scripts/install-packages.js deleted file mode 100644 index d1dea3ebe5..0000000000 --- a/scripts/install-packages.js +++ /dev/null @@ -1,27 +0,0 @@ -const execa = require('execa'); - -(async () => { - console.log('installing dependencies of packages/backend ...'); - - await execa('yarn', ['--force', 'install'], { - cwd: __dirname + '/../packages/backend', - stdout: process.stdout, - stderr: process.stderr, - }); - - console.log('installing dependencies of packages/client ...'); - - await execa('yarn', ['install'], { - cwd: __dirname + '/../packages/client', - stdout: process.stdout, - stderr: process.stderr, - }); - - console.log('installing dependencies of packages/sw ...'); - - await execa('yarn', ['install'], { - cwd: __dirname + '/../packages/sw', - stdout: process.stdout, - stderr: process.stderr, - }); -})(); diff --git a/scripts/lint.js b/scripts/lint.js deleted file mode 100644 index 72a63f4ba3..0000000000 --- a/scripts/lint.js +++ /dev/null @@ -1,24 +0,0 @@ -const execa = require('execa'); - -(async () => { - console.log('linting packages/backend ...'); - await execa('npm', ['run', 'lint'], { - cwd: __dirname + '/../packages/backend', - stdout: process.stdout, - stderr: process.stderr, - }); - - console.log('linting packages/client ...'); - await execa('npm', ['run', 'lint'], { - cwd: __dirname + '/../packages/client', - stdout: process.stdout, - stderr: process.stderr, - }); - - console.log('linting packages/sw ...'); - await execa('npm', ['run', 'lint'], { - cwd: __dirname + '/../packages/sw', - stdout: process.stdout, - stderr: process.stderr, - }); -})(); -- cgit v1.2.3-freya