fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-22 09:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Don't run npm install during tests

Browse Source 
Instead add a `package.json` and use `yarn run`.
This commit is contained in:
Alex Crichton
2018-03-02 14:20:05 -08:00
parent 31853ad0ba
commit 353794417c
7 changed files with 329 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
crates/test-support/src/lib.rs
View File

@ -71,35 +71,11 @@ pub fn project() -> Project {
import typescript from 'rollup-plugin-typescript2';
export default {
input: './run.ts',
plugins: [
typescript()
],
output: {
file: 'bundle.js',
format: 'cjs'
}
]
}
"#.to_string()),
("tsconfig.json".to_string(), r#"
{
"compilerOptions": {
"noEmitOnError": true,
"noImplicitAny": true,
"noImplicitThis": true,
"noUnusedParameters": true,
"noUnusedLocals": true,
"noImplicitReturns": true,
"strictFunctionTypes": true,
"strictNullChecks": true,
"alwaysStrict": true,
"strict": true,
"target": "es5"
}
}
"#.to_string()),
],
}
}
@ -116,40 +92,6 @@ pub fn root() -> PathBuf {
return me
}
fn rollup() -> PathBuf {
static INIT: Once = ONCE_INIT;
let mut me = env::current_exe().unwrap();
me.pop(); // chop off exe name
me.pop(); // chop off `deps`
me.pop(); // chop off `debug` / `release`
let install_dir = me.clone();
me.push("node_modules/rollup/bin/rollup");
INIT.call_once(|| {
if !me.exists() {
let mut npm = if cfg!(windows) {
let mut n = Command::new("cmd");
n.arg("/c").arg("npm");
n
} else {
Command::new("npm")
};
run(npm
.arg("install")
.arg("rollup")
.arg("rollup-plugin-typescript2")
.arg("typescript")
.arg("@types/node")
//.arg("@types/webassembly-js-api")
.current_dir(&install_dir), "npm");
assert!(me.exists());
}
});
return me
}
impl Project {
pub fn file(&mut self, name: &str, contents: &str) -> &mut Project {
self.files.push((name.to_string(), contents.to_string()));
@ -219,10 +161,20 @@ impl Project {
File::create(root.join("out_wasm.js")).unwrap()
.write_all(obj.js().as_bytes()).unwrap();
let mut cmd = Command::new("node");
cmd.arg(rollup())
.current_dir(&root)
.arg("-c");
let mut cmd = if cfg!(windows) {
let mut c = Command::new("cmd");
c.arg("/c");
c.arg("yarn");
c
} else {
Command::new("yarn")
};
cmd.arg("rollup")
.arg("-c").arg(root.join("rollup.config.js"))
.arg("-i").arg(root.join("run.ts"))
.arg("-f").arg("cjs")
.arg("-o").arg(root.join("bundle.js"))
.current_dir(&root);
run(&mut cmd, "node");
let mut cmd = Command::new("node");