nattoppet 2.0.3 → 2.1.0

package/native/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "nattoppet_native"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+web-view = { version = "0.7", features = ["edge"] }
+
+[target.'cfg(windows)'.build-dependencies]
+winres = "0.1"
+
+[package.metadata.winres]
+ProductName = "A nattoppet native app"

package/native/build.rs

@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+    let mut res = winres::WindowsResource::new();
+    res.set_icon("../icon.ico");
+    res.compile().unwrap();
+}
+
+#[cfg(not(windows))]
+fn main() {}

package/native/src/main.rs

@@ -0,0 +1,22 @@
+#![windows_subsystem = "windows"]
+
+use web_view::*;
+
+fn main() {
+    static HTML_CONTENT: &str = include_str!("../target/bundle.html");
+
+    web_view::builder()
+        .title("Nattoppet Native")
+        .content(Content::Html(HTML_CONTENT))
+        .size(600, 480)
+        .resizable(false)
+        .debug(cfg!(debug_assertions))
+        .user_data(())
+        .invoke_handler(handler)
+        .run()
+        .unwrap();
+}
+
+fn handler(webview: &mut WebView<()>, arg: &str) -> WVResult {
+    Ok(())
+}

package/nattoppet-dev.js

@@ -22,7 +22,7 @@ const done = () => {
 }
 
 const start = (init=false) => {
-    const child = cp.spawn(__dirname + '/nattoppet.js', [file])
+    const child = cp.spawn(__dirname + '/nattoppet.js', [file, '--dev'])
     let buffer = ''
     child.stdout.on('data', chunk => buffer += chunk)
     child.on('close', code => {

package/nattoppet-native.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+
+'use strict'
+
+const fs = require('fs')
+const cp = require('child_process')
+const path = require('path')
+
+const init = () => {
+    fs.mkdirSync('native')
+    fs.mkdirSync('native/src')
+    fs.mkdirSync('native/target')
+    fs.copyFileSync(path.join(__dirname, 'native', 'src', 'main.rs'), 'native/src/main.rs')
+    fs.copyFileSync(path.join(__dirname, 'native', 'build.rs'), 'native/build.rs')
+    fs.copyFileSync(path.join(__dirname, 'native', 'Cargo.toml'), 'native/Cargo.toml')
+}
+
+const bundle = () => {
+    const child = cp.spawnSync(__dirname + '/nattoppet.js', [process.argv[3]])
+    if (child.stderr.length) {
+        console.error(child.stderr.toString())
+    }
+    fs.writeFileSync('native/target/bundle.html', child.stdout)
+}
+
+const build = () => {
+    bundle()
+    const child = cp.spawn('cargo', ['build', '--release'], { cwd: 'native' })
+    child.stdout.pipe(process.stdout)
+    child.stderr.pipe(process.stderr)
+    child.on('exit', (code) => {
+        if (code != 0) {
+            console.error("Cargo exit with code: " + code)
+        } else {
+            console.log("building finished. Check native/target/release/")
+        }
+    })
+}
+
+const help = () => {
+    console.log("Usage: nattoppet-native [init|bundle|build]")
+}
+
+switch (process.argv[2]) {
+    case 'init': return init()
+    case 'bundle': return bundle()
+    case 'build': return build()
+    default: return help()
+}

package/nattoppet.js

@@ -12,7 +12,8 @@ const file = process.argv[2] || 0
 const dir = file ? path.dirname(path.resolve(file)) : process.cwd()
 const str = fs.readFileSync(file, 'utf8')
 const env = { ...stdlib, base_dir: dir }
-const out = minifier.minify(compiler.compile(str, env), {
+const raw = compiler.compile(str, env)
+const out = process.argv.includes('--dev', 1) ? raw : minifier.minify(raw, {
     collapseWhitespace: true,
     removeAttributeQuotes: true,
     removeComments: true,

package/package.json

@@ -2,7 +2,7 @@
   "name": "nattoppet",
   "description": "A tiny macro-based markup language for blogging",
   "author": "Shiwei Zhang <ylxdzsw@gmail.com>",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "dependencies": {
     "coffeescript": "^2.5.1",
     "html-minifier": "^4.0.0",
@@ -12,7 +12,8 @@
   },
   "bin": {
     "nattoppet": "./nattoppet.js",
-    "nattoppet-dev": "./nattoppet-dev.js"
+    "nattoppet-dev": "./nattoppet-dev.js",
+    "nattoppet-native": "./nattoppet-native.js"
   },
   "license": "MIT",
   "repository": "https://github.com/ylxdzsw/nattoppet.git"