@antora/cli - npm Package Compare versions

Comparing version 3.0.0-beta.1 to 3.0.0-beta.2

lib/cli.js

@@ -1,3 +0,1 @@
-#!/usr/bin/env node
-
 'use strict'
@@ -8,3 +6,2 @@
 const convict = require('@antora/playbook-builder/lib/solitary-convict')
-const { configureLogger, getLogger, finalizeLogger } = require('@antora/logger')
 const ospath = require('path')
@@ -21,7 +18,9 @@ const userRequire = require('@antora/user-require-helper')
 function exitWithError (err, opts, msg = undefined) {
+  const { getLogger, configureLogger } = requireLogger()
   if (!msg) msg = err.message || err
   const name = msg.startsWith('asciidoctor: FAILED: ') ? (msg = msg.slice(21)) && 'asciidoctor' : cli.name()
-  const logger = getLogger(null)
-    ? getLogger(name)
-    : configureLogger({ format: 'pretty', level: opts.silent ? 'silent' : 'fatal', failureLevel: 'fatal' }).get(name)
+  if (!getLogger(null)) {
+    configureLogger({ format: 'pretty', level: opts.silent ? 'silent' : 'fatal', failureLevel: 'fatal' })
+  }
+  const logger = getLogger(name)
   if (opts.stacktrace) {
@@ -52,3 +51,5 @@ let loc, stack
 function exit () {
-  return finalizeLogger().then((failOnExit) => process.exit(failOnExit ? 1 : process.exitCode))
+  return requireLogger()
+    .finalizeLogger()
+    .then((failOnExit) => process.exit(failOnExit ? 1 : process.exitCode))
 }
@@ -64,2 +65,12 @@
 
+function requireLogger (fromPath = undefined, moduleName = '@antora/logger') {
+  try {
+    return (
+      requireLogger.cache ||
+      (requireLogger.cache = fromPath ? userRequire(moduleName, { paths: [fromPath] }) : require(moduleName))
+    )
+  } catch {}
+  return fromPath && (requireLogger.cache = require(moduleName))
+}
+
 cli
@@ -125,8 +136,11 @@ .allowExcessArguments(false)
     const args = command.optionArgs.concat('--playbook', playbookFile)
-    let playbook
+    let generator, generatorPath, playbook
     try {
       playbook = buildPlaybook(args, process.env, buildPlaybook.defaultSchema, (config) => {
         try {
-          configureLogger(config.getModel('runtime.log'), playbookDir)
+          generatorPath = userRequire.resolve((generator = config.get('antora.generator')), userRequireContext)
         } catch {}
+        try {
+          requireLogger(generatorPath).configureLogger(config.getModel('runtime.log'), playbookDir)
+        } catch {}
       })
@@ -136,7 +150,6 @@ } catch (err) {
     }
-    const generator = playbook.antora.generator
     let generateSite
     try {
       generateSite =
-        (generateSite = userRequire(generator, userRequireContext)).length === 1
+        (generateSite = require(generatorPath || userRequire.resolve(generator, userRequireContext))).length === 1
           ? generateSite.bind(null, playbook)
@@ -143,0 +156,0 @@ : generateSite.bind(null, args, process.env)

package.json

 {
   "name": "@antora/cli",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "The command line interface for Antora.",
@@ -16,3 +16,3 @@ "license": "MPL-2.0",
   },
-  "main": "lib/cli.js",
+  "main": "lib/index.js",
   "bin": {
@@ -22,4 +22,4 @@ "antora": "bin/antora"
   "dependencies": {
-    "@antora/logger": "3.0.0-beta.1",
-    "@antora/playbook-builder": "3.0.0-beta.1",
+    "@antora/logger": "3.0.0-beta.2",
+    "@antora/playbook-builder": "3.0.0-beta.2",
     "@antora/user-require-helper": "~2.0",
@@ -29,3 +29,3 @@ "commander": "~8.3"
   "devDependencies": {
-    "@antora/site-publisher": "3.0.0-beta.1",
+    "@antora/site-publisher": "3.0.0-beta.2",
     "convict": "~6.2",
@@ -49,3 +49,3 @@ "kapok-js": "~0.10"
   ],
-  "gitHead": "7c5ef1ea93dd489af533c80a936c736013c41769"
+  "gitHead": "5cd3f9cc70622e465cb44daf1aa2035ed5a35f54"
 }

New alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

29357

increased by3.43%

Number of package files

9

increased by12.5%

Lines of code

241

increased by12.09%

Worsened metrics

Number of low supply chain risk alerts

10

increased by42.86%

Dependency changes

• + Added@antora/logger@3.0.0-beta.2(transitive)

• + Added@antora/playbook-builder@3.0.0-beta.2(transitive)

• + Addedfastify-warning@0.2.0(transitive)

• + Addedget-caller-file@2.0.5(transitive)

• + Addedon-exit-leak-free@0.2.0(transitive)

• + Addedpino@7.2.0(transitive)

• + Addedpino-pretty@7.2.0(transitive)

• + Addedpino-std-serializers@4.0.0(transitive)

• + Addedreal-require@0.1.0(transitive)

• + Addedsafe-stable-stringify@2.5.0(transitive)

• + Addedthread-stream@0.13.2(transitive)

• - Removed@antora/logger@3.0.0-beta.1(transitive)

• - Removed@antora/playbook-builder@3.0.0-beta.1(transitive)

• - Removedduplexify@4.1.3(transitive)

• - Removedflatstr@1.0.12(transitive)

• - Removedpino@6.13.4(transitive)

• - Removedpino-abstract-transport@0.4.0(transitive)

• - Removedpino-pretty@7.1.0(transitive)

• - Removedpino-std-serializers@3.2.0(transitive)

• - Removedprocess-warning@1.0.0(transitive)

• - Removedsonic-boom@1.4.1(transitive)

• - Removedsplit2@3.2.2(transitive)

• - Removedstream-shift@1.0.3(transitive)

• Updated@antora/logger@3.0.0-beta.2

• Updated@antora/playbook-builder@3.0.0-beta.2