2.0.2

minifyfromhtml.js

@@ -1,5 +1,6 @@
 let argv = require('minimist')(process.argv.slice(2));
 let fs = require('fs');
+let path = require('path');
 let Terser = require('terser');
 let CleanCSS = require('clean-css');
 let jsdom = require('jsdom');
@@ -71,8 +72,8 @@ readStdin(function(html) {
 				comments: false
 			},
 			sourceMap: {
-				filename: argv.js,
-				url: argv.js + '.map'
+				includeSources: true,
+				url: path.basename(outFile) + '.map'
 			}
 		};
 

node_modules/.bin/acorn

@@ -1,15 +1 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../acorn/bin/acorn" "$@"
-  ret=$?
-else 
-  node  "$basedir/../acorn/bin/acorn" "$@"
-  ret=$?
-fi
-exit $ret
+../acorn/bin/acorn

node_modules/acorn/dist/acorn.js

@@ -3206,7 +3206,8 @@
     if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l) {
       return c
     }
-    return (c << 10) + s.charCodeAt(i + 1) - 0x35FDC00
+    var next = s.charCodeAt(i + 1);
+    return next >= 0xDC00 && next <= 0xDFFF ? (c << 10) + next - 0x35FDC00 : c
   };
 
   RegExpValidationState.prototype.nextIndex = function nextIndex (i) {
@@ -3215,8 +3216,9 @@
     if (i >= l) {
       return l
     }
-    var c = s.charCodeAt(i);
-    if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l) {
+    var c = s.charCodeAt(i), next;
+    if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l ||
+        (next = s.charCodeAt(i + 1)) < 0xDC00 || next > 0xDFFF) {
       return i + 1
     }
     return i + 2

node_modules/acorn/dist/acorn.mjs

@@ -3200,7 +3200,8 @@ RegExpValidationState.prototype.at = function at (i) {
   if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l) {
     return c
   }
-  return (c << 10) + s.charCodeAt(i + 1) - 0x35FDC00
+  var next = s.charCodeAt(i + 1);
+  return next >= 0xDC00 && next <= 0xDFFF ? (c << 10) + next - 0x35FDC00 : c
 };
 
 RegExpValidationState.prototype.nextIndex = function nextIndex (i) {
@@ -3209,8 +3210,9 @@ RegExpValidationState.prototype.nextIndex = function nextIndex (i) {
   if (i >= l) {
     return l
   }
-  var c = s.charCodeAt(i);
-  if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l) {
+  var c = s.charCodeAt(i), next;
+  if (!this.switchU || c <= 0xD7FF || c >= 0xE000 || i + 1 >= l ||
+      (next = s.charCodeAt(i + 1)) < 0xDC00 || next > 0xDFFF) {
     return i + 1
   }
   return i + 2

node_modules/acorn/package.json

@@ -1,28 +1,28 @@
 {
-  "_from": "acorn@^6.0.4",
-  "_id": "acorn@6.4.0",
+  "_from": "acorn@6.4.1",
+  "_id": "acorn@6.4.1",
   "_inBundle": false,
-  "_integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+  "_integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
   "_location": "/acorn",
   "_phantomChildren": {},
   "_requested": {
-    "type": "range",
+    "type": "version",
     "registry": true,
-    "raw": "acorn@^6.0.4",
+    "raw": "acorn@6.4.1",
     "name": "acorn",
     "escapedName": "acorn",
-    "rawSpec": "^6.0.4",
+    "rawSpec": "6.4.1",
     "saveSpec": null,
-    "fetchSpec": "^6.0.4"
+    "fetchSpec": "6.4.1"
   },
   "_requiredBy": [
     "/acorn-globals",
     "/jsdom"
   ],
-  "_resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-  "_shasum": "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784",
-  "_spec": "acorn@^6.0.4",
-  "_where": "F:\\projects\\p\\minifyfromhtml\\node_modules\\jsdom",
+  "_resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+  "_shasum": "531e58ba3f51b9dacb9a6646ca4debf5b14ca474",
+  "_spec": "acorn@6.4.1",
+  "_where": "/home/s2/Code/minifyfromhtml/node_modules/jsdom",
   "bin": {
     "acorn": "bin/acorn"
   },
@@ -63,5 +63,5 @@
   "scripts": {
     "prepare": "cd ..; npm run build:main && npm run build:bin"
   },
-  "version": "6.4.0"
+  "version": "6.4.1"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "minifyfromhtml",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,9 +10,9 @@
       "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
     },
     "acorn": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-      "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw=="
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
     },
     "acorn-globals": {
       "version": "4.3.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minifyfromhtml",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "minify scripts and css starting from an html file",
   "main": "minifyfromhtml.js",
   "scripts": {