kiss-lang/kiss
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

close #36

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-08-12 14:33:33 -06:00
parent 8135389944
commit 290a5e7de1
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/kiss/CompilerTools.hx
View File

@@ -134,7 +134,35 @@ class CompilerTools {
case JavaScript:
command = "node";
scriptExt = "js";
// npm install outputfolder
// npm install outputfolder
if (args.langProjectFile != null) {
// This can only be done in the current working directory, so the project file needs to be moved here
// Move existing package.json, package-lock.json, node_modules out of the way:
function move(file, newName) {
if (FileSystem.exists(file)) {
FileSystem.rename(file, newName);
}
}
move("package.json", "package.json.temp");
move("package-lock.json", "package-lock.json.temp");
move("node_modules", "node_modules.temp");
File.copy(args.langProjectFile, "package.json");
if (Sys.systemName() == "Windows") {
Prelude.assertProcess("cmd.exe", ["/c", 'npm', 'install']);
} else {
Prelude.assertProcess("npm", ['install']);
}
FileSystem.deleteFile("package.json");
move("node_modules", Prelude.joinPath(args.outputFolder, "node_modules"));
move("package-lock.json", Prelude.joinPath(args.outputFolder, "package-lock.json"));
move("package.json.temp", "package.json");
move("package-lock.json.temp", "package-lock.json");
move("node_modules.temp", "node_modules");
}
case Python:
command = "python";
scriptExt = "py";

2
src/test/cases/CompilerToolsTestCase.hx
View File

@@ -29,7 +29,7 @@ class CompilerToolsTestCase extends Test {
return CompilerTools.compileFileToScript(
"kiss/template/src/template/Main.kiss", JavaScript, {
outputFolder: "bin/helloWorldJsTestWithPackageJson",
// langProjectFile: "kiss/src/test/files/package.json"
langProjectFile: "kiss/src/test/files/package.json"
});
}