Skip to content

Commit 1c48683

Browse files
authored
Hoist oxide/crates to just crates (#13333)
* move `oxide/crates` to `crates` * ignore `target/` folder * ensure pnpm points to `crates` instead of `oxide/crates` * ensure all paths point to `crates` instead of `oxide/crates` * update `oxide/crates` -> `crates` path in workflows * use correct path in .prettierignore * rename `crates/core` to `crates/oxide` * remove oxide folder * fix test script to run `cargo test` directly
1 parent fee039d commit 1c48683

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+81
-102
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jobs:
4747
uses: actions/cache@v3
4848
with:
4949
path: |
50-
./oxide/target/
51-
./oxide/crates/node/*.node
52-
./oxide/crates/node/index.js
53-
./oxide/crates/node/index.d.ts
54-
key: ${{ runner.os }}-oxide-${{ hashFiles('./oxide/crates/**/*') }}
50+
./target/
51+
./crates/node/*.node
52+
./crates/node/index.js
53+
./crates/node/index.d.ts
54+
key: ${{ runner.os }}-oxide-${{ hashFiles('./crates/**/*') }}
5555

5656
- name: Install dependencies
5757
run: pnpm install

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
APP_NAME: tailwindcss-oxide
1717
NODE_VERSION: 20
1818
PNPM_VERSION: ^8.15.0
19-
OXIDE_LOCATION: ./oxide/crates/node
19+
OXIDE_LOCATION: ./crates/node
2020

2121
jobs:
2222
build:
@@ -104,10 +104,10 @@ jobs:
104104
with:
105105
path: |
106106
./oxide/target/
107-
./oxide/crates/node/*.node
108-
./oxide/crates/node/index.js
109-
./oxide/crates/node/index.d.ts
110-
key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./oxide/crates/**/*') }}
107+
./crates/node/*.node
108+
./crates/node/index.js
109+
./crates/node/index.d.ts
110+
key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }}
111111

112112
- name: Install Node.JS
113113
uses: actions/setup-node@v3
@@ -189,10 +189,10 @@ jobs:
189189
with:
190190
path: |
191191
./oxide/target/
192-
./oxide/crates/node/*.node
193-
./oxide/crates/node/index.js
194-
./oxide/crates/node/index.d.ts
195-
key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./oxide/crates/**/*') }}
192+
./crates/node/*.node
193+
./crates/node/index.js
194+
./crates/node/index.d.ts
195+
key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }}
196196

197197
- name: Install dependencies
198198
run: pnpm install --ignore-scripts --filter=!./playgrounds/*

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ test-results/
66
playwright-report/
77
blob-report/
88
playwright/.cache/
9+
target/

.prettierignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
coverage/
22
node_modules/
33
pnpm-lock.yaml
4-
oxide/target/
5-
oxide/crates/node/index.d.ts
6-
oxide/crates/node/index.js
4+
target/
5+
crates/node/index.d.ts
6+
crates/node/index.js
77
.next
88
.fingerprint

oxide/Cargo.lock renamed to Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

oxide/crates/node/Cargo.toml renamed to crates/node/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
1010
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
1111
napi = { version = "2.13.1", default-features = false, features = ["napi4"] }
1212
napi-derive = "2.13.0"
13-
tailwindcss-core = { path = "../core" }
13+
tailwindcss-oxide = { path = "../oxide" }
1414
rayon = "1.5.3"
1515

1616
[build-dependencies]

0 commit comments

Comments
 (0)