firefly-compiler 0.5.17 → 0.5.19

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.
Files changed (6) hide show
  1. package/compiler/Builder.ff +3 -4
  2. package/output/js/ff/compiler/Builder.mjs +6 -8
  3. package/package.json +1 -1
  4. package/vscode/package.json +1 -1
  5. package/core/.firefly/include/prepare.sh +0 -1
  6. package/postgresql/.firefly/include/prepare.sh +0 -2
package/compiler/Builder.ff CHANGED
@@ -71,10 +71,9 @@ processNodeModules(system: NodeSystem, jsPathFile: Path, packagePath: Path, info
71
71
  let includePath = packagePath.slash(".firefly").slash("include")
72
72
  let nodeModules = includePath.slash("node_modules")
73
73
  let packageJson = includePath.slash("package.json")
74
- let packageLockJson = includePath.slash("package-lock.json")
75
- if(!nodeModules.exists() && packageJson.exists() && packageLockJson.exists()) {
76
- system.writeErrorLine("Running npm ci --no-bin-links in " + includePath.absolute())
77
- system.execute("npm", ["ci", "--no-bin-links"], directory = Some(includePath))
74
+ if(!nodeModules.exists() && packageJson.exists()) {
75
+ system.writeErrorLine("Running npm install --no-package-lock --no-bin-links in " + includePath.absolute())
76
+ system.execute("npm", ["install", "--no-package-lock", "--no-bin-links"], directory = Some(includePath))
78
77
  }
79
78
  }
80
79
  }
package/output/js/ff/compiler/Builder.mjs CHANGED
@@ -170,10 +170,9 @@ return (_w1.path_ === "node_modules")
170
170
  const includePath_ = ff_core_Path.Path_slash(ff_core_Path.Path_slash(packagePath_, ".firefly"), "include");
171
171
  const nodeModules_ = ff_core_Path.Path_slash(includePath_, "node_modules");
172
172
  const packageJson_ = ff_core_Path.Path_slash(includePath_, "package.json");
173
- const packageLockJson_ = ff_core_Path.Path_slash(includePath_, "package-lock.json");
174
- if((((!ff_core_Path.Path_exists(nodeModules_, false, false, false)) && ff_core_Path.Path_exists(packageJson_, false, false, false)) && ff_core_Path.Path_exists(packageLockJson_, false, false, false))) {
175
- ff_core_NodeSystem.NodeSystem_writeErrorLine(system_, ("Running npm ci --no-bin-links in " + ff_core_Path.Path_absolute(includePath_)));
176
- ff_core_NodeSystem.NodeSystem_execute(system_, "npm", ["ci", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true)
173
+ if(((!ff_core_Path.Path_exists(nodeModules_, false, false, false)) && ff_core_Path.Path_exists(packageJson_, false, false, false))) {
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)
177
176
  }
178
177
  }
179
178
  }
@@ -385,10 +384,9 @@ return (_w1.path_ === "node_modules")
385
384
  const includePath_ = (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(packagePath_, ".firefly", $task)), "include", $task));
386
385
  const nodeModules_ = (await ff_core_Path.Path_slash$(includePath_, "node_modules", $task));
387
386
  const packageJson_ = (await ff_core_Path.Path_slash$(includePath_, "package.json", $task));
388
- const packageLockJson_ = (await ff_core_Path.Path_slash$(includePath_, "package-lock.json", $task));
389
- if((((!(await ff_core_Path.Path_exists$(nodeModules_, false, false, false, $task))) && (await ff_core_Path.Path_exists$(packageJson_, false, false, false, $task))) && (await ff_core_Path.Path_exists$(packageLockJson_, false, false, false, $task)))) {
390
- (await ff_core_NodeSystem.NodeSystem_writeErrorLine$(system_, ("Running npm ci --no-bin-links in " + (await ff_core_Path.Path_absolute$(includePath_, $task))), $task));
391
- (await ff_core_NodeSystem.NodeSystem_execute$(system_, "npm", ["ci", "--no-bin-links"], ff_core_Buffer.new_(0, false), ff_core_Option.Some(includePath_), ff_core_Option.None(), 16777216, 9, true, $task))
387
+ if(((!(await ff_core_Path.Path_exists$(nodeModules_, false, false, false, $task))) && (await ff_core_Path.Path_exists$(packageJson_, false, false, false, $task)))) {
388
+ (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, $task))
392
390
  }
393
391
  }
394
392
  }
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "description": "Firefly compiler",
5
5
  "author": "Firefly team",
6
6
  "license": "MIT",
7
- "version": "0.5.17",
7
+ "version": "0.5.19",
8
8
  "repository": {
9
9
  "type": "git",
10
10
  "url": "https://github.com/Ahnfelt/firefly-boot"
package/vscode/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "description": "Firefly language support",
5
5
  "author": "Firefly team",
6
6
  "license": "MIT",
7
- "version": "0.5.17",
7
+ "version": "0.5.19",
8
8
  "repository": {
9
9
  "type": "git",
10
10
  "url": "https://github.com/Ahnfelt/firefly-boot"
package/core/.firefly/include/prepare.sh DELETED
@@ -1 +0,0 @@
1
- npm install --no-bin-links esbuild
package/postgresql/.firefly/include/prepare.sh DELETED
@@ -1,2 +0,0 @@
1
- npm install
2
- echo "throw 'Native PG not available'" > node_modules/pg/lib/native/index.js