From 9a05d8ad14cf03ceabd137c5b5c3594792062f1b Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Fri, 26 Jul 2024 17:02:25 +0200 Subject: [PATCH] chore(lint): Make `yarn lint` lint both the FW and CRWRSCA (#11095) --- .github/actions/set-up-job/action.yml | 6 +++--- package.json | 10 +++++++++- yarn.lock | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/actions/set-up-job/action.yml b/.github/actions/set-up-job/action.yml index f7a4eecce262..5722e01d8097 100644 --- a/.github/actions/set-up-job/action.yml +++ b/.github/actions/set-up-job/action.yml @@ -8,7 +8,7 @@ inputs: description: > For some actions, setting up the yarn cache takes longer than it would to just yarn install. required: false - default: true + default: 'true' yarn-install-directory: description: > @@ -19,7 +19,7 @@ inputs: description: > Whether or not to run `yarn build` to build all the framework packages. required: false - default: true + default: 'true' runs: using: composite @@ -53,7 +53,7 @@ runs: working-directory: ${{ inputs.yarn-install-directory }} env: GITHUB_TOKEN: ${{ github.token }} - run: yarn install --inline-builds + run: yarn install --inline-builds && yarn --cwd packages/create-redwood-rsc-app install --inline-builds - name: 🏗️ Build if: inputs.build == 'true' diff --git a/package.json b/package.json index 31660bf266b5..6f54f99ed395 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,13 @@ "clean:prisma": "rimraf node_modules/.prisma/client && node node_modules/@prisma/client/scripts/postinstall.js", "e2e": "node ./tasks/run-e2e", "generate-dependency-graph": "node ./tasks/generateDependencyGraph.mjs", - "lint": "RWJS_CWD=packages/create-redwood-app/templates/ts eslint --config .eslintrc.js --ignore-pattern Routes.jsx --ignore-pattern create-redwood-rsc-app packages", + "install:all": "concurrently -g -c auto -n install:fw \"yarn install\" npm:install:crwrsca", + "install:ci": "concurrently -g -c auto -n install:fw:ci \"yarn install --inline-builds\" npm:install:crwrsca:ci", + "install:crwrsca": "yarn --cwd packages/create-redwood-rsc-app install", + "install:crwrsca:ci": "yarn --cwd packages/create-redwood-rsc-app install --inline-builds", + "lint": "concurrently -c auto npm:lint:fw npm:lint:crwrsca", + "lint:crwrsca": "yarn --cwd packages/create-redwood-rsc-app run lint", + "lint:fw": "cross-env RWJS_CWD=packages/create-redwood-app/templates/ts eslint --config .eslintrc.js --ignore-pattern Routes.jsx --ignore-pattern create-redwood-rsc-app packages", "lint:fix": "yarn lint --fix", "project:copy": "node ./tasks/framework-tools/frameworkFilesToProject.mjs", "project:deps": "node ./tasks/framework-tools/frameworkDepsToProject.mjs", @@ -82,7 +88,9 @@ "babel-plugin-auto-import": "1.1.0", "babel-plugin-remove-code": "0.0.6", "boxen": "5.1.2", + "concurrently": "8.2.2", "core-js": "3.37.1", + "cross-env": "7.0.3", "cypress": "13.13.1", "cypress-fail-fast": "7.1.0", "cypress-wait-until": "3.0.2", diff --git a/yarn.lock b/yarn.lock index 0b796142e749..c1828ffc2d90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26512,7 +26512,9 @@ __metadata: babel-plugin-auto-import: "npm:1.1.0" babel-plugin-remove-code: "npm:0.0.6" boxen: "npm:5.1.2" + concurrently: "npm:8.2.2" core-js: "npm:3.37.1" + cross-env: "npm:7.0.3" cypress: "npm:13.13.1" cypress-fail-fast: "npm:7.1.0" cypress-wait-until: "npm:3.0.2"