firefly-compiler 0.5.19 → 0.5.21
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/bin/Release.ff +2 -1
- package/compiler/Builder.ff +5 -1
- package/fireflysite/Main.ff +1 -1
- package/output/js/ff/compiler/Builder.mjs +8 -0
- package/package.json +1 -1
- package/vscode/package.json +1 -1
package/bin/Release.ff
CHANGED
|
@@ -148,6 +148,7 @@ internalMakeTarGz(tarGzPath: Path, path: Path): Unit
|
|
|
148
148
|
cwd: path_,
|
|
149
149
|
filter: (path, stat) =>
|
|
150
150
|
!path.includes(".firefly/output") &&
|
|
151
|
-
!path.includes(".firefly/temporary")
|
|
151
|
+
!path.includes(".firefly/temporary") &&
|
|
152
|
+
!path.includes(".firefly/include/node_modules")
|
|
152
153
|
}, ["."]);
|
|
153
154
|
"""
|
package/compiler/Builder.ff
CHANGED
|
@@ -62,7 +62,11 @@ processIncludes(jsPathFile: Path, packagePath: Path, info: PackageInfo) {
|
|
|
62
62
|
info.includes.each {include =>
|
|
63
63
|
let fromPath = packagePath.slash(".firefly").slash("include").slash(include.path)
|
|
64
64
|
let toPath = jsPathFile.slash(info.package.packagePair.groupName("/")).slash(include.path)
|
|
65
|
-
|
|
65
|
+
try {
|
|
66
|
+
toPath.createSymlinkTo(fromPath)
|
|
67
|
+
} catchAny {_ =>
|
|
68
|
+
fromPath.copyTo(toPath)
|
|
69
|
+
}
|
|
66
70
|
}
|
|
67
71
|
}
|
|
68
72
|
|
package/fireflysite/Main.ff
CHANGED
|
@@ -83,7 +83,7 @@ browserMain(system: BrowserSystem): Unit {
|
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
buildMain(system: BuildSystem) {
|
|
86
|
-
let browser = system.compileForBrowser("Main.ff")
|
|
86
|
+
let browser = system.compileForBrowser("Main.ff").bundle()
|
|
87
87
|
let assets = AssetSystem.create()
|
|
88
88
|
.addAssets("/js/", browser.assets())
|
|
89
89
|
.addAssets("/assets/", system.packageAssets().assets("/assets/"))
|
|
@@ -159,7 +159,11 @@ for(let for_i = 0, for_a = info_.includes_, for_l = for_a.length; for_i < for_l;
|
|
|
159
159
|
const include_ = for_a[for_i];
|
|
160
160
|
const fromPath_ = ff_core_Path.Path_slash(ff_core_Path.Path_slash(ff_core_Path.Path_slash(packagePath_, ".firefly"), "include"), include_.path_);
|
|
161
161
|
const toPath_ = ff_core_Path.Path_slash(ff_core_Path.Path_slash(jsPathFile_, ff_compiler_Syntax.PackagePair_groupName(info_.package_.packagePair_, "/")), include_.path_);
|
|
162
|
+
ff_core_Try.Try_catchAny(ff_core_Core.try_((() => {
|
|
163
|
+
ff_core_Path.Path_createSymlinkTo(toPath_, fromPath_)
|
|
164
|
+
})), ((_) => {
|
|
162
165
|
ff_core_Path.Path_copyTo(fromPath_, toPath_, 0, 100)
|
|
166
|
+
}))
|
|
163
167
|
}
|
|
164
168
|
}
|
|
165
169
|
|
|
@@ -373,7 +377,11 @@ for(let for_i = 0, for_a = info_.includes_, for_l = for_a.length; for_i < for_l;
|
|
|
373
377
|
const include_ = for_a[for_i];
|
|
374
378
|
const fromPath_ = (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(packagePath_, ".firefly", $task)), "include", $task)), include_.path_, $task));
|
|
375
379
|
const toPath_ = (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(jsPathFile_, ff_compiler_Syntax.PackagePair_groupName(info_.package_.packagePair_, "/"), $task)), include_.path_, $task));
|
|
380
|
+
(await ff_core_Try.Try_catchAny$((await ff_core_Core.try_$((async ($task) => {
|
|
381
|
+
(await ff_core_Path.Path_createSymlinkTo$(toPath_, fromPath_, $task))
|
|
382
|
+
}), $task)), (async (_, $task) => {
|
|
376
383
|
(await ff_core_Path.Path_copyTo$(fromPath_, toPath_, 0, 100, $task))
|
|
384
|
+
}), $task))
|
|
377
385
|
}
|
|
378
386
|
}
|
|
379
387
|
|
package/package.json
CHANGED