[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated: run build on prepare and pret
|
From: |
gnunet |
|
Subject: |
[taler-wallet-core] branch master updated: run build on prepare and pretty |
|
Date: |
Tue, 06 Dec 2022 19:24:46 +0100 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository wallet-core.
The following commit(s) were added to refs/heads/master by this push:
new 084b56f24 run build on prepare and pretty
084b56f24 is described below
commit 084b56f24bc2d23ec2a2b5a0988cd3c68cdbc565
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Tue Dec 6 15:24:36 2022 -0300
run build on prepare and pretty
---
packages/web-util/package.json | 4 +-
packages/web-util/src/cli.ts | 19 ++----
packages/web-util/src/index.browser.ts | 7 +--
packages/web-util/src/index.node.ts | 4 +-
packages/web-util/src/index.ts | 5 +-
packages/web-util/src/live-reload.ts | 4 +-
packages/web-util/src/serve.ts | 111 +++++++++++++++++----------------
packages/web-util/src/stories.html | 5 +-
8 files changed, 74 insertions(+), 85 deletions(-)
diff --git a/packages/web-util/package.json b/packages/web-util/package.json
index 969215f9f..53cd326ed 100644
--- a/packages/web-util/package.json
+++ b/packages/web-util/package.json
@@ -16,8 +16,8 @@
"./lib/index.node": "./lib/index.node.cjs"
},
"scripts": {
- "prepare": "tsc",
- "compile": "./build.mjs",
+ "prepare": "tsc && ./build.js",
+ "compile": "tsc && ./build.js",
"clean": "rimraf dist lib tsconfig.tsbuildinfo",
"pretty": "prettier --write src"
},
diff --git a/packages/web-util/src/cli.ts b/packages/web-util/src/cli.ts
index 59cfe9989..dca4fc664 100644
--- a/packages/web-util/src/cli.ts
+++ b/packages/web-util/src/cli.ts
@@ -1,10 +1,6 @@
-
-import {
- clk, setGlobalLogLevelFromString
-} from "@gnu-taler/taler-util";
+import { clk, setGlobalLogLevelFromString } from "@gnu-taler/taler-util";
import { serve } from "./serve.js";
-
export const walletCli = clk
.program("wallet", {
help: "Command line interface for the GNU Taler wallet.",
@@ -20,7 +16,7 @@ export const walletCli = clk
})
.flag("verbose", ["-V", "--verbose"], {
help: "Enable verbose output.",
- })
+ });
walletCli
.subcommand("serve", "serve", { help: "Create a server." })
@@ -39,12 +35,9 @@ walletCli
return serve({
folder: args.serve.folder || "./dist",
port: args.serve.port || 8000,
- development: args.serve.development
- })
- }
- );
-
-
+ development: args.serve.development,
+ });
+ });
declare const __VERSION__: string;
function printVersion(): void {
@@ -55,5 +48,3 @@ function printVersion(): void {
export function main(): void {
walletCli.run();
}
-
-
diff --git a/packages/web-util/src/index.browser.ts
b/packages/web-util/src/index.browser.ts
index 514a2ec42..3b3ab9293 100644
--- a/packages/web-util/src/index.browser.ts
+++ b/packages/web-util/src/index.browser.ts
@@ -1,9 +1,8 @@
-
//`ws://localhost:8003/socket`
export function setupLiveReload(wsURL: string | undefined) {
if (!wsURL) return;
const ws = new WebSocket(wsURL);
- ws.addEventListener('message', (message) => {
+ ws.addEventListener("message", (message) => {
const event = JSON.parse(message.data);
if (event.type === "LOG") {
console.log(event.message);
@@ -12,7 +11,7 @@ export function setupLiveReload(wsURL: string | undefined) {
window.location.reload();
}
if (event.type === "UPDATE") {
- const c = document.getElementById("container")
+ const c = document.getElementById("container");
if (c) {
document.body.removeChild(c);
}
@@ -35,4 +34,4 @@ export function setupLiveReload(wsURL: string | undefined) {
};
}
-export { renderStories, parseGroupImport } from "./stories.js"
+export { renderStories, parseGroupImport } from "./stories.js";
diff --git a/packages/web-util/src/index.node.ts
b/packages/web-util/src/index.node.ts
index 0ef65921b..d5111edf3 100644
--- a/packages/web-util/src/index.node.ts
+++ b/packages/web-util/src/index.node.ts
@@ -1,3 +1 @@
-export { serve } from "./serve.js"
-
-
+export { serve } from "./serve.js";
diff --git a/packages/web-util/src/index.ts b/packages/web-util/src/index.ts
index cf0c963ed..ff8b4c563 100644
--- a/packages/web-util/src/index.ts
+++ b/packages/web-util/src/index.ts
@@ -1,4 +1 @@
-
-
-
-export default {}
\ No newline at end of file
+export default {};
diff --git a/packages/web-util/src/live-reload.ts
b/packages/web-util/src/live-reload.ts
index bae0a5b84..ef4c6f2d6 100644
--- a/packages/web-util/src/live-reload.ts
+++ b/packages/web-util/src/live-reload.ts
@@ -15,7 +15,7 @@ function setupLiveReload(): void {
return;
}
} catch (e) {
- return
+ return;
}
console.log("unsupported", event);
});
@@ -29,7 +29,6 @@ function setupLiveReload(): void {
}
setupLiveReload();
-
function showReloadOverlay(): void {
const d = document.createElement("div");
d.style.position = "absolute";
@@ -49,4 +48,3 @@ function showReloadOverlay(): void {
document.body.appendChild(d);
}
}
-
diff --git a/packages/web-util/src/serve.ts b/packages/web-util/src/serve.ts
index 11cc6db39..736e57430 100644
--- a/packages/web-util/src/serve.ts
+++ b/packages/web-util/src/serve.ts
@@ -1,22 +1,19 @@
-import {
- Logger
-} from "@gnu-taler/taler-util";
-import chokidar from 'chokidar';
+import { Logger } from "@gnu-taler/taler-util";
+import chokidar from "chokidar";
import express from "express";
import https from "https";
-import { parse } from 'url';
-import WebSocket, { Server } from 'ws';
+import { parse } from "url";
+import WebSocket, { Server } from "ws";
-
-import locahostCrt from './keys/localhost.crt';
-import locahostKey from './keys/localhost.key';
-import storiesHtml from './stories.html';
+import locahostCrt from "./keys/localhost.crt";
+import locahostKey from "./keys/localhost.key";
+import storiesHtml from "./stories.html";
import path from "path";
const httpServerOptions = {
key: locahostKey,
- cert: locahostCrt
+ cert: locahostCrt,
};
const logger = new Logger("serve.ts");
@@ -26,42 +23,40 @@ const PATHS = {
NOTIFY: "/notify",
EXAMPLE: "/examples",
APP: "/app",
-}
+};
export async function serve(opts: {
- folder: string,
- port: number,
- source?: string,
- development?: boolean,
- examplesLocationJs?: string,
- examplesLocationCss?: string,
+ folder: string;
+ port: number;
+ source?: string;
+ development?: boolean;
+ examplesLocationJs?: string;
+ examplesLocationCss?: string;
onUpdate?: () => Promise<void>;
}): Promise<void> {
+ const app = express();
- const app = express()
-
- app.use(PATHS.APP, express.static(opts.folder))
- const server = https.createServer(httpServerOptions, app)
+ app.use(PATHS.APP, express.static(opts.folder));
+ const server = https.createServer(httpServerOptions, app);
server.listen(opts.port);
- logger.info(`serving ${opts.folder} on ${opts.port}`)
- logger.info(` ${PATHS.APP}: application`)
- logger.info(` ${PATHS.EXAMPLE}: examples`)
- logger.info(` ${PATHS.WS}: websocket`)
- logger.info(` ${PATHS.NOTIFY}: broadcast`)
+ logger.info(`serving ${opts.folder} on ${opts.port}`);
+ logger.info(` ${PATHS.APP}: application`);
+ logger.info(` ${PATHS.EXAMPLE}: examples`);
+ logger.info(` ${PATHS.WS}: websocket`);
+ logger.info(` ${PATHS.NOTIFY}: broadcast`);
if (opts.development) {
-
const wss = new Server({ noServer: true });
- wss.on('connection', function connection(ws) {
- ws.send('welcome');
+ wss.on("connection", function connection(ws) {
+ ws.send("welcome");
});
- server.on('upgrade', function upgrade(request, socket, head) {
+ server.on("upgrade", function upgrade(request, socket, head) {
const { pathname } = parse(request.url || "");
if (pathname === PATHS.WS) {
wss.handleUpgrade(request, socket, head, function done(ws) {
- wss.emit('connection', ws, request);
+ wss.emit("connection", ws, request);
});
} else {
socket.destroy();
@@ -73,36 +68,44 @@ export async function serve(opts: {
if (client.readyState === WebSocket.OPEN) {
client.send(JSON.stringify(data));
}
- })
- }
- const watchingFolder = opts.source ?? opts.folder
- logger.info(`watching ${watchingFolder} for change`)
+ });
+ };
+ const watchingFolder = opts.source ?? opts.folder;
+ logger.info(`watching ${watchingFolder} for change`);
- chokidar.watch(watchingFolder).on('change', (path, stats) => {
- logger.trace(`changed ${path}`)
+ chokidar.watch(watchingFolder).on("change", (path, stats) => {
+ logger.trace(`changed ${path}`);
- sendToAllClients({ type: 'file-updated-start', data: { path } })
+ sendToAllClients({ type: "file-updated-start", data: { path } });
if (opts.onUpdate) {
- opts.onUpdate().then(result => {
- sendToAllClients({ type: 'file-updated-done', data: { path, result }
})
- })
+ opts.onUpdate().then((result) => {
+ sendToAllClients({
+ type: "file-updated-done",
+ data: { path, result },
+ });
+ });
} else {
- sendToAllClients({ type: 'file-change-done', data: { path } })
+ sendToAllClients({ type: "file-change-done", data: { path } });
}
- })
+ });
app.get(PATHS.EXAMPLE, function (req: any, res: any) {
- res.set('Content-Type', 'text/html')
- res.send(storiesHtml
- .replace('__EXAMPLES_JS_FILE_LOCATION__', opts.examplesLocationJs ??
`.${PATHS.APP}/stories.js`)
- .replace('__EXAMPLES_CSS_FILE_LOCATION__', opts.examplesLocationCss ??
`.${PATHS.APP}/stories.css`))
- })
+ res.set("Content-Type", "text/html");
+ res.send(
+ storiesHtml
+ .replace(
+ "__EXAMPLES_JS_FILE_LOCATION__",
+ opts.examplesLocationJs ?? `.${PATHS.APP}/stories.js`,
+ )
+ .replace(
+ "__EXAMPLES_CSS_FILE_LOCATION__",
+ opts.examplesLocationCss ?? `.${PATHS.APP}/stories.css`,
+ ),
+ );
+ });
app.get(PATHS.NOTIFY, function (req: any, res: any) {
- res.send('ok')
- })
-
+ res.send("ok");
+ });
}
}
-
-
diff --git a/packages/web-util/src/stories.html
b/packages/web-util/src/stories.html
index 4c16ad2ff..b4a36fc19 100644
--- a/packages/web-util/src/stories.html
+++ b/packages/web-util/src/stories.html
@@ -3,7 +3,10 @@
<head>
<title>WebUtils: Stories</title>
<meta charset="utf-8" />
- <link rel="icon"
href="data:;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////7//v38//78/P/+/fz//vz7///+/v/+/f3//vz7///+/v/+/fz//v38///////////////////////+/v3///7+/////////////////////////////////////////////////////////v3//v79///////+/v3///////r28v/ct5//06SG/9Gffv/Xqo7/7N/V/9e2nf/bsJb/6uDW/9Sskf/euKH/+/j2///////+/v3//////+3azv+/eE3/2rWd/9Kkhv/V
[...]
+ <link
+ rel="icon"
+
href="data:;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////7//v38//78/P/+/fz//vz7///+/v/+/f3//vz7///+/v/+/fz//v38///////////////////////+/v3///7+/////////////////////////////////////////////////////////v3//v79///////+/v3///////r28v/ct5//06SG/9Gffv/Xqo7/7N/V/9e2nf/bsJb/6uDW/9Sskf/euKH/+/j2///////+/v3//////+3azv+/eE3/2rWd/9Kkhv/Vr5T/48i2/8J+VP/
[...]
+ />
<link
rel="stylesheet"
type="text/css"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-core] branch master updated: run build on prepare and pretty,
gnunet <=