Merge next into main

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @tailwindlabs/engineering

.github/CONTRIBUTING.md

@@ -1,34 +1,37 @@
 # Contributing
 
-Thanks for your interest in contributing to Tailwind CSS! Please take a moment to review this document **before submitting a pull request**.
+## Bug fixes
 
-## Pull requests
+If you've found a bug in Tailwind that you'd like to fix, [submit a pull request](https://github.com/tailwindlabs/tailwindcss/pulls) with your changes. Include a helpful description of the problem and how your changes address it, and provide tests so we can verify the fix works as expected.
 
-**Please ask first before starting work on any significant new features.**
+## New features
 
-It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create [a feature request](https://github.com/tailwindlabs/tailwindcss/discussions/new?category=ideas) to first discuss any significant new ideas. This includes things like adding new utilities, creating new at-rules, etc.
+If there's a new feature you'd like to see added to Tailwind, [share your idea with us](https://github.com/tailwindlabs/tailwindcss/discussions/new?category=ideas) in our discussion forum to get it on our radar as something to consider for a future release.
+
+**Please note that we don't often accept pull requests for new features.** Adding a new feature to Tailwind requires us to think through the entire problem ourselves to make sure we agree with the proposed API, which means the feature needs to be high on our own priority list for us to be able to give it the attention it needs.
+
+If you open a pull request for a new feature, we're likely to close it not because it's a bad idea, but because we aren't ready to prioritize the feature and don't want the PR to sit open for months or even years.
 
 ## Coding standards
 
-Our code formatting rules are defined in [.eslintrc](https://github.com/tailwindcss/tailwindcss/blob/master/.eslintrc.json). You can check your code against these standards by running:
+Our code formatting rules are defined in the `"prettier"` section of [package.json](https://github.com/tailwindcss/tailwindcss/blob/next/package.json). You can check your code against these standards by running:
 
 ```sh
-npm run style
+pnpm run lint
 ```
 
 To automatically fix any style violations in your code, you can run:
 
 ```sh
-npm run style -- --fix
+pnpm run format
 ```
 
 ## Running tests
 
 You can run the test suite using the following commands:
 
 ```sh
-npm run build && npm test
+pnpm build && pnpm test
 ```
 
 Please ensure that the tests are passing when submitting a pull request. If you're adding new features to Tailwind, please include tests.
-

.github/workflows/ci.yml

@@ -1,45 +1,58 @@
-name: CI — Oxide
+name: CI
 
 on:
   push:
-    branches: [master, 3.3, 3.4]
+    branches: [next]
   pull_request:
-    branches: [master, 3.3, 3.4]
 
 permissions:
   contents: read
 
-env:
-  CI: true
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-  CACHE_PREFIX: oxide
-
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-
+  tests:
     strategy:
+      fail-fast: false
       matrix:
-        node-version: [18]
+        node-version: [20]
+        runner:
+          - name: Windows
+            os: windows-latest
+
+          - name: Linux
+            os: namespace-profile-default
+
+          - name: macOS
+            os: macos-14
+
+        # Exclude windows and macos from being built on feature branches
+        on-next-branch:
+          - ${{ github.ref == 'refs/heads/next' }}
+        exclude:
+          - on-next-branch: false
+            runner:
+              name: Windows
+          - on-next-branch: false
+            runner:
+              name: macOS
+
+    runs-on: ${{ matrix.runner.os }}
+    timeout-minutes: 30
+
+    name: ${{ matrix.runner.name }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-
-      - name: Cache node_modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-${{ matrix.node-version }}-${{ env.CACHE_PREFIX }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+          cache: 'pnpm'
 
       # Cargo already skips downloading dependencies if they already exist
       - name: Cache cargo
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -51,26 +64,41 @@ jobs:
 
       # Cache the `oxide` Rust build
       - name: Cache oxide build
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
-            ./oxide/target/
-            ./oxide/crates/node/*.node
-            ./oxide/crates/node/index.js
-            ./oxide/crates/node/index.d.ts
-          key: ${{ runner.os }}-oxide-${{ hashFiles('./oxide/crates/**/*') }}
+            ./target/
+            ./crates/node/*.node
+            ./crates/node/index.js
+            ./crates/node/index.d.ts
+          key: ${{ runner.os }}-oxide-${{ hashFiles('./crates/**/*') }}
 
       - name: Install dependencies
-        run: npm install
+        run: pnpm install
 
-      - name: Build Tailwind CSS
-        run: npx turbo run build --filter=//
+      - name: Build
+        run: pnpm run build
+        env:
+          CARGO_PROFILE_RELEASE_LTO: 'off'
+          CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER: 'lld-link'
+
+      - name: Lint
+        run: pnpm run lint
+        # Only lint on linux to avoid \r\n line ending errors
+        if: matrix.runner.os == 'ubuntu-latest'
 
       - name: Test
-        run: |
-          npx turbo run test --filter=// || \
-          npx turbo run test --filter=// || \
-          npx turbo run test --filter=// || exit 1
+        run: pnpm run test
 
-      - name: Lint
-        run: npx turbo run style --filter=//
+      - name: Install Playwright Browsers
+        run: npx playwright install --with-deps
+
+      - name: Run Playwright tests
+        run: npm run test:ui
+
+      - name: Notify Discord
+        if: failure() && github.ref == 'refs/heads/next'
+        uses: discord-actions/message@v2
+        with:
+          webhookUrl: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          message: 'The [most recent build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `next` branch has failed.'