Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(core): support compile to wasi target #22870

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

feat(core): support compile to wasi target #22870

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
78976a3
feat(core): experimental wasi target
Brooooooklyn Mar 21, 2024
535296d
feat(core): add release for wasm
FrozenPandaz Apr 4, 2024
8b9310d
fix(core): napi config and code generationfix config
Brooooooklyn Apr 18, 2024
0f9fdc2
Merge remote-tracking branch 'origin/master' into wasm
FrozenPandaz Apr 27, 2024
41e3a96
chore(repo): ignore wasm outputs from prettier
FrozenPandaz Apr 27, 2024
57f2ba9
fix(core): add wasm runtime dependency
FrozenPandaz Apr 27, 2024
f26badb
fix(core): disable daemon and pseudo terminal on wasm
FrozenPandaz Apr 27, 2024
df88880
Merge remote-tracking branch 'origin/master' into wasm
FrozenPandaz May 24, 2024
5864b00
chore(repo): set toolchain back to stable but nightly for wasm
FrozenPandaz May 24, 2024
0c65e7f
chore(core): fix readme for wasm binary
FrozenPandaz May 24, 2024
ebae9d8
chore(core): fix name to match target and re-build
FrozenPandaz May 24, 2024
f381dfc
chore(repo): change package name to match generated index and fix pub…
FrozenPandaz May 24, 2024
a0b6608
fix(core): fix armv7 native build
FrozenPandaz May 25, 2024
34c4582
chore(repo): remove wasi package
FrozenPandaz May 25, 2024
8164f5b
fix(core): fix artifacts step
FrozenPandaz May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(core): disable daemon and pseudo terminal on wasm
  • Loading branch information
@FrozenPandaz
FrozenPandaz committed Apr 27, 2024
commit f26badb8c31f796a914c540d17e6ff13c2f6781e
3 changes: 3 additions & 0 deletions packages/nx/src/daemon/client/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
DaemonProjectGraphError,
ProjectGraphError,
} from '../../project-graph/error-types';
import { isWasm } from '../../native';

const DAEMON_ENV_SETTINGS = {
NX_PROJECT_GLOB_CACHE: 'false',
Expand All @@ -49,6 +50,7 @@ enum DaemonStatus {

export class DaemonClient {
private readonly nxJson: NxJsonConfiguration | null;

constructor() {
try {
this.nxJson = readNxJson();
Expand Down Expand Up @@ -93,6 +95,7 @@ export class DaemonClient {
// CI=true,env=false => no daemon
// CI=true,env=true => daemon
if (
isWasm() ||
(isCI() && env !== 'true') ||
isDocker() ||
isDaemonDisabled() ||
Expand Down
2 changes: 2 additions & 0 deletions packages/nx/src/native/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ export interface InputsInput {
projects?: string | Array<string>
}

export function isWasm(): boolean

/** Stripped version of the NxJson interface for use in rust */
export interface NxJson {
namedInputs?: Record<string, Array<JsInputs>>
Expand Down
6 changes: 4 additions & 2 deletions packages/nx/src/native/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ pub mod hasher;
mod logger;
pub mod plugins;
pub mod project_graph;
#[cfg(not(target_family = "wasm"))]
#[cfg(not(target_arch = "wasm32"))]
pub mod pseudo_terminal;
pub mod tasks;
mod types;
mod utils;
mod walker;
#[cfg(not(target_family = "wasm"))]
#[cfg(not(target_arch = "wasm32"))]
pub mod watch;
pub mod workspace;

pub mod wasm;
1 change: 1 addition & 0 deletions packages/nx/src/native/native-bindings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ module.exports.findImports = nativeBinding.findImports
module.exports.getFilesForOutputs = nativeBinding.getFilesForOutputs
module.exports.hashArray = nativeBinding.hashArray
module.exports.hashFile = nativeBinding.hashFile
module.exports.isWasm = nativeBinding.isWasm
module.exports.remove = nativeBinding.remove
module.exports.testOnlyTransferFileMap = nativeBinding.testOnlyTransferFileMap
module.exports.transferProjectGraph = nativeBinding.transferProjectGraph
Expand Down
12 changes: 12 additions & 0 deletions packages/nx/src/native/wasm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#[napi]
pub fn is_wasm() -> bool {
#[cfg(not(target_arch = "wasm32"))]
{
false
}

#[cfg(target_arch = "wasm32")]
{
true
}
}
5 changes: 4 additions & 1 deletion packages/nx/src/tasks-runner/pseudo-terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChildProcess, RustPseudoTerminal } from '../native';
import { ChildProcess, RustPseudoTerminal, isWasm } from '../native';
import { PseudoIPCServer } from './pseudo-ipc';
import { FORKED_PROCESS_OS_SOCKET_PATH } from '../daemon/socket-utils';
import { Serializable } from 'child_process';
Expand Down Expand Up @@ -194,6 +194,9 @@ function messageToCode(message: string): number {
}

function supportedPtyPlatform() {
if (isWasm()) {
return false;
}
if (process.platform !== 'win32') {
return true;
}
Expand Down