diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dbbe9cbb..c19e3a644 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,11 +47,11 @@ jobs: uses: actions/cache@v3 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: pnpm install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5e2f8463..67f698b3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ env: APP_NAME: tailwindcss-oxide NODE_VERSION: 20 PNPM_VERSION: ^8.15.0 - OXIDE_LOCATION: ./oxide/crates/node + OXIDE_LOCATION: ./crates/node jobs: build: @@ -104,10 +104,10 @@ jobs: with: path: | ./oxide/target/ - ./oxide/crates/node/*.node - ./oxide/crates/node/index.js - ./oxide/crates/node/index.d.ts - key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./oxide/crates/**/*') }} + ./crates/node/*.node + ./crates/node/index.js + ./crates/node/index.d.ts + key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }} - name: Install Node.JS uses: actions/setup-node@v3 @@ -189,10 +189,10 @@ jobs: with: path: | ./oxide/target/ - ./oxide/crates/node/*.node - ./oxide/crates/node/index.js - ./oxide/crates/node/index.d.ts - key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./oxide/crates/**/*') }} + ./crates/node/*.node + ./crates/node/index.js + ./crates/node/index.d.ts + key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }} - name: Install dependencies run: pnpm install --ignore-scripts --filter=!./playgrounds/* diff --git a/.gitignore b/.gitignore index 092494627..f8b693aa3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ test-results/ playwright-report/ blob-report/ playwright/.cache/ +target/ diff --git a/.prettierignore b/.prettierignore index 0333c2dc5..3de4530dd 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,8 +1,8 @@ coverage/ node_modules/ pnpm-lock.yaml -oxide/target/ -oxide/crates/node/index.d.ts -oxide/crates/node/index.js +target/ +crates/node/index.d.ts +crates/node/index.js .next .fingerprint diff --git a/oxide/Cargo.lock b/Cargo.lock similarity index 99% rename from oxide/Cargo.lock rename to Cargo.lock index 7404bde1d..6ad47b9b8 100644 --- a/oxide/Cargo.lock +++ b/Cargo.lock @@ -812,11 +812,11 @@ dependencies = [ "napi-build", "napi-derive", "rayon", - "tailwindcss-core", + "tailwindcss-oxide", ] [[package]] -name = "tailwindcss-core" +name = "tailwindcss-oxide" version = "0.1.0" dependencies = [ "bstr", diff --git a/oxide/Cargo.toml b/Cargo.toml similarity index 100% rename from oxide/Cargo.toml rename to Cargo.toml diff --git a/oxide/crates/node/.cargo/config.toml b/crates/node/.cargo/config.toml similarity index 100% rename from oxide/crates/node/.cargo/config.toml rename to crates/node/.cargo/config.toml diff --git a/oxide/crates/node/.gitignore b/crates/node/.gitignore similarity index 100% rename from oxide/crates/node/.gitignore rename to crates/node/.gitignore diff --git a/oxide/crates/node/.npmignore b/crates/node/.npmignore similarity index 100% rename from oxide/crates/node/.npmignore rename to crates/node/.npmignore diff --git a/oxide/crates/node/Cargo.toml b/crates/node/Cargo.toml similarity index 89% rename from oxide/crates/node/Cargo.toml rename to crates/node/Cargo.toml index 0ded64922..5c7940ace 100644 --- a/oxide/crates/node/Cargo.toml +++ b/crates/node/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib"] # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix napi = { version = "2.13.1", default-features = false, features = ["napi4"] } napi-derive = "2.13.0" -tailwindcss-core = { path = "../core" } +tailwindcss-oxide = { path = "../oxide" } rayon = "1.5.3" [build-dependencies] diff --git a/oxide/crates/node/build.rs b/crates/node/build.rs similarity index 100% rename from oxide/crates/node/build.rs rename to crates/node/build.rs diff --git a/oxide/crates/node/npm/android-arm-eabi/README.md b/crates/node/npm/android-arm-eabi/README.md similarity index 100% rename from oxide/crates/node/npm/android-arm-eabi/README.md rename to crates/node/npm/android-arm-eabi/README.md diff --git a/oxide/crates/node/npm/android-arm-eabi/package.json b/crates/node/npm/android-arm-eabi/package.json similarity index 89% rename from oxide/crates/node/npm/android-arm-eabi/package.json rename to crates/node/npm/android-arm-eabi/package.json index 58a9a0c84..608071f6b 100644 --- a/oxide/crates/node/npm/android-arm-eabi/package.json +++ b/crates/node/npm/android-arm-eabi/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/android-arm-eabi" + "directory": "crates/node/npm/android-arm-eabi" }, "os": [ "android" diff --git a/oxide/crates/node/npm/android-arm64/README.md b/crates/node/npm/android-arm64/README.md similarity index 100% rename from oxide/crates/node/npm/android-arm64/README.md rename to crates/node/npm/android-arm64/README.md diff --git a/oxide/crates/node/npm/android-arm64/package.json b/crates/node/npm/android-arm64/package.json similarity index 89% rename from oxide/crates/node/npm/android-arm64/package.json rename to crates/node/npm/android-arm64/package.json index bf9471d7d..7c91208fd 100644 --- a/oxide/crates/node/npm/android-arm64/package.json +++ b/crates/node/npm/android-arm64/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/android-arm64" + "directory": "crates/node/npm/android-arm64" }, "os": [ "android" diff --git a/oxide/crates/node/npm/darwin-arm64/README.md b/crates/node/npm/darwin-arm64/README.md similarity index 100% rename from oxide/crates/node/npm/darwin-arm64/README.md rename to crates/node/npm/darwin-arm64/README.md diff --git a/oxide/crates/node/npm/darwin-arm64/package.json b/crates/node/npm/darwin-arm64/package.json similarity index 89% rename from oxide/crates/node/npm/darwin-arm64/package.json rename to crates/node/npm/darwin-arm64/package.json index 4248aa19d..02132ec90 100644 --- a/oxide/crates/node/npm/darwin-arm64/package.json +++ b/crates/node/npm/darwin-arm64/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/darwin-arm64" + "directory": "crates/node/npm/darwin-arm64" }, "os": [ "darwin" diff --git a/oxide/crates/node/npm/darwin-x64/README.md b/crates/node/npm/darwin-x64/README.md similarity index 100% rename from oxide/crates/node/npm/darwin-x64/README.md rename to crates/node/npm/darwin-x64/README.md diff --git a/oxide/crates/node/npm/darwin-x64/package.json b/crates/node/npm/darwin-x64/package.json similarity index 90% rename from oxide/crates/node/npm/darwin-x64/package.json rename to crates/node/npm/darwin-x64/package.json index 639048181..b32d97527 100644 --- a/oxide/crates/node/npm/darwin-x64/package.json +++ b/crates/node/npm/darwin-x64/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/darwin-x64" + "directory": "crates/node/npm/darwin-x64" }, "os": [ "darwin" diff --git a/oxide/crates/node/npm/freebsd-x64/README.md b/crates/node/npm/freebsd-x64/README.md similarity index 100% rename from oxide/crates/node/npm/freebsd-x64/README.md rename to crates/node/npm/freebsd-x64/README.md diff --git a/oxide/crates/node/npm/freebsd-x64/package.json b/crates/node/npm/freebsd-x64/package.json similarity index 90% rename from oxide/crates/node/npm/freebsd-x64/package.json rename to crates/node/npm/freebsd-x64/package.json index c7f276425..2842c22b5 100644 --- a/oxide/crates/node/npm/freebsd-x64/package.json +++ b/crates/node/npm/freebsd-x64/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/freebsd-x64" + "directory": "crates/node/npm/freebsd-x64" }, "os": [ "freebsd" diff --git a/oxide/crates/node/npm/linux-arm-gnueabihf/README.md b/crates/node/npm/linux-arm-gnueabihf/README.md similarity index 100% rename from oxide/crates/node/npm/linux-arm-gnueabihf/README.md rename to crates/node/npm/linux-arm-gnueabihf/README.md diff --git a/oxide/crates/node/npm/linux-arm-gnueabihf/package.json b/crates/node/npm/linux-arm-gnueabihf/package.json similarity index 89% rename from oxide/crates/node/npm/linux-arm-gnueabihf/package.json rename to crates/node/npm/linux-arm-gnueabihf/package.json index 6047a039e..55a6fec92 100644 --- a/oxide/crates/node/npm/linux-arm-gnueabihf/package.json +++ b/crates/node/npm/linux-arm-gnueabihf/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/linux-arm-gnueabihf" + "directory": "crates/node/npm/linux-arm-gnueabihf" }, "os": [ "linux" diff --git a/oxide/crates/node/npm/linux-arm64-gnu/README.md b/crates/node/npm/linux-arm64-gnu/README.md similarity index 100% rename from oxide/crates/node/npm/linux-arm64-gnu/README.md rename to crates/node/npm/linux-arm64-gnu/README.md diff --git a/oxide/crates/node/npm/linux-arm64-gnu/package.json b/crates/node/npm/linux-arm64-gnu/package.json similarity index 90% rename from oxide/crates/node/npm/linux-arm64-gnu/package.json rename to crates/node/npm/linux-arm64-gnu/package.json index 9c7f1160b..b1a54d660 100644 --- a/oxide/crates/node/npm/linux-arm64-gnu/package.json +++ b/crates/node/npm/linux-arm64-gnu/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/linux-arm64-gnu" + "directory": "crates/node/npm/linux-arm64-gnu" }, "os": [ "linux" diff --git a/oxide/crates/node/npm/linux-arm64-musl/README.md b/crates/node/npm/linux-arm64-musl/README.md similarity index 100% rename from oxide/crates/node/npm/linux-arm64-musl/README.md rename to crates/node/npm/linux-arm64-musl/README.md diff --git a/oxide/crates/node/npm/linux-arm64-musl/package.json b/crates/node/npm/linux-arm64-musl/package.json similarity index 90% rename from oxide/crates/node/npm/linux-arm64-musl/package.json rename to crates/node/npm/linux-arm64-musl/package.json index 9bcce925c..62a184842 100644 --- a/oxide/crates/node/npm/linux-arm64-musl/package.json +++ b/crates/node/npm/linux-arm64-musl/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/linux-arm64-musl" + "directory": "crates/node/npm/linux-arm64-musl" }, "os": [ "linux" diff --git a/oxide/crates/node/npm/linux-x64-gnu/README.md b/crates/node/npm/linux-x64-gnu/README.md similarity index 100% rename from oxide/crates/node/npm/linux-x64-gnu/README.md rename to crates/node/npm/linux-x64-gnu/README.md diff --git a/oxide/crates/node/npm/linux-x64-gnu/package.json b/crates/node/npm/linux-x64-gnu/package.json similarity index 90% rename from oxide/crates/node/npm/linux-x64-gnu/package.json rename to crates/node/npm/linux-x64-gnu/package.json index 754d56e3f..a362bc397 100644 --- a/oxide/crates/node/npm/linux-x64-gnu/package.json +++ b/crates/node/npm/linux-x64-gnu/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/linux-x64-gnu" + "directory": "crates/node/npm/linux-x64-gnu" }, "os": [ "linux" diff --git a/oxide/crates/node/npm/linux-x64-musl/README.md b/crates/node/npm/linux-x64-musl/README.md similarity index 100% rename from oxide/crates/node/npm/linux-x64-musl/README.md rename to crates/node/npm/linux-x64-musl/README.md diff --git a/oxide/crates/node/npm/linux-x64-musl/package.json b/crates/node/npm/linux-x64-musl/package.json similarity index 90% rename from oxide/crates/node/npm/linux-x64-musl/package.json rename to crates/node/npm/linux-x64-musl/package.json index 0b9bb8035..98d0cb483 100644 --- a/oxide/crates/node/npm/linux-x64-musl/package.json +++ b/crates/node/npm/linux-x64-musl/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/linux-x64-musl" + "directory": "crates/node/npm/linux-x64-musl" }, "os": [ "linux" diff --git a/oxide/crates/node/npm/win32-x64-msvc/README.md b/crates/node/npm/win32-x64-msvc/README.md similarity index 100% rename from oxide/crates/node/npm/win32-x64-msvc/README.md rename to crates/node/npm/win32-x64-msvc/README.md diff --git a/oxide/crates/node/npm/win32-x64-msvc/package.json b/crates/node/npm/win32-x64-msvc/package.json similarity index 89% rename from oxide/crates/node/npm/win32-x64-msvc/package.json rename to crates/node/npm/win32-x64-msvc/package.json index 8adb93f7a..fb815b55f 100644 --- a/oxide/crates/node/npm/win32-x64-msvc/package.json +++ b/crates/node/npm/win32-x64-msvc/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node/npm/win32-x64-msvc" + "directory": "crates/node/npm/win32-x64-msvc" }, "os": [ "win32" diff --git a/oxide/crates/node/package.json b/crates/node/package.json similarity index 97% rename from oxide/crates/node/package.json rename to crates/node/package.json index 2d2df0cee..72a81e617 100644 --- a/oxide/crates/node/package.json +++ b/crates/node/package.json @@ -4,7 +4,7 @@ "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", - "directory": "oxide/crates/node" + "directory": "crates/node" }, "main": "index.js", "types": "index.d.ts", diff --git a/oxide/crates/node/rustfmt.toml b/crates/node/rustfmt.toml similarity index 100% rename from oxide/crates/node/rustfmt.toml rename to crates/node/rustfmt.toml diff --git a/oxide/crates/node/src/lib.rs b/crates/node/src/lib.rs similarity index 82% rename from oxide/crates/node/src/lib.rs rename to crates/node/src/lib.rs index 2658cdb22..a7bfe0532 100644 --- a/oxide/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -12,9 +12,9 @@ pub struct ChangedContent { pub extension: String, } -impl From for tailwindcss_core::ChangedContent { +impl From for tailwindcss_oxide::ChangedContent { fn from(changed_content: ChangedContent) -> Self { - tailwindcss_core::ChangedContent { + tailwindcss_oxide::ChangedContent { file: changed_content.file.map(PathBuf::from), content: changed_content.content, } @@ -45,12 +45,12 @@ pub struct ScanOptions { #[napi] pub fn clear_cache() { - tailwindcss_core::clear_cache(); + tailwindcss_oxide::clear_cache(); } #[napi] pub fn scan_dir(args: ScanOptions) -> ScanResult { - let result = tailwindcss_core::scan_dir(tailwindcss_core::ScanOptions { + let result = tailwindcss_oxide::scan_dir(tailwindcss_oxide::ScanOptions { base: args.base, globs: args.globs.unwrap_or(false), }); @@ -85,5 +85,5 @@ pub enum Parsing { #[napi] pub fn scan_files(input: Vec, strategy: u8) -> Vec { - tailwindcss_core::scan_files(input.into_iter().map(Into::into).collect(), strategy) + tailwindcss_oxide::scan_files(input.into_iter().map(Into::into).collect(), strategy) } diff --git a/oxide/crates/core/Cargo.toml b/crates/oxide/Cargo.toml similarity index 95% rename from oxide/crates/core/Cargo.toml rename to crates/oxide/Cargo.toml index 8f9f26432..5d4fdf0f6 100644 --- a/oxide/crates/core/Cargo.toml +++ b/crates/oxide/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tailwindcss-core" +name = "tailwindcss-oxide" version = "0.1.0" edition = "2021" diff --git a/oxide/crates/core/benches/fixtures/template-000.html b/crates/oxide/benches/fixtures/template-000.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-000.html rename to crates/oxide/benches/fixtures/template-000.html diff --git a/oxide/crates/core/benches/fixtures/template-001.html b/crates/oxide/benches/fixtures/template-001.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-001.html rename to crates/oxide/benches/fixtures/template-001.html diff --git a/oxide/crates/core/benches/fixtures/template-002.html b/crates/oxide/benches/fixtures/template-002.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-002.html rename to crates/oxide/benches/fixtures/template-002.html diff --git a/oxide/crates/core/benches/fixtures/template-003.html b/crates/oxide/benches/fixtures/template-003.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-003.html rename to crates/oxide/benches/fixtures/template-003.html diff --git a/oxide/crates/core/benches/fixtures/template-004.html b/crates/oxide/benches/fixtures/template-004.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-004.html rename to crates/oxide/benches/fixtures/template-004.html diff --git a/oxide/crates/core/benches/fixtures/template-005.html b/crates/oxide/benches/fixtures/template-005.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-005.html rename to crates/oxide/benches/fixtures/template-005.html diff --git a/oxide/crates/core/benches/fixtures/template-006.html b/crates/oxide/benches/fixtures/template-006.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-006.html rename to crates/oxide/benches/fixtures/template-006.html diff --git a/oxide/crates/core/benches/fixtures/template-007.html b/crates/oxide/benches/fixtures/template-007.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-007.html rename to crates/oxide/benches/fixtures/template-007.html diff --git a/oxide/crates/core/benches/fixtures/template-008.html b/crates/oxide/benches/fixtures/template-008.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-008.html rename to crates/oxide/benches/fixtures/template-008.html diff --git a/oxide/crates/core/benches/fixtures/template-009.html b/crates/oxide/benches/fixtures/template-009.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-009.html rename to crates/oxide/benches/fixtures/template-009.html diff --git a/oxide/crates/core/benches/fixtures/template-010.html b/crates/oxide/benches/fixtures/template-010.html similarity index 100% rename from oxide/crates/core/benches/fixtures/template-010.html rename to crates/oxide/benches/fixtures/template-010.html diff --git a/oxide/crates/core/benches/parse_candidates.rs b/crates/oxide/benches/parse_candidates.rs similarity index 97% rename from oxide/crates/core/benches/parse_candidates.rs rename to crates/oxide/benches/parse_candidates.rs index 12e476864..b59b2ee17 100644 --- a/oxide/crates/core/benches/parse_candidates.rs +++ b/crates/oxide/benches/parse_candidates.rs @@ -1,5 +1,5 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion}; -use tailwindcss_core::parser::Extractor; +use tailwindcss_oxide::parser::Extractor; pub fn criterion_benchmark(c: &mut Criterion) { fn parse(input: &[u8]) { diff --git a/oxide/crates/core/benches/scan_files.rs b/crates/oxide/benches/scan_files.rs similarity index 96% rename from oxide/crates/core/benches/scan_files.rs rename to crates/oxide/benches/scan_files.rs index 83af3c720..432be259a 100644 --- a/oxide/crates/core/benches/scan_files.rs +++ b/crates/oxide/benches/scan_files.rs @@ -1,6 +1,6 @@ use criterion::{criterion_group, criterion_main, Criterion}; use std::path::PathBuf; -use tailwindcss_core::{scan_files, ChangedContent, Parsing, IO}; +use tailwindcss_oxide::{scan_files, ChangedContent, Parsing, IO}; pub fn criterion_benchmark(c: &mut Criterion) { // current_dir will be set to ./crates/core diff --git a/oxide/crates/core/fuzz/.gitignore b/crates/oxide/fuzz/.gitignore similarity index 100% rename from oxide/crates/core/fuzz/.gitignore rename to crates/oxide/fuzz/.gitignore diff --git a/oxide/crates/core/fuzz/Cargo.lock b/crates/oxide/fuzz/Cargo.lock similarity index 99% rename from oxide/crates/core/fuzz/Cargo.lock rename to crates/oxide/fuzz/Cargo.lock index 4b87adb77..7c7ebc7a8 100644 --- a/oxide/crates/core/fuzz/Cargo.lock +++ b/crates/oxide/fuzz/Cargo.lock @@ -382,7 +382,7 @@ dependencies = [ ] [[package]] -name = "tailwindcss-core" +name = "tailwindcss-oxide" version = "0.1.0" dependencies = [ "bstr", @@ -399,11 +399,11 @@ dependencies = [ ] [[package]] -name = "tailwindcss-core-fuzz" +name = "tailwindcss-oxide-fuzz" version = "0.0.0" dependencies = [ "libfuzzer-sys", - "tailwindcss-core", + "tailwindcss-oxide", ] [[package]] diff --git a/oxide/crates/core/fuzz/Cargo.toml b/crates/oxide/fuzz/Cargo.toml similarity index 83% rename from oxide/crates/core/fuzz/Cargo.toml rename to crates/oxide/fuzz/Cargo.toml index 221bb40d4..b402014a9 100644 --- a/oxide/crates/core/fuzz/Cargo.toml +++ b/crates/oxide/fuzz/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tailwindcss-core-fuzz" +name = "tailwindcss-oxide-fuzz" version = "0.0.0" publish = false edition = "2021" @@ -10,7 +10,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = "0.4" -[dependencies.tailwindcss-core] +[dependencies.tailwindcss-oxide] path = ".." # Prevent this from interfering with workspaces diff --git a/oxide/crates/core/fuzz/fuzz_targets/parsing.rs b/crates/oxide/fuzz/fuzz_targets/parsing.rs similarity index 83% rename from oxide/crates/core/fuzz/fuzz_targets/parsing.rs rename to crates/oxide/fuzz/fuzz_targets/parsing.rs index ac7a9fd79..02935a20f 100644 --- a/oxide/crates/core/fuzz/fuzz_targets/parsing.rs +++ b/crates/oxide/fuzz/fuzz_targets/parsing.rs @@ -2,9 +2,9 @@ use libfuzzer_sys::fuzz_target; use std::path::PathBuf; -use tailwindcss_core::candidate::scan_files; -use tailwindcss_core::candidate::Candidate; -use tailwindcss_core::location::Location; +use tailwindcss_oxide::candidate::scan_files; +use tailwindcss_oxide::candidate::Candidate; +use tailwindcss_oxide::location::Location; // fuzz_target!(|data: &[u8]| { // if let Ok(s) = std::str::from_utf8(data) { diff --git a/oxide/crates/core/src/cache.rs b/crates/oxide/src/cache.rs similarity index 100% rename from oxide/crates/core/src/cache.rs rename to crates/oxide/src/cache.rs diff --git a/oxide/crates/core/src/cursor.rs b/crates/oxide/src/cursor.rs similarity index 100% rename from oxide/crates/core/src/cursor.rs rename to crates/oxide/src/cursor.rs diff --git a/oxide/crates/core/src/fast_skip.rs b/crates/oxide/src/fast_skip.rs similarity index 100% rename from oxide/crates/core/src/fast_skip.rs rename to crates/oxide/src/fast_skip.rs diff --git a/oxide/crates/core/src/fixtures/binary-extensions.txt b/crates/oxide/src/fixtures/binary-extensions.txt similarity index 100% rename from oxide/crates/core/src/fixtures/binary-extensions.txt rename to crates/oxide/src/fixtures/binary-extensions.txt diff --git a/oxide/crates/core/src/fixtures/ignored-extensions.txt b/crates/oxide/src/fixtures/ignored-extensions.txt similarity index 100% rename from oxide/crates/core/src/fixtures/ignored-extensions.txt rename to crates/oxide/src/fixtures/ignored-extensions.txt diff --git a/oxide/crates/core/src/fixtures/ignored-files.txt b/crates/oxide/src/fixtures/ignored-files.txt similarity index 100% rename from oxide/crates/core/src/fixtures/ignored-files.txt rename to crates/oxide/src/fixtures/ignored-files.txt diff --git a/oxide/crates/core/src/fixtures/template-extensions.txt b/crates/oxide/src/fixtures/template-extensions.txt similarity index 100% rename from oxide/crates/core/src/fixtures/template-extensions.txt rename to crates/oxide/src/fixtures/template-extensions.txt diff --git a/oxide/crates/core/src/glob.rs b/crates/oxide/src/glob.rs similarity index 100% rename from oxide/crates/core/src/glob.rs rename to crates/oxide/src/glob.rs diff --git a/oxide/crates/core/src/lib.rs b/crates/oxide/src/lib.rs similarity index 100% rename from oxide/crates/core/src/lib.rs rename to crates/oxide/src/lib.rs diff --git a/oxide/crates/core/src/parser.rs b/crates/oxide/src/parser.rs similarity index 100% rename from oxide/crates/core/src/parser.rs rename to crates/oxide/src/parser.rs diff --git a/oxide/crates/core/tests/auto_content.rs b/crates/oxide/tests/auto_content.rs similarity index 99% rename from oxide/crates/core/tests/auto_content.rs rename to crates/oxide/tests/auto_content.rs index 030755373..2859a39cc 100644 --- a/oxide/crates/core/tests/auto_content.rs +++ b/crates/oxide/tests/auto_content.rs @@ -3,7 +3,7 @@ mod auto_content { use std::fs; use std::process::Command; - use tailwindcss_core::*; + use tailwindcss_oxide::*; use tempfile::tempdir; fn scan(paths_with_content: &[(&str, Option<&str>)]) -> (Vec, Vec) { diff --git a/oxide/.gitignore b/oxide/.gitignore deleted file mode 100644 index 2f7896d1d..000000000 --- a/oxide/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target/ diff --git a/oxide/README.md b/oxide/README.md deleted file mode 100644 index fa0a1e39d..000000000 --- a/oxide/README.md +++ /dev/null @@ -1 +0,0 @@ -## Tailwind CSS Oxide diff --git a/oxide/package.json b/oxide/package.json deleted file mode 100644 index 6372db6c0..000000000 --- a/oxide/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "tailwindcss-oxide", - "private": true, - "version": "0.1.0", - "workspaces": [ - "node" - ], - "scripts": { - "test": "cargo test", - "install:cargo": "cargo install cargo-watch cargo-fuzz", - "build": "cargo build --release", - "build:node": "npm --prefix ./crates/node run build", - "dev": "cargo watch --clear --quiet -x 'run --quiet'", - "dev:node": "cargo watch --clear --quiet --shell 'npm --prefix ./crates/node run build:debug'", - "fuzz": "cd ./crates/core; cargo fuzz run parsing; cd -", - "bench": "cargo bench", - "postbench": "open ./target/criterion/report/index.html" - }, - "license": "MIT" -} diff --git a/package.json b/package.json index a449c9d0a..a0950b105 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "lint": "prettier --check . && turbo lint", "build": "turbo build --filter=!./playgrounds/*", "dev": "turbo dev --filter=!./playgrounds/*", - "test": "pnpm test --prefix=oxide && vitest run", + "test": "cargo test && vitest run", "test:ui": "pnpm run --filter=tailwindcss test:ui", "tdd": "vitest", "bench": "vitest bench", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f6e4b1fb..0ef444f91 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,7 +42,7 @@ importers: specifier: ^1.1.3 version: 1.2.2(@types/node@20.11.20) - oxide/crates/node: + crates/node: optionalDependencies: '@tailwindcss/oxide-android-arm64': specifier: workspace:* @@ -79,27 +79,27 @@ importers: specifier: ^2.17.0 version: 2.18.0 - oxide/crates/node/npm/android-arm-eabi: {} + crates/node/npm/android-arm-eabi: {} - oxide/crates/node/npm/android-arm64: {} + crates/node/npm/android-arm64: {} - oxide/crates/node/npm/darwin-arm64: {} + crates/node/npm/darwin-arm64: {} - oxide/crates/node/npm/darwin-x64: {} + crates/node/npm/darwin-x64: {} - oxide/crates/node/npm/freebsd-x64: {} + crates/node/npm/freebsd-x64: {} - oxide/crates/node/npm/linux-arm-gnueabihf: {} + crates/node/npm/linux-arm-gnueabihf: {} - oxide/crates/node/npm/linux-arm64-gnu: {} + crates/node/npm/linux-arm64-gnu: {} - oxide/crates/node/npm/linux-arm64-musl: {} + crates/node/npm/linux-arm64-musl: {} - oxide/crates/node/npm/linux-x64-gnu: {} + crates/node/npm/linux-x64-gnu: {} - oxide/crates/node/npm/linux-x64-musl: {} + crates/node/npm/linux-x64-musl: {} - oxide/crates/node/npm/win32-x64-msvc: {} + crates/node/npm/win32-x64-msvc: {} packages/@tailwindcss-cli: dependencies: @@ -108,7 +108,7 @@ importers: version: 2.4.1 '@tailwindcss/oxide': specifier: workspace:^ - version: link:../../oxide/crates/node + version: link:../../crates/node lightningcss: specifier: ^1.24.0 version: 1.24.0 @@ -136,7 +136,7 @@ importers: dependencies: '@tailwindcss/oxide': specifier: workspace:^ - version: link:../../oxide/crates/node + version: link:../../crates/node lightningcss: specifier: ^1.24.0 version: 1.24.0 @@ -161,7 +161,7 @@ importers: dependencies: '@tailwindcss/oxide': specifier: workspace:^ - version: link:../../oxide/crates/node + version: link:../../crates/node lightningcss: specifier: ^1.24.0 version: 1.24.0 @@ -180,7 +180,7 @@ importers: devDependencies: '@tailwindcss/oxide': specifier: workspace:^ - version: link:../../oxide/crates/node + version: link:../../crates/node '@types/node': specifier: ^20.10.8 version: 20.11.17 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 665bcbcb5..4a6a48a39 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,5 @@ packages: - - 'oxide/crates/node' - - 'oxide/crates/node/npm/*' + - 'crates/node' + - 'crates/node/npm/*' - 'packages/*' - 'playgrounds/*' diff --git a/scripts/version-packages.mjs b/scripts/version-packages.mjs index 6a6456955..a68c60102 100644 --- a/scripts/version-packages.mjs +++ b/scripts/version-packages.mjs @@ -10,24 +10,24 @@ const __dirname = path.dirname(url.fileURLToPath(import.meta.url)) const root = path.resolve(__dirname, '..') // The known workspace is: @tailwindcss/oxide -// All the workspaces in `oxide/crates/node/npm/*` should always be in sync with +// All the workspaces in `crates/node/npm/*` should always be in sync with // `@tailwindcss/oxide`. You can think of them as one big package, but they are // split into multiple packages because they are OS specific. const syncedWorkspaces = new Map([ [ '@tailwindcss/oxide', [ - 'oxide/crates/node/npm/android-arm-eabi', - 'oxide/crates/node/npm/android-arm64', - 'oxide/crates/node/npm/darwin-arm64', - 'oxide/crates/node/npm/darwin-x64', - 'oxide/crates/node/npm/freebsd-x64', - 'oxide/crates/node/npm/linux-arm-gnueabihf', - 'oxide/crates/node/npm/linux-arm64-gnu', - 'oxide/crates/node/npm/linux-arm64-musl', - 'oxide/crates/node/npm/linux-x64-gnu', - 'oxide/crates/node/npm/linux-x64-musl', - 'oxide/crates/node/npm/win32-x64-msvc', + 'crates/node/npm/android-arm-eabi', + 'crates/node/npm/android-arm64', + 'crates/node/npm/darwin-arm64', + 'crates/node/npm/darwin-x64', + 'crates/node/npm/freebsd-x64', + 'crates/node/npm/linux-arm-gnueabihf', + 'crates/node/npm/linux-arm64-gnu', + 'crates/node/npm/linux-arm64-musl', + 'crates/node/npm/linux-x64-gnu', + 'crates/node/npm/linux-x64-musl', + 'crates/node/npm/win32-x64-msvc', ], ], ])