pub-server 2.11.2 → 2.12.0

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2015-2022 Jürgen Leschner -- github.com/jldec
+Copyright (c) 2015-2024 Jürgen Leschner -- github.com/jldec
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -48,7 +48,7 @@ npm install -g pub-server
 - `pub -h` shows the usage info below:
 
 ```
-pub-server v2.9.0
+pub-server v2.12.0
 
 usage: pub [opts] [dir]
 opts:
@@ -57,6 +57,7 @@ opts:
   -t, --theme <name>       theme module-name or dir, repeatable (default: [])
   -o, --output-path <dir>  output dir [./out]
   -O, --output-only        output html, scripts, static files and exit
+  -g, --migrate            migrate markdown to output dir in outputs[1]
   -r, --root <prefix>      generate /prefix urls, "." means path relative
   -s, --static <dir>       static dir, repeatable, supports <dir>,<route> (default: [])
   -S, --static-only <dir>  serve only static files from <dir> (default: [])

package/bin/_pub.js

@@ -2,7 +2,7 @@
 
 /*
  * pub command script
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 var pkg = require('../package.json');
@@ -32,6 +32,7 @@ cli
   .option('-t, --theme <name>',      'theme module-name or dir, repeatable', collect, [])
   .option('-o, --output-path <dir>', 'output dir [./out]')
   .option('-O, --output-only',       'output html, scripts, static files and exit')
+  .option('-g, --migrate',           'migrate markdown to output dir in outputs[1]')
   .option('-r, --root <prefix>',     'generate /prefix urls, "." means path relative')
   .option('-s, --static <dir>',      'static dir, repeatable, supports <dir>,<route>', collectStaticPaths, [])
   .option('-S, --static-only <dir>', 'serve only static files from <dir>', collectStaticPaths, [])
@@ -61,6 +62,7 @@ if (cli.root === '.')              { opts.relPaths = true; }
 else if (cli.root)                 { opts.staticRoot = cli.root; }
 if (cli.outputPath)                { opts.outputs = cli.outputPath; }
 if (cli.outputOnly)                { opts.outputOnly = true; }
+if (cli.migrate)                   { opts.migrate = true; }
 if (cli.static.length)             { opts.staticPaths = cli.static; }
 if (cli.staticOnly.length)         { opts.staticOnly = cli.staticOnly; }
 if (cli.mdFragments)               { opts.fragmentDelim = 'md-headings'; }

package/client/_generator.js

@@ -5,7 +5,7 @@
  * served at /pub/_generator.js by serve-scripts.js
  * depends on jquery
  *
- * Copyright (c) 2015-2022, Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
 */
 
 /* global $ */

package/client/init-opts.js

@@ -7,7 +7,7 @@
  * possibly by directing browser to gatekeeper for auth roundabout
  * TODO: implement a mechanism to force re-authentication (logout gatekeeper)
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
 */
 
 /* global $ */
@@ -48,31 +48,6 @@ module.exports = function initOpts(cb) {
 
       opts.sources.forEach(function(source) {
         opts.source$[source.name] = source;
-
-        // connect to static editor sources: github or dropbox
-        if (opts.staticHost && source.staticSrc) {
-          if (source.gatekeeper) {
-            var append = ab.asyncAppend();
-            debug('authenticating ' + source.gatekeeper);
-            $.getJSON(source.gatekeeper + '/status' + location.search)
-              .fail(function(jqXHR) { append(new Error(jqXHR.responseText)); })
-              .done(function(status) {
-
-                // if not logged in, send browser to gatekeeper for oauth
-                if (!status || !status.access_token) {
-                  location.assign(source.gatekeeper +
-                    '?ref=' + encodeURIComponent(location.href));
-                }
-                // finally we can create the source adapter to save to
-                else {
-                  source.auth = status;
-                  source.src = require(source.staticSrc)(source);
-                }
-                debug(status);
-                append(status);
-              });
-          }
-        }
       });
       ab.complete();
 

package/client/pub-sockets.js

@@ -4,7 +4,7 @@
  * connect/disconnect socket.io
  *
  * TODO: consolidate with socket.io script
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
 */
 
 /* global io */

package/client/pub-ux.js

@@ -2,7 +2,7 @@
  * pub-ux.js
  * browserify entry point for legacy pub-pkg-editor
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
 */
 
 /* global $ */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pub-server",
-  "version": "2.11.2",
+  "version": "2.12.0",
   "description": "markdown site generator, web server, and editor",
   "main": "server.js",
   "preferGlobal": true,
@@ -8,41 +8,41 @@
     "pub": "./bin/pub.js"
   },
   "dependencies": {
-    "asyncbuilder": "^1.0.10",
-    "body-parser": "^1.20.1",
+    "asyncbuilder": "^1.1.1",
+    "body-parser": "^1.20.2",
     "browserify": "^17.0.0",
-    "chokidar": "^3.5.3",
+    "chokidar": "^3.6.0",
     "commander": "^2.20.0",
     "compression": "^1.7.4",
-    "debug": "^4.3.4",
-    "express": "^4.18.2",
-    "fs-extra": "^11.1.0",
+    "debug": "^4.3.6",
+    "express": "^4.19.2",
+    "fs-extra": "^11.2.0",
     "mime": "^3.0.0",
-    "pub-generator": "^4.3.4",
-    "pub-pkg-editor": "^2.0.4",
+    "pub-generator": "^4.4.0",
+    "pub-pkg-editor": "^2.2.0",
     "pub-pkg-font-awesome": "^3.0.5",
     "pub-pkg-font-open-sans": "^1.5.1",
-    "pub-pkg-google-oauth": "^2.1.3",
+    "pub-pkg-google-oauth": "^2.2.0",
     "pub-pkg-highlight": "^11.4.0",
     "pub-pkg-jquery": "^1.12.4",
     "pub-pkg-prism": "^2.0.5",
-    "pub-pkg-seo": "^1.2.3",
-    "pub-resolve-opts": "^1.9.4",
-    "pub-serve-sessions": "^1.3.1",
-    "pub-src-fs": "^2.1.3",
-    "pub-src-github": "^2.0.1",
-    "pub-src-http": "^1.2.1",
-    "pub-src-redis": "^2.1.1",
-    "pub-theme-doc": "^1.1.15",
-    "pub-util": "^3.2.1",
+    "pub-pkg-seo": "^1.3.0",
+    "pub-resolve-opts": "^1.10.0",
+    "pub-serve-sessions": "^2.0.0",
+    "pub-src-fs": "^2.2.0",
+    "pub-src-github": "^2.1.0",
+    "pub-src-http": "^2.0.0",
+    "pub-src-redis": "^2.2.0",
+    "pub-theme-doc": "^1.2.0",
+    "pub-util": "^3.3.0",
     "send": "^0.18.0",
-    "socket.io": "^4.5.4",
+    "socket.io": "^4.7.5",
     "through2": "^4.0.2",
-    "uglify-es": "^3.3.9"
+    "uglify-js": "^3.19.3"
   },
   "devDependencies": {
-    "eslint": "^8.26.0",
-    "tape": "^5.6.1"
+    "eslint": "^8.57.0",
+    "tape": "^5.8.1"
   },
   "files": [
     "bin/",

package/server/handle-errors.js

@@ -4,7 +4,7 @@
  * - this should be the last handler loaded by the server
  * - depends on serve-pages being invoked before this
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 /*eslint no-unused-vars: "off"*/

package/server/serve-pages.js

@@ -5,7 +5,7 @@
  * with page http-headers, checks http methods
  * also serves redirects
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 var debug = require('debug')('pub:server:pages');

package/server/serve-scripts.js

@@ -8,7 +8,7 @@
  *   server optional, if not passed, no routes served
  *   serveStatics.outputAll() - copy scripts to outputs[0] (for pub -O)
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 /* eslint no-empty: ["error", { "allowEmptyCatch": true }] */
@@ -17,7 +17,7 @@ var debug = require('debug')('pub:scripts');
 var u = require('pub-util');
 var through = require('through2');
 var fspath = require('path'); // for platform specific path.join
-var uglify = require('uglify-es');
+var uglify = require('uglify-js');
 var asyncbuilder = require('asyncbuilder');
 var browserify = require('browserify');
 
@@ -172,7 +172,7 @@ module.exports = function serveScripts(opts) {
         }
         files.push( { path:script.route, text:str } );
         filemap.push( { path:script.route } );
-        log('output script: %s (%d bytes, %d ms)', script.route, str.length, time());
+        log('output script: %s (%d bytes, %d ms)', script.route, str?.length || 0, time());
         scriptDone(null, script.route);
       });
     });

package/server/serve-sockets.js

@@ -5,7 +5,7 @@
  * primary purpose (for now) is for watchers to trigger page reload
  * does nothing if opts.no-sockets is set (and disabled on production)
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 

package/server/serve-statics.js

@@ -18,7 +18,7 @@
  *       extend to serve files from remote storage
  *       (supports only local files for now)
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 var debug = require('debug')('pub:static');
@@ -194,7 +194,7 @@ module.exports = function serveStatics(opts, cb) {
     // try straight match
     var spo = file$[reqPath];
 
-    if (!spo && !/\/$|\.[^/]+$/.test(reqPath)) {
+    if (!spo && !/\/$/.test(reqPath)) {
 
       // try adding trailing / and redirect if found
       if (self.trailingSlash) {

package/server/watch-sources.js

@@ -1,7 +1,7 @@
 /*
  * pub-server watch-sources.js
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 var watch = require('./watch');

package/server/watch.js

@@ -4,7 +4,7 @@
  * used by serve-statics and watch-sources
  * TODO: dedup watches and look at aggregating watch paths with single watch
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 var debug = require('debug')('pub:watch');

package/server.js

@@ -5,7 +5,7 @@
  * invoke directly via node command line, or via require()
  * see: https://nodejs.org/api/modules.html#modules_accessing_the_main_module
  *
- * Copyright (c) 2015-2022 Jürgen Leschner - github.com/jldec - MIT license
+ * Copyright (c) 2015-2024 Jürgen Leschner - github.com/jldec - MIT license
  */
 
 var debug = require('debug')('pub:server');
@@ -84,6 +84,23 @@ function pubServer(opts) {
       return;
     }
 
+    if (opts.migrate) {
+
+      // only support single output for now
+      let output =  opts.outputs[1];
+      if (!output) return log('No 2nd output (opts.output[1]) configured.');
+
+      generator.load(function(err) {
+        if (err) return log(err);
+        generator.migratePages(output, function(err) {
+          if (err) { log(err); }
+          generator.unload();
+        });
+      });
+
+      return;
+    }
+
     generator.load(function(err) {
       if (err) return log(err);