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 --- package.json | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 66102f1809..b186e221fd 100644 --- a/package.json +++ b/package.json @@ -6,32 +6,42 @@ "type": "git", "url": "https://github.com/misskey-dev/misskey.git" }, + "packageManager": "yarn@3.2.1", + "workspaces": [ + "packages/client", + "packages/backend", + "packages/sw" + ], "private": true, "scripts": { - "postinstall": "node ./scripts/install-packages.js", - "build": "node ./scripts/build.js", + "build": "yarn workspaces foreach run build && yarn run gulp", "start": "cd packages/backend && node ./built/boot/index.js", "start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/index.js", - "init": "npm run migrate", + "init": "yarn migrate", "migrate": "cd packages/backend && npx typeorm migration:run -d ormconfig.js", - "migrateandstart": "npm run migrate && npm run start", + "migrateandstart": "yarn migrate && yarn start", "gulp": "gulp build", - "watch": "npm run dev", + "watch": "yarn dev", "dev": "node ./scripts/dev.js", - "lint": "node ./scripts/lint.js", + "lint": "yarn workspaces foreach run lint", "cy:open": "cypress open --browser --e2e --config-file=cypress.config.ts", "cy:run": "cypress run", "e2e": "start-server-and-test start:test http://localhost:61812 cy:run", "jest": "cd packages/backend && cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --runInBand", "jest-and-coverage": "cd packages/backend && cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --runInBand", - "test": "npm run jest", - "test-and-coverage": "npm run jest-and-coverage", + "test": "yarn jest", + "test-and-coverage": "yarn jest-and-coverage", "format": "gulp format", "clean": "node ./scripts/clean.js", "clean-all": "node ./scripts/clean-all.js", - "cleanall": "npm run clean-all" + "cleanall": "yarn clean-all" + }, + "resolutions": { + "chokidar": "^3.3.1", + "lodash": "^4.17.21" }, "dependencies": { + "eslint": "^8.16.0", "execa": "5.1.1", "gulp": "4.0.2", "gulp-cssnano": "2.1.3", @@ -43,6 +53,7 @@ "devDependencies": { "@types/gulp": "4.0.10", "@types/gulp-rename": "2.0.1", + "@typescript-eslint/eslint-plugin": "latest", "@typescript-eslint/parser": "5.43.0", "cross-env": "7.0.3", "cypress": "11.1.0", -- cgit v1.2.3-freya