Renaming yebool to espresso-iisojs

This commit is contained in:
Zaid Abdulla committed 2020-09-08 20:11:00 -07:00
1 parent 0b60406b43
commit a6f9e3d0de
4 files changed
+20 -16

No files matched your search

+9 -5
View File
@@ -81,7 +81,7 @@ const externals = [
"codemirror/mode/yaml/yaml", "codemirror/mode/yaml/yaml",
"ipaddr.js", "ipaddr.js",
"jsbi", "jsbi",
"yebool", "espresso-iisojs",
]; ];
function rmDirSync(dirPath): void { function rmDirSync(dirPath): void {
@@ -297,7 +297,7 @@ async function generateFrontendJs(): Promise<void> {
const inputFile = path.resolve(INPUT_DIR, "ui/app.ts"); const inputFile = path.resolve(INPUT_DIR, "ui/app.ts");
const outputFile = path.resolve(OUTPUT_DIR, "public/app.js"); const outputFile = path.resolve(OUTPUT_DIR, "public/app.js");
const inlineDeps = ["mithril", "parsimmon", "jsbi", "yebool"]; const inlineDeps = ["mithril", "parsimmon", "jsbi", "espresso-iisojs"];
const bundle = await rollup({ const bundle = await rollup({
input: inputFile, input: inputFile,
external: externals.filter((e) => !inlineDeps.includes(e)), external: externals.filter((e) => !inlineDeps.includes(e)),
@@ -306,10 +306,14 @@ async function generateFrontendJs(): Promise<void> {
{ {
name: "", name: "",
resolveId: function (importee, importer) { resolveId: function (importee, importer) {
if (importee.endsWith("/bigint")) if (importee.endsWith("/bigint")) {
return this.resolve(importee + "-jsbi", importer); return this.resolve(importee + "-jsbi", importer);
else if (importee === "yebool") } else if (importee === "espresso-iisojs") {
return this.resolve("yebool/dist/yebool-jsbi.mjs", importer); return this.resolve(
"espresso-iisojs/dist/espresso-iisojs-jsbi.mjs",
importer
);
}
return null; return null;
}, },
}, },
+1 -1
View File
@@ -18,7 +18,7 @@
*/ */
import * as BI from "./bigint"; import * as BI from "./bigint";
import { espresso, complement, tautology } from "yebool"; import { espresso, complement, tautology } from "espresso-iisojs";
import { Expression } from "../types"; import { Expression } from "../types";
import { map } from "./expression-parser"; import { map } from "./expression-parser";
import { and, evaluateCallback } from "./expression"; import { and, evaluateCallback } from "./expression";
+8 -8
View File
@@ -3385,6 +3385,14 @@
} }
} }
}, },
"espresso-iisojs": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/espresso-iisojs/-/espresso-iisojs-1.0.3.tgz",
"integrity": "sha512-VOu80fa4cEH5RVJ0Qqe+EcJKvDxVYWYyUsXybXXAsCTxO5CTvNSb0A5rhVSlp7++zCFg+r03FRUVgsXq6y6kVQ==",
"requires": {
"jsbi": "^3.1.3"
}
},
"esprima": { "esprima": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
@@ -9470,14 +9478,6 @@
"decamelize": "^1.2.0" "decamelize": "^1.2.0"
} }
}, },
"yebool": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/yebool/-/yebool-1.0.2.tgz",
"integrity": "sha512-3sgfZ1jSZNWyU5Xu0uIlA98tNl/Aj1sZVt89qZL4IXJVNG2+eWF4hp9NzQrOng6nO/ohvIPnzbIfp8qtBykBfw==",
"requires": {
"jsbi": "^3.1.3"
}
},
"ylru": { "ylru": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz", "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz",
+2 -2
View File
@@ -20,6 +20,7 @@
"tools": "tools" "tools": "tools"
}, },
"dependencies": { "dependencies": {
"espresso-iisojs": "^1.0.3",
"iconv-lite": "^0.6.2", "iconv-lite": "^0.6.2",
"ipaddr.js": "^2.0.0", "ipaddr.js": "^2.0.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
@@ -33,8 +34,7 @@
"mongodb": "^3.6.0", "mongodb": "^3.6.0",
"parsimmon": "^1.16.0", "parsimmon": "^1.16.0",
"seedrandom": "^3.0.5", "seedrandom": "^3.0.5",
"yaml": "^1.10.0", "yaml": "^1.10.0"
"yebool": "^1.0.2"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^15.0.0", "@rollup/plugin-commonjs": "^15.0.0",