From 09213f9e0789ee2ccdcef33fc989682cb77d0899 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Wed, 19 Oct 2022 20:06:25 +0200 Subject: [PATCH 1/6] remove unnecessary download links GitHub already shows them in a table right below it. --- .github/workflows/prepare-release.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 6dfeb3a84179..04f44e59158e 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -68,13 +68,6 @@ jobs: tag_name: ${{ env.TAG_NAME }} body: | ${{ env.RELEASE_NOTES }} - - * [Linux (arm64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-linux-arm64) - * [Linux (armv7)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-linux-armv7) - * [Linux (x64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-linux-x64) - * [macOS (arm64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-macos-arm64) - * [macOS (x64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-macos-x64) - * [Windows (x64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-windows-x64.exe) files: | standalone-cli/dist/tailwindcss-linux-arm64 standalone-cli/dist/tailwindcss-linux-armv7 From 1c6030c779aef47c40198cc9bb80bfd33dd75f48 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Wed, 19 Oct 2022 20:10:26 +0200 Subject: [PATCH 2/6] detach `npm run style` from `npm run test` --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 0317a3a56d64..67958fa3a598 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ "test": "jest", "test:integrations": "npm run test --prefix ./integrations", "install:integrations": "node scripts/install-integrations.js", - "posttest": "npm run style", "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js", "generate:types": "node -r @swc/register scripts/generate-types.js", "generate": "npm run generate:plugin-list && npm run generate:types", From 205a78476de5de9c80e22d9d0092cef9a027340c Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Wed, 19 Oct 2022 20:16:03 +0200 Subject: [PATCH 3/6] decouple lint from test in workflows Which means that we don't need to do the crazy linking in certain workflows. --- .github/workflows/nodejs.yml | 10 +++++++--- .github/workflows/release-insiders.yml | 12 ++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 25b0f037ef99..776e1595a259 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -48,9 +48,13 @@ jobs: env: CI: true + - name: Lint + run: npm run style + env: + CI: true + - name: Test - run: | - ln -nfs `pwd` node_modules/tailwindcss # So that Prettier can use the local version - npm test + run: npm test env: CI: true + diff --git a/.github/workflows/release-insiders.yml b/.github/workflows/release-insiders.yml index 2e55b18d7053..7b5f78cb8c72 100644 --- a/.github/workflows/release-insiders.yml +++ b/.github/workflows/release-insiders.yml @@ -40,10 +40,8 @@ jobs: env: CI: true - - name: Link and build Tailwind CSS - run: | - npm run swcify - ln -nfs `pwd` node_modules/tailwindcss + - name: Build Tailwind CSS + run: npm run swcify env: CI: true @@ -52,12 +50,6 @@ jobs: env: CI: true - - name: Unlink Tailwind CSS (for prettier) - run: | - unlink node_modules/tailwindcss - env: - CI: true - - name: Resolve version id: vars run: | From 0f6aed241a833ce27219127cf7069c2ce3343479 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Wed, 19 Oct 2022 20:21:24 +0200 Subject: [PATCH 4/6] hoist the `CI` environment variable --- .github/workflows/integration-tests.yml | 7 +++---- .github/workflows/nodejs.yml | 12 +++--------- .github/workflows/release-insiders.yml | 10 +++------- .github/workflows/release.yml | 8 +++----- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 72e943291f29..e44facdc6407 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -9,6 +9,9 @@ on: permissions: contents: read +env: + CI: true + jobs: test: runs-on: ubuntu-latest @@ -47,8 +50,6 @@ jobs: - name: Install dependencies # if: steps.cache-tailwindcss.outputs.cache-hit != 'true' run: npm install - env: - CI: true - name: Build Tailwind CSS run: npm run prepublishOnly @@ -65,8 +66,6 @@ jobs: - name: Install shared dependencies if: steps.cache-integrations.outputs.cache-hit != 'true' run: npm run install:integrations - env: - CI: true - name: Test ${{ matrix.integration }} run: npm test --prefix ./integrations/${{ matrix.integration }} diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 776e1595a259..c4e9f0007950 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -12,6 +12,9 @@ on: permissions: contents: read +env: + CI: true + jobs: build: runs-on: ubuntu-latest @@ -40,21 +43,12 @@ jobs: - name: Install dependencies # if: steps.cache.outputs.cache-hit != 'true' run: npm install - env: - CI: true - name: Build Tailwind CSS run: npm run swcify - env: - CI: true - name: Lint run: npm run style - env: - CI: true - name: Test run: npm test - env: - CI: true - diff --git a/.github/workflows/release-insiders.yml b/.github/workflows/release-insiders.yml index 7b5f78cb8c72..e91173d4a3ba 100644 --- a/.github/workflows/release-insiders.yml +++ b/.github/workflows/release-insiders.yml @@ -7,6 +7,9 @@ on: permissions: contents: read +env: + CI: true + jobs: build: runs-on: ubuntu-latest @@ -37,18 +40,12 @@ jobs: - name: Install dependencies # if: steps.cache.outputs.cache-hit != 'true' run: npm install - env: - CI: true - name: Build Tailwind CSS run: npm run swcify - env: - CI: true - name: Test run: npm test - env: - CI: true - name: Resolve version id: vars @@ -61,7 +58,6 @@ jobs: - name: Publish run: npm publish --tag insiders env: - CI: true NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Trigger Tailwind Play update diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dbd03894a7fd..9b9bca15e4bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,9 @@ on: permissions: contents: read +env: + CI: true + jobs: build: runs-on: ubuntu-latest @@ -37,13 +40,9 @@ jobs: - name: Install dependencies # if: steps.cache.outputs.cache-hit != 'true' run: npm install - env: - CI: true - name: Test run: npm test - env: - CI: true - name: Calculate environment variables run: | @@ -53,7 +52,6 @@ jobs: - name: Publish run: npm publish --tag ${{ env.RELEASE_CHANNEL }} env: - CI: true NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Trigger Tailwind Play update From 4baa63d22d8169548cbbb3beaa04625d1ae829c4 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Thu, 20 Oct 2022 13:44:19 +0200 Subject: [PATCH 5/6] create dedicated `lint` job The `lint` tests will run against source files and should not be dependant on a specific node version. Instead of running the `npm run style` on every node version we use, we can and should only run it once. --- .github/workflows/nodejs.yml | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index c4e9f0007950..9ddd77b8b8ce 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -47,8 +47,36 @@ jobs: - name: Build Tailwind CSS run: npm run swcify - - name: Lint - run: npm run style - - name: Test run: npm test + + lint: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [16] + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + # cache: 'npm' + # + # - name: Use cached node_modules + # id: cache + # uses: actions/cache@v3 + # with: + # path: node_modules + # key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }} + # restore-keys: | + # nodeModules- + + - name: Install dependencies + # if: steps.cache.outputs.cache-hit != 'true' + run: npm install + + - name: Lint + run: npm run style From e8ad7d3fa97e66cc3424d01c41a07713ff54506d Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Thu, 20 Oct 2022 13:51:28 +0200 Subject: [PATCH 6/6] remove `prettier-plugin-tailwindcss` As long as we use older versions of node/npm where we can't have ourselves as a dependency, it is a bit of a mess to maintain properly sorted html in tests. Let's remove it for now until we have a better solution! --- package-lock.json | 20 -------------------- package.json | 1 - 2 files changed, 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 987b1c7984bd..5777e46c493f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,6 @@ "jest": "^28.1.3", "jest-diff": "^28.1.3", "prettier": "^2.7.1", - "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.0", "source-map-js": "^1.0.2" }, @@ -6205,18 +6204,6 @@ "node": ">=6.0.0" } }, - "node_modules/prettier-plugin-tailwindcss": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz", - "integrity": "sha512-/EKQURUrxLu66CMUg4+1LwGdxnz8of7IDvrSLqEtDqhLH61SAlNNUSr90UTvZaemujgl3OH/VHg+fyGltrNixw==", - "dev": true, - "engines": { - "node": ">=12.17.0" - }, - "peerDependencies": { - "prettier": ">=2.2.0" - } - }, "node_modules/pretty-format": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", @@ -11449,13 +11436,6 @@ "fast-diff": "^1.1.2" } }, - "prettier-plugin-tailwindcss": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz", - "integrity": "sha512-/EKQURUrxLu66CMUg4+1LwGdxnz8of7IDvrSLqEtDqhLH61SAlNNUSr90UTvZaemujgl3OH/VHg+fyGltrNixw==", - "dev": true, - "requires": {} - }, "pretty-format": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", diff --git a/package.json b/package.json index 67958fa3a598..ca935aab6d9c 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "jest": "^28.1.3", "jest-diff": "^28.1.3", "prettier": "^2.7.1", - "prettier-plugin-tailwindcss": "^0.1.13", "rimraf": "^3.0.0", "source-map-js": "^1.0.2" },