Skip to content

Commit 38ceb2e

Browse files
WIP
1 parent 50d3e23 commit 38ceb2e

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

Diff for: .github/workflows/release-insiders.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ jobs:
8282
node-version: ${{ env.NODE_VERSION }}
8383
cache: 'pnpm'
8484

85+
- name: Install gcc-arm-linux-gnueabihf
86+
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
87+
run: |
88+
sudo apt-get update
89+
sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
90+
8591
# Cargo already skips downloading dependencies if they already exist
8692
- name: Cache cargo
8793
uses: actions/cache@v4
@@ -122,7 +128,7 @@ jobs:
122128
run: pnpm install --ignore-scripts --filter=!./playgrounds/*
123129

124130
- name: Build release
125-
run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform -- --target=${{ matrix.target }}
131+
run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform --target=${{ matrix.target }}
126132
env:
127133
RUST_TARGET: ${{ matrix.target }}
128134
JEMALLOC_SYS_WITH_LG_PAGE: ${{ matrix.page-size }}

Diff for: crates/node/scripts/move-artifacts.mjs

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ for (let file of await fs.readdir(tailwindcssOxideRoot)) {
1414
path.join(tailwindcssOxideRoot, file),
1515
path.join(tailwindcssOxideRoot, 'npm', target, file),
1616
)
17+
console.log(`Moved ${file} to npm/${target}`)
1718
}
1819
}
1920

@@ -32,4 +33,5 @@ for (let file of await fs.readdir(tailwindcssOxideRoot)) {
3233
path.join(tailwindcssOxideRoot, file),
3334
path.join(tailwindcssOxideRoot, 'npm', 'wasm32-wasi', wasmArtifacts[file]),
3435
)
36+
console.log(`Moved ${file} to npm/wasm32-wasi`)
3537
}

Diff for: crates/oxide/src/scanner/sources.rs

+2
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,13 @@ impl PublicSourceEntry {
102102
/// resolved path.
103103
pub fn optimize(&mut self) {
104104
// Resolve base path immediately
105+
dbg!(&self.base);
105106
let Ok(base) = dunce::canonicalize(&self.base) else {
106107
event!(Level::ERROR, "Failed to resolve base: {:?}", self.base);
107108
return;
108109
};
109110
self.base = base.to_string_lossy().to_string();
111+
dbg!(&self.base);
110112

111113
// No dynamic part, figure out if we are dealing with a file or a directory.
112114
if !self.pattern.contains('*') {

Diff for: integrations/oxide/wasm.test.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ test(
1818
`,
1919
'index.mjs': js`
2020
import { Scanner } from '@tailwindcss/oxide-wasm32-wasi'
21-
import { join } from 'node:path'
21+
import { join, resolve } from 'node:path'
2222
2323
let scanner = new Scanner({
2424
sources: [
2525
{
2626
// Note: There is currently a known-problem that the Node WASI preview implementation
2727
// does not properly handle FS reads on macOS. This forces us to scan a folder that
28-
// does not contain files required to load the WASM module.
28+
// does not contain a lot of files.
2929
//
3030
// https://github.com/nodejs/node/issues/47193
3131
base: join(process.cwd(), 'src'),
@@ -40,7 +40,8 @@ test(
4040
},
4141
},
4242
async ({ expect, exec }) => {
43-
let output = await exec(`node index.mjs`)
43+
let output = await exec(`node index.mjs`, { env: { DEBUG: '*' } })
44+
console.log(output)
4445
expect(JSON.parse(output)).toMatchInlineSnapshot(`
4546
[
4647
"className",

0 commit comments

Comments
 (0)