npm - poops - Versions diffs - 1.0.13 → 1.0.15 - Mend

poops 1.0.13 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/README.md +10 -16
package/example/dist/css/styles.css +1 -1
package/example/dist/css/styles.min.css +2 -5
package/example/dist/js/scripts.js +1 -1
package/example/dist/js/scripts.min.js +2 -2
package/example/src/markup/_layouts/layout.html +2 -2
package/example/src/markup/_partials/header.html +1 -0
package/example/src/markup/index.html +3 -0
package/index.html +5 -4
package/lib/markups.js +26 -8
package/lib/scripts.js +13 -20
package/lib/styles.js +21 -19
package/lib/utils/helpers.js +15 -13
package/package.json +2 -6
package/poops.js +2 -2
package/script/publish +18 -10
package//360/237/222/251.json +1 -2

package/example/dist/js/scripts.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* poops v1.0.13 | https://github.com/stamat/poops | MIT License */
+/* poops v1.0.15 | https://github.com/stamat/poops | MIT License */
 "use strict";
 (() => {
   // example/src/js/scripts/utils.ts

package/example/dist/js/scripts.min.js CHANGED Viewed

@@ -1,2 +1,2 @@
-/* poops v1.0.13 | https://github.com/stamat/poops | MIT License */
-"use strict";(()=>{var e;new class{constructor(e,t){this.name=e,this.age=t}greet(){console.log(`Hello, my name is ${this.name} and I am ${this.age} years old.`)}}("Stamat",(new Date).getFullYear()-1988).greet(),console.log((e="hello").charAt(0).toUpperCase()+e.slice(1)),console.log([1,2,3,4,5].reduce(((e,t)=>e+t),0));var t,a=new Date;console.log(`${(t=a).getFullYear()}-${`${t.getMonth()+1}`.padStart(2,"0")}-${`${t.getDate()}`.padStart(2,"0")}`)})();
+/* poops v1.0.15 | https://github.com/stamat/poops | MIT License */
+"use strict";(()=>{function o(e){return e.charAt(0).toUpperCase()+e.slice(1)}function n(e){return e.reduce((t,a)=>t+a,0)}function r(e){const t=e.getFullYear(),a=`${e.getMonth()+1}`.padStart(2,"0"),u=`${e.getDate()}`.padStart(2,"0");return`${t}-${a}-${u}`}var l=class{constructor(e,t){this.name=e,this.age=t}greet(){console.log(`Hello, my name is ${this.name} and I am ${this.age} years old.`)}},s=new l("Stamat",new Date().getFullYear()-1988);s.greet(),console.log(o("hello")),console.log(n([1,2,3,4,5]));var c=new Date;console.log(r(c))})();

package/example/src/markup/_layouts/layout.html CHANGED Viewed

@@ -7,12 +7,11 @@
   <meta name="description" content="{{ site.description }}">
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link rel="stylesheet" href="example/dist/css/styles.css">
+  <link rel="stylesheet" href="example/dist/css/styles.min.css">
   <link href="https://fonts.googleapis.com/css2?family=DM+Sans&family=Poppins:wght@700&display=swap" rel="stylesheet">
   <script src="https://cdn.jsdelivr.net/npm/canvas-confetti@1.5.1/dist/confetti.browser.min.js"></script>
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/styles/atom-one-dark.min.css">
   <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/highlight.min.js"></script>
-  <script type="text/javascript" src="example/dist/js/scripts.js"></script>
 </head>
 <body>
   {% block content %} {% endblock %}
@@ -88,5 +87,6 @@
     explode();
   </script>
   <script>hljs.highlightAll();</script>
+  <script async type="text/javascript" src="example/dist/js/scripts.min.js"></script>
 </body>
 </html>

package/example/src/markup/_partials/header.html CHANGED Viewed

@@ -2,6 +2,7 @@
   <h1><span id="poop"><img src="poop.png" alt="💩" width="160" height="160" class="d-block"></span><br>POOPS v{{package.version}}</h1>
   <a href="https://www.npmjs.com/package/poops"><img src="https://img.shields.io/badge/npm-CB3837.svg?style=for-the-badge&logo=npm&logoColor=white" alt="npm"></a> <a href="https://github.com/stamat/poops"><img src="https://img.shields.io/badge/GitHub-181717.svg?style=for-the-badge&logo=GitHub&logoColor=white" alt="github"></a>
   <p class="p2">{{ site.description }}</p>
+  <p class="p2">{{ page.subtitle }}</p>
   <div class="col-12 col-md-8 col-lg-5 mx-auto">
     <pre><code class="language-js text-left rounded-6 terminal">npm i poops</code></pre>

package/example/src/markup/index.html CHANGED Viewed

@@ -1,3 +1,6 @@
+---
+subtitle: ✨ <strong>Now supports Front Matter!</strong> ✨
+---
 {% extends "layout.html" %}
 {% block content %}

package/index.html CHANGED Viewed

@@ -7,19 +7,19 @@
   <meta name="description" content="Straightforward, no-bullshit bundler for the web.">
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link rel="stylesheet" href="example/dist/css/styles.css">
+  <link rel="stylesheet" href="example/dist/css/styles.min.css">
   <link href="https://fonts.googleapis.com/css2?family=DM+Sans&family=Poppins:wght@700&display=swap" rel="stylesheet">
   <script src="https://cdn.jsdelivr.net/npm/canvas-confetti@1.5.1/dist/confetti.browser.min.js"></script>
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/styles/atom-one-dark.min.css">
   <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/highlight.min.js"></script>
-  <script type="text/javascript" src="example/dist/js/scripts.js"></script>
 </head>
 <body>
   <header class="mt-32 container text-center">
-  <h1><span id="poop"><img src="poop.png" alt="💩" width="160" height="160" class="d-block"></span><br>POOPS v1.0.13</h1>
+  <h1><span id="poop"><img src="poop.png" alt="💩" width="160" height="160" class="d-block"></span><br>POOPS v1.0.15</h1>
   <a href="https://www.npmjs.com/package/poops"><img src="https://img.shields.io/badge/npm-CB3837.svg?style=for-the-badge&logo=npm&logoColor=white" alt="npm"></a> <a href="https://github.com/stamat/poops"><img src="https://img.shields.io/badge/GitHub-181717.svg?style=for-the-badge&logo=GitHub&logoColor=white" alt="github"></a>
   <p class="p2">Straightforward, no-bullshit bundler for the web.</p>
+  <p class="p2">✨ <strong>Now supports Front Matter!</strong> ✨</p>
   <div class="col-12 col-md-8 col-lg-5 mx-auto">
     <pre><code class="language-js text-left rounded-6 terminal">npm i poops</code></pre>
@@ -74,7 +74,7 @@
   <script>document.write('<script src="http://'
     + (location.host || 'localhost').split(':')[0]
-    + ':35730/livereload.js?snipver=1"></'
+    + ':35729/livereload.js?snipver=1"></'
     + 'script>')</script>
@@ -142,5 +142,6 @@
     explode();
   </script>
   <script>hljs.highlightAll();</script>
+  <script async type="text/javascript" src="example/dist/js/scripts.min.js"></script>
 </body>
 </html>

package/lib/markups.js CHANGED Viewed

@@ -29,8 +29,12 @@ class RelativeLoader extends nunjucks.Loader {
       throw new Error(`Template not found: ${name}`)
     }
-    // TODO: Here we can interpret header yaml and pass it as a context, just like Jekyll does
-    const source = fs.readFileSync(fullPath, 'utf-8')
+    let source = fs.readFileSync(fullPath, 'utf-8')
+    const match = source.match(/^\s*---\s*([\s\S]*?)---\s*/)
+    if (match) {
+      source = source.slice(match[0].length) // Remove front matter
+    }
     return { src: source, path: fullPath, noCache: true }
   }
@@ -63,6 +67,10 @@ module.exports = class Markups {
       return str.trim().toLowerCase().replace(/[^a-z0-9]+/g, '-')
     })
+    this.nunjucksEnv.addFilter('jsonify', obj => {
+      return JSON.stringify(obj)
+    })
     // Load global variables
     const pkgPath = path.join(process.cwd(), 'package.json')
@@ -82,8 +90,6 @@ module.exports = class Markups {
     this.loadDataFiles(this.config.markup.data)
-    this.payload = {} // TODO: still not used. This is where we can store data from data files. Can be used to pass front matter data or even a way to pass data from files to templates
     if (!this.config.markup.out) {
       this.config.markup.out = process.cwd()
     }
@@ -108,7 +114,7 @@ module.exports = class Markups {
         const dataDir = pathIsDirectory(this.config.markup.in) ? this.config.markup.in : path.dirname(this.config.markup.in)
         const data = readDataFile(path.join(process.cwd(), dataDir, dataFile))
         const globalKeyName = path.basename(dataFile, path.extname(dataFile)).replace(/[.\-\s]/g, '_')
-        // TODO: should support YAML too. There should be a way to define the data file per template through front matter
         promises.push(this.nunjucksEnv.addGlobal(globalKeyName, data))
       } catch (err) {
         console.log(`${pstyle.redBright + pstyle.bold}[error]${pstyle.reset}${pstyle.dim} Data file not found:${pstyle.reset} ${pstyle.italic + pstyle.underline}${dataFile}${pstyle.reset}`)
@@ -141,7 +147,19 @@ module.exports = class Markups {
     return `!(${markupDefaultExcludes.join('|')})/**/*.+(html|njk)`
   }
-  compileEntry(templateName, context) {
+  compileEntry(templateName) {
+    const source = fs.readFileSync(templateName, 'utf-8')
+    const match = source.match(/^\s*---\s*([\s\S]*?)---\s*/) // Front matter match
+    const context = { page: {} }
+    if (match) {
+      try {
+        context.page = require('yaml').parse(match[1]) // Pass front matter to the template
+      } catch (err) {
+        console.log(`${pstyle.redBright + pstyle.bold}[error]${pstyle.reset}${pstyle.dim} Failed parsing front matter:${pstyle.reset} ${pstyle.italic + pstyle.underline}${templateName}${pstyle.reset}`)
+        console.log(err)
+      }
+    }
     const env = this.nunjucksEnv
     return new Promise((resolve, reject) => {
       env.getTemplate(templateName).render(context, (error, result) => {
@@ -176,7 +194,7 @@ module.exports = class Markups {
           fs.mkdirSync(markupOutDir, { recursive: true })
         }
-        const compilePromise = this.compileEntry(file, this.payload).then((result) => {
+        const compilePromise = this.compileEntry(file).then((result) => {
           fs.writeFileSync(markupOut, result)
         })
         compilePromises.push(compilePromise)
@@ -193,7 +211,7 @@ module.exports = class Markups {
         })
       })
     } else {
-      return this.compileEntry(markupIn, this.pkg).then((result) => {
+      return this.compileEntry(markupIn).then((result) => {
         fs.writeFileSync(path.join(process.cwd(), this.config.markup.out, path.basename(markupIn)), result)
         console.log(`${pstyle.cyanBright + pstyle.bold}[markup]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${path.relative(process.cwd(), path.join(process.cwd(), this.config.markup.out, path.basename(markupIn)))}${pstyle.reset}`)
       }).catch((err) => {

package/lib/scripts.js CHANGED Viewed

@@ -1,9 +1,8 @@
-const { buildSync } = require('esbuild')
+const { build, transform } = require('esbuild')
 const deepmerge = require('deepmerge')
 const helpers = require('./utils/helpers.js')
 const fs = require('node:fs')
 const PrintStyle = require('./utils/print-style.js')
-const Terser = require('terser')
 const {
   pathExists,
@@ -49,10 +48,6 @@ module.exports = class Scripts {
       nodePaths: this.config.includePaths // Resolve `includePaths`
     }
-    const terserOpts = {
-      mangle: false
-    }
     if (this.banner) {
       opts.banner = {
         js: this.banner,
@@ -75,20 +70,16 @@ module.exports = class Scripts {
     if (options.nodePaths) opts.nodePaths = [...new Set([...opts.nodePaths, ...options.nodePaths])]
     if (options.sourcemap) opts.sourcemap = options.sourcemap
-    if (options.mangle) terserOpts.mangle = options.mangle
     const optionsClone = { ...options }
     delete optionsClone.justMinified
     delete optionsClone.minify
-    delete optionsClone.mangle
     // TODO: Use my own implementation of deepmerge to reduce dependencies, and also my own deepclone
     deepmerge(opts, optionsClone) // ability to pass other esbuild options `node_modules/esbuild/lib/main.d.ts`
-    // TODO: Actually loop the build process for each entry point!!!
     const esbuildStart = performance.now()
     try {
-      buildSync(opts)
+      await build(opts)
     } catch (err) {
       console.log(`${pstyle.yellowBright + pstyle.bold}[script]${pstyle.reset} ${pstyle.redBright}[error]${pstyle.reset} ${pstyle.dim}Failed compiling:${pstyle.reset} ${pstyle.italic + pstyle.underline}${outfilePath}${pstyle.reset + pstyle.bell}`)
       console.log(err)
@@ -103,25 +94,27 @@ module.exports = class Scripts {
       if (options.sourcemap) console.log(`${pstyle.yellowBright + pstyle.bold}[script]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${newOutFilePath}.map${pstyle.reset}`)
       if (options.minify) {
-        // TODO: Use esbuild transformSync instead of Terser here. Make sync things great again!
-        const terserStart = performance.now()
-        const minifyResult = await Terser.minify(fs.readFileSync(newOutFilePath, 'utf-8'), terserOpts)
-        const terserEnd = performance.now()
+        try {
+          const terserStart = performance.now()
+          const minifyResult = await transform(fs.readFileSync(newOutFilePath, 'utf-8'), {
+            minify: true,
+            loader: 'js'
+          })
+          const terserEnd = performance.now()
-        if (minifyResult.error) {
-          console.log(`${pstyle.yellowBright + pstyle.bold}[script]${pstyle.reset} ${pstyle.redBright}[error]${pstyle.reset} ${pstyle.dim}Failed compiling:${pstyle.reset} ${pstyle.italic + pstyle.underline}${minPath}${pstyle.reset + pstyle.bell}`)
-          console.log(minifyResult.error)
-        } else {
           if (this.banner) minifyResult.code = this.banner + '\n' + minifyResult.code
           fs.writeFileSync(minPath, minifyResult.code)
           console.log(`${pstyle.yellowBright + pstyle.bold}[script]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${minPath}${pstyle.reset} ${pstyle.greenBright}${fileSize(minPath)}${pstyle.reset} ${pstyle.green}(${buildTime(terserStart, terserEnd)})${pstyle.reset}`)
+        } catch (err) {
+          console.log(`${pstyle.yellowBright + pstyle.bold}[script]${pstyle.reset} ${pstyle.redBright}[error]${pstyle.reset} ${pstyle.dim}Failed compiling:${pstyle.reset} ${pstyle.italic + pstyle.underline}${minPath}${pstyle.reset + pstyle.bell}`)
+          console.log(err)
         }
         if (options.justMinified) {
           fs.unlinkSync(newOutFilePath)
         }
       } else {
-        fs.unlinkSync(minPath)
+        if (pathExists(minPath)) fs.unlinkSync(minPath)
       }
     }
   }

package/lib/styles.js CHANGED Viewed

@@ -1,10 +1,8 @@
-const autoprefixer = require('autoprefixer')
-const cssnano = require('cssnano')
+const { transform } = require('esbuild')
 const fs = require('node:fs')
 const helpers = require('./utils/helpers.js')
 const path = require('node:path')
 const { pathToFileURL } = require('node:url')
-const postcss = require('postcss')
 const sass = require('sass')
 const PrintStyle = require('./utils/print-style.js')
@@ -107,7 +105,7 @@ module.exports = class Styles {
     outfilePath = buildStyleOutputFilePath(infilePath, outfilePath, options)
-    const cssStart = performance.now()
+    const stylesStart = performance.now()
     let compiledSass
     try {
       compiledSass = sass.compile(infilePath, opts)
@@ -116,39 +114,43 @@ module.exports = class Styles {
       console.log(err)
       return
     }
     const mapsrc = options.sourcemap ? `\n/*# sourceMappingURL=${path.basename(outfilePath)}.map */` : ''
     if (this.banner) compiledSass.css = this.banner + '\n' + compiledSass.css
     fs.writeFileSync(outfilePath, compiledSass.css + mapsrc)
-    const cssEnd = performance.now()
-    if (!options.justMinified) console.log(`${pstyle.magentaBright + pstyle.bold}[style]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${outfilePath}${pstyle.reset} ${pstyle.greenBright}${fileSize(outfilePath)}${pstyle.reset} ${pstyle.green}(${buildTime(cssStart, cssEnd)})${pstyle.reset}`)
+    const stylesEnd = performance.now()
+    if (!options.justMinified) console.log(`${pstyle.magentaBright + pstyle.bold}[style]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${outfilePath}${pstyle.reset} ${pstyle.greenBright}${fileSize(outfilePath)}${pstyle.reset} ${pstyle.green}(${buildTime(stylesStart, stylesEnd)})${pstyle.reset}`)
     if (compiledSass.sourceMap) {
       if (this.banner) compiledSass.sourceMap.mappings = ';' + compiledSass.sourceMap.mappings
       fs.writeFileSync(`${outfilePath}.map`, JSON.stringify(compiledSass.sourceMap))
       console.log(`${pstyle.magentaBright + pstyle.bold}[style]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${outfilePath}.map${pstyle.reset}`)
     }
-    const cssMinStart = performance.now()
     const minPath = insertMinSuffix(outfilePath)
     if (options.minify) {
-      // TODO: Consider dropping postcss in favor of esbuild.transformSync. We don't need autoprefixer, let's prefix on our own.
-      await postcss([autoprefixer, cssnano]).process(compiledSass.css, {
-        from: outfilePath,
-        to: minPath
-      }).then(result => {
-        if (this.banner) result.css = this.banner + '\n' + result.css
-        fs.writeFileSync(minPath, result.css)
-        const cssMinEnd = performance.now()
-        console.log(`${pstyle.magentaBright + pstyle.bold}[style]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${minPath}${pstyle.reset} ${pstyle.greenBright}${fileSize(minPath)}${pstyle.reset} ${pstyle.green}(${buildTime(cssMinStart, cssMinEnd)})${pstyle.reset}`)
-      }).catch((err) => {
+      try {
+        const stylesMinStart = !options.justMinified ? performance.now() : stylesStart
+        const minified = await transform(compiledSass.css, {
+          loader: 'css',
+          minify: true
+        })
+        if (this.banner) minified.code = this.banner + '\n' + minified.code
+        fs.writeFileSync(minPath, minified.code)
+        const stylesMinEnd = performance.now()
+        console.log(`${pstyle.magentaBright + pstyle.bold}[style]${pstyle.reset} ${pstyle.dim}Compiled:${pstyle.reset} ${pstyle.italic + pstyle.underline}${minPath}${pstyle.reset} ${pstyle.greenBright}${fileSize(minPath)}${pstyle.reset} ${pstyle.green}(${buildTime(stylesMinStart, stylesMinEnd)})${pstyle.reset}`)
+      } catch (err) {
         console.log(`${pstyle.magentaBright + pstyle.bold}[style]${pstyle.reset} ${pstyle.redBright}[error]${pstyle.reset} ${pstyle.dim}Failed compiling:${pstyle.reset} ${pstyle.italic + pstyle.underline}${minPath}${pstyle.reset + pstyle.bell}`)
         console.log(err)
-      })
+      }
       if (options.justMinified) {
         fs.unlinkSync(outfilePath)
       }
     } else {
-      fs.unlinkSync(minPath)
+      if (pathExists(minPath)) fs.unlinkSync(minPath)
     }
   }
 }

package/lib/utils/helpers.js CHANGED Viewed

@@ -83,16 +83,18 @@ function readDataFile(filePath) {
   return fs.readFileSync(filePath, 'utf8')
 }
-exports.pathExists = pathExists
-exports.pathIsDirectory = pathIsDirectory
-exports.mkPath = mkPath
-exports.pathForFile = pathForFile
-exports.insertMinSuffix = insertMinSuffix
-exports.buildStyleOutputFilePath = buildStyleOutputFilePath
-exports.buildScriptOutputFilePath = buildScriptOutputFilePath
-exports.fillBannerTemplate = fillBannerTemplate
-exports.buildTime = buildTime
-exports.fileSize = fileSize
-exports.readJsonFile = readJsonFile
-exports.readYamlFile = readYamlFile
-exports.readDataFile = readDataFile
+module.exports = {
+  pathExists,
+  pathIsDirectory,
+  mkPath,
+  pathForFile,
+  insertMinSuffix,
+  buildStyleOutputFilePath,
+  buildScriptOutputFilePath,
+  fillBannerTemplate,
+  buildTime,
+  fileSize,
+  readJsonFile,
+  readYamlFile,
+  readDataFile
+}

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "poops",
   "description": "Straightforward, no-bullshit bundler for the web.",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "license": "MIT",
   "main": "poops.js",
   "repository": "https://github.com/stamat/poops.git",
@@ -26,20 +26,16 @@
     "lint": "eslint ./poops.js"
   },
   "dependencies": {
-    "autoprefixer": "^10.4.14",
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",
-    "cssnano": "^6.0.1",
     "deepmerge": "^4.3.1",
-    "esbuild": "^0.18.4",
+    "esbuild": "^0.19.3",
     "glob": "^10.3.1",
     "livereload": "^0.9.3",
     "nunjucks": "^3.2.4",
     "portscanner": "^2.2.0",
-    "postcss": "^8.4.24",
     "sass": "^1.63.4",
     "serve-static": "^1.15.0",
-    "terser": "^5.18.0",
     "yaml": "^2.3.1"
   },
   "devDependencies": {

package/poops.js CHANGED Viewed

@@ -86,7 +86,7 @@ for (let i = 0; i < args.length; i++) {
 }
 let configPath = path.join(cwd, defaultConfigPath)
-if (!pathExists(configPath)) configPath = path.join(cwd, '💩.json') //TODO: Ok dude, I know it's late, but you can do better than this.
+if (!pathExists(configPath)) configPath = path.join(cwd, '💩.json') // TODO: Ok dude, I know it's late, but you can do better than this.
 // Main function 💩
 async function poops() {
@@ -127,7 +127,7 @@ async function poops() {
       exclusions: [...new Set(lrExcludes)],
       port: lport
     })
-    console.log(`${pstyle.blue + pstyle.bold}[info]${pstyle.reset} ${pstyle.dim}🔃 LiveReload server:${pstyle.reset} ${pstyle.italic + pstyle.underline}http://localhost:${lrserver.config.port}${pstyle.reset}`)
+    console.log(`${pstyle.blue + pstyle.bold}[info]${pstyle.reset} ${pstyle.dim}🔃 LiveReload server:${pstyle.reset} ${pstyle.italic + pstyle.underline}http://localhost:${lrserver.config.port}${pstyle.reset}\n`)
     lrserver.watch(cwd)
   }

package/script/publish CHANGED Viewed

@@ -14,7 +14,7 @@ const readline = require('readline')
 const { exec } = require('child_process')
 const fs = require('fs')
 const path = require('path')
-let version = process.argv[2]
+const argVersion = process.argv[2]
 const packageJson = require(path.join(process.cwd(), './package.json'))
 function question(prompt) {
@@ -102,29 +102,37 @@ async function init() {
     process.exit(1)
   }
-  if (version && !isValidVersion(version)) {
-    console.log('Invalid version: ', version)
+  if (argVersion && !isValidVersion(argVersion)) {
+    console.log('Invalid version: ', argVersion)
     console.log('Current version: ', packageJson.version)
     process.exit(1)
   }
-  if (version && packageJson.version === version) {
-    console.log('Version is already ', version)
+  if (argVersion && packageJson.version === argVersion) {
+    console.log('Version is already ', argVersion)
     process.exit(1)
   }
-  if (!version) {
+  if (!argVersion) {
     console.log('Current version: ', packageJson.version)
-    version = incrementPatchVersion(packageJson.version)
+    const version = incrementPatchVersion(packageJson.version)
     const answer = await question(`Do you want to increment the version to ${version}? (y/n) `)
     if (answer === 'y') {
       publish(version)
     } else {
-      console.log('Aborted')
-      process.exit(0)
+      const desiredVersion = await question(`Enter the desired version: (or press enter to use ${packageJson.version})`)
+      if (desiredVersion.trim() === '') {
+        publish(packageJson.version)
+      } else {
+        if (!isValidVersion(desiredVersion)) {
+          console.log('Invalid version: ', desiredVersion)
+          process.exit(1)
+        }
+        publish(desiredVersion)
+      }
     }
   } else {
-    publish(version)
+    publish(argVersion)
   }
 }
 init()

package//360/237/222/251.json CHANGED Viewed

@@ -7,8 +7,7 @@
       "minify": true,
       "justMinified": false,
       "format": "iife",
-      "target": "es2019",
-      "mangle": true
+      "target": "es2019"
     }
   }],
   "styles": [{