firefly-compiler 0.5.29 → 0.5.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/compiler/Builder.ff
CHANGED
|
@@ -73,9 +73,14 @@ processNodeModules(system: NodeSystem, jsPathFile: Path, packagePath: Path, info
|
|
|
73
73
|
let packageJson = includePath.slash("package.json")
|
|
74
74
|
if(!nodeModules.exists() && packageJson.exists()) {
|
|
75
75
|
system.writeErrorLine("Running npm install --no-package-lock --no-bin-links in " + includePath.absolute())
|
|
76
|
-
system.execute("npm", [
|
|
76
|
+
let result = system.execute("npm", [
|
|
77
77
|
"install", "--no-package-lock", "--no-bin-links"
|
|
78
78
|
], directory = Some(includePath), shell = True)
|
|
79
|
+
if(result.exitCode != 0) {
|
|
80
|
+
system.writeErrorLine("Running npm failed with exit code " + result.exitCode + ":")
|
|
81
|
+
system.writeErrorBuffer(result.standardOut)
|
|
82
|
+
system.writeErrorBuffer(result.standardError)
|
|
83
|
+
}
|
|
79
84
|
}
|
|
80
85
|
}
|
|
81
86
|
}
|
|
@@ -172,7 +172,12 @@ const nodeModules_ = ff_core_Path.Path_slash(includePath_, "node_modules");
|
|
|
172
172
|
const packageJson_ = ff_core_Path.Path_slash(includePath_, "package.json");
|
|
173
173
|
if(((!ff_core_Path.Path_exists(nodeModules_, false, false, false)) && ff_core_Path.Path_exists(packageJson_, false, false, false))) {
|
|
174
174
|
ff_core_NodeSystem.NodeSystem_writeErrorLine(system_, ("Running npm install --no-package-lock --no-bin-links in " + ff_core_Path.Path_absolute(includePath_)));
|
|
175
|
-
ff_core_NodeSystem.NodeSystem_execute(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, true)
|
|
175
|
+
const result_ = ff_core_NodeSystem.NodeSystem_execute(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, true);
|
|
176
|
+
if((result_.exitCode_ !== 0)) {
|
|
177
|
+
ff_core_NodeSystem.NodeSystem_writeErrorLine(system_, (("Running npm failed with exit code " + result_.exitCode_) + ":"));
|
|
178
|
+
ff_core_NodeSystem.NodeSystem_writeErrorBuffer(system_, result_.standardOut_);
|
|
179
|
+
ff_core_NodeSystem.NodeSystem_writeErrorBuffer(system_, result_.standardError_)
|
|
180
|
+
}
|
|
176
181
|
}
|
|
177
182
|
}
|
|
178
183
|
}
|
|
@@ -386,7 +391,12 @@ const nodeModules_ = (await ff_core_Path.Path_slash$(includePath_, "node_modules
|
|
|
386
391
|
const packageJson_ = (await ff_core_Path.Path_slash$(includePath_, "package.json", $task));
|
|
387
392
|
if(((!(await ff_core_Path.Path_exists$(nodeModules_, false, false, false, $task))) && (await ff_core_Path.Path_exists$(packageJson_, false, false, false, $task)))) {
|
|
388
393
|
(await ff_core_NodeSystem.NodeSystem_writeErrorLine$(system_, ("Running npm install --no-package-lock --no-bin-links in " + (await ff_core_Path.Path_absolute$(includePath_, $task))), $task));
|
|
389
|
-
(await ff_core_NodeSystem.NodeSystem_execute$(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, true, $task))
|
|
394
|
+
const result_ = (await ff_core_NodeSystem.NodeSystem_execute$(system_, "npm", ["install", "--no-package-lock", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, true, $task));
|
|
395
|
+
if((result_.exitCode_ !== 0)) {
|
|
396
|
+
(await ff_core_NodeSystem.NodeSystem_writeErrorLine$(system_, (("Running npm failed with exit code " + result_.exitCode_) + ":"), $task));
|
|
397
|
+
(await ff_core_NodeSystem.NodeSystem_writeErrorBuffer$(system_, result_.standardOut_, $task));
|
|
398
|
+
(await ff_core_NodeSystem.NodeSystem_writeErrorBuffer$(system_, result_.standardError_, $task))
|
|
399
|
+
}
|
|
390
400
|
}
|
|
391
401
|
}
|
|
392
402
|
}
|
package/package.json
CHANGED