refactor(repo): update dependencies. Changes in plugins

Masquerade-Circus · Sep 24, 2020 · b8c4f2b · b8c4f2b
1 parent 422e5c4
commit b8c4f2b
Show file tree

Hide file tree

Showing 13 changed files with 979 additions and 1,653 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,8 @@
 ### [4.3.2](https://github.com/Masquerade-Circus/valyrian.js/compare/4.3.1...4.3.2) (2020-08-05)
 
-
 ### Bug Fixes
 
-* **lib:** upgrade dependencies ([cc87ccd](https://github.com/Masquerade-Circus/valyrian.js/commit/cc87ccd218f9850de8c4f9f7b9599931d1ce451b))
+-   **lib:** upgrade dependencies ([cc87ccd](https://github.com/Masquerade-Circus/valyrian.js/commit/cc87ccd218f9850de8c4f9f7b9599931d1ce451b))
 
 ### [4.3.1](https://github.com/Masquerade-Circus/valyrian.js/compare/4.3.0...4.3.1) (2020-04-10)
 

diff --git a/dist/valyrian.min.js b/dist/valyrian.min.js
diff --git a/package.json b/package.json
@@ -34,7 +34,6 @@
     "dev:scratchpad": "cross-env NODE_ENV=development nodemon -w ./test -w ./lib -w ./plugins -w ./scratchpad.js --exec 'mocha --timeout 10000 --slow 0 --require @babel/register --require esm \"scratchpad.js\"'",
     "dev:test": "cross-env NODE_ENV=development nodemon -w ./test -w ./lib -w ./plugins --exec 'mocha --bail --timeout 10000 --slow 0 --require @babel/register --require esm \"test/**/*_test.js\"'",
     "dev:test:nyc": "cross-env NODE_ENV=development nodemon -w ./test -w ./lib -w ./plugins --exec 'nyc --reporter=text --reporter=lcov mocha --timeout 10000 --slow 0 --require @babel/register --require esm \"test/**/*_test.js\"'",
-    "dev": "run-all 'yarn dev:source' 'yarn dev:test'",
     "build": "yarn build:source && yarn remark",
     "build:source": "cross-env NODE_ENV=production node rollupSource.js",
     "test": "cross-env NODE_ENV=development nyc mocha --timeout 10000 --require @babel/register --require esm \"test/**/*_test.js\"",
@@ -46,54 +45,53 @@
   },
   "dependencies": {
     "clean-css": "^4.2.3",
-    "cssnano": "^4.1.10",
     "favicons": "^6.2.0",
     "form-data": "^3.0.0",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.6.1",
     "parse5": "^6.0.1",
-    "purgecss": "2.3.0"
+    "purgecss": "3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.0",
+    "@babel/core": "^7.11.6",
     "@babel/plugin-transform-react-jsx": "^7.10.4",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/register": "^7.10.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/register": "^7.11.5",
     "@istanbuljs/nyc-config-babel": "^3.0.0",
-    "@release-it/conventional-changelog": "^1.1.4",
+    "@release-it/conventional-changelog": "^2.0.0",
     "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-node-resolve": "^8.4.0",
+    "@rollup/plugin-commonjs": "^15.1.0",
+    "@rollup/plugin-node-resolve": "^9.0.0",
     "babel-eslint": "^10.1.0",
     "babel-plugin-istanbul": "^6.0.0",
     "compression": "^1.7.4",
     "coveralls": "^3.1.0",
     "cross-env": "^7.0.2",
-    "cz-conventional-changelog": "3.2.0",
-    "dayjs": "^1.8.31",
-    "eslint": "^7.6.0",
+    "cz-conventional-changelog": "3.3.0",
+    "dayjs": "^1.8.36",
+    "eslint": "^7.9.0",
     "eslint-plugin-sonarjs": "^0.5.0",
     "esm": "^3.2.25",
-    "expect": "^26.2.0",
-    "faker": "^4.1.0",
+    "expect": "^26.4.2",
+    "faker": "^5.1.0",
     "micro": "^9.3.4",
     "micro-ex-router": "^1.7.2",
-    "mocha": "^8.1.0",
-    "node-dev": "^5.1.0",
+    "mocha": "^8.1.3",
+    "node-dev": "^5.2.0",
     "nyc": "^15.1.0",
-    "release-it": "^13.6.6",
+    "release-it": "^14.0.3",
     "remark-cli": "^8.0.1",
     "remark-toc": "^7.0.0",
-    "rollup": "^2.23.0",
+    "rollup": "^2.28.1",
     "rollup-plugin-async": "^1.2.0",
     "rollup-plugin-filesize": "^9.0.2",
-    "rollup-plugin-includepaths": "^0.2.3",
+    "rollup-plugin-includepaths": "^0.2.4",
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-progress": "^1.1.2",
     "rollup-plugin-size-snapshot": "^0.12.0",
     "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-string": "^3.0.0",
-    "rollup-plugin-terser": "^6.1.0",
-    "yargs": "^15.4.1"
+    "rollup-plugin-terser": "^7.0.2",
+    "yargs": "^16.0.3"
   },
   "babel": {
     "presets": [
@@ -174,7 +172,6 @@
     }
   },
   "resolutions": {
-    "jpeg-js": "^0.4.0",
-    "dot-prop": "^5.1.1"
+    "minimist": ">=1.2.5"
   }
 }
diff --git a/plugins/hooks.js b/plugins/hooks.js
@@ -1,4 +1,4 @@
-let plugin = (v) => {
+let plugin = function (v) {
   let UND;
 
   v.createHook = function ({name, init, update, response}) {
@@ -91,4 +91,5 @@ let plugin = (v) => {
 
 };
 
-export default plugin;
+plugin.default = plugin;
+module.exports = plugin;
diff --git a/plugins/node.js b/plugins/node.js
@@ -1,15 +1,14 @@
 let fs = require('fs');
 let path = require('path');
 
-let cssnano = require('cssnano');
 let CleanCSS = require('clean-css');
 let {PurgeCSS} = require('purgecss');
 let fetch = require('node-fetch');
 let FormData = require('form-data');
 
 let {Document, parseHtml} = require('./utils/dom');
 let treeAdapter = require('./utils/tree-adapter');
-let requestPlugin = require('./request').default;
+let requestPlugin = require('./request');
 
 global.fetch = fetch;
 global.FormData = FormData;
@@ -31,113 +30,94 @@ function fileMethodFactory() {
       return prop;
     }
 
+    let contents = '';
     if (typeof file === 'string') {
-      if (/^https?:\/\//gi.test(file)) {
-        return v.request
-          .get(
-            file,
-            {},
-            {
-              headers: {
-                Accept: 'text/plain',
-                'Content-Type': 'text/plain'
-              }
-            }
-          )
-          .then((contents) => {
-            prop += contents;
-          });
-      }
-
-      return new Promise((resolve, reject) => {
-        fs.readFile(file, 'utf8', (err, contents) => {
-          if (err) {
-            return reject(err);
-          }
-
-          prop += contents;
-          resolve(prop);
-        });
-      });
+      contents = fs.readFileSync(file, 'utf8');
     }
 
     if (typeof file === 'object' && 'raw' in file) {
-      return prop += file.raw;
+      contents = file.raw;
     }
+
+    return prop += contents;
   };
 }
 
 function inline(...args) {
-  let promises = args.map((item) => {
+  return args.map((item) => {
     let ext = item.split('.').pop();
     if (!inline[ext]) {
       inline[ext] = fileMethodFactory();
     }
     return inline[ext](item);
   });
-
-  return Promise.all(promises);
 }
 
 inline.css = fileMethodFactory();
 inline.js = fileMethodFactory();
 
 inline.uncss = (function () {
   let prop = '';
-  return async function (renderedHtml, options = {}) {
+  return function (renderedHtml, options = {}) {
     if (!renderedHtml) {
       return prop;
     }
 
-    let opt = Object.assign(
-      {
+    let asyncMethod = async () => {
+      let opt = {
         minify: true,
         purgecssOptions: {},
-        cleanCssOptions: {}
-      },
-      options
-    );
+        cleanCssOptions: {},
+        ...options
+      };
 
-    opt.raw = inline.css();
+      opt.raw = inline.css();
 
-    let html = await Promise.all(renderedHtml);
+      let html = await Promise.all(renderedHtml);
 
-    let contents = html.map((item) => {
-      return {
-        raw: item.replace(/<script [^>]*><\/script>/gi, ''),
-        extension: 'html'
-      };
-    });
+      let contents = html.map((item) => {
+        return {
+          raw: item,
+          extension: 'html'
+        };
+      });
 
-    let purgecss = new PurgeCSS();
-    let output = await purgecss.purge({
-      content: contents,
-      css: [{raw: opt.raw}],
-      ...opt.purgecssOptions
-    });
+      let purgecss = new PurgeCSS();
+      let output = await purgecss.purge({
+        content: contents,
+        css: [{raw: opt.raw}],
+        fontFace: true,
+        keyframes: true,
+        variables: true,
+        whitelistPatterns: opt.ignore,
+        defaultExtractor: (content) => content.match(/[A-Za-z0-9-_/:@]*[A-Za-z0-9-_/]+/g) || [],
+        ...opt.purgecssOptions
+      });
 
-    prop = output[0].css;
-    if (!opt.minify) {
-      return prop;
-    }
+      prop = output[0].css;
+      if (!opt.minify) {
+        return prop;
+      }
 
-    prop = new CleanCSS({
-      level: {
-        1: {
-          // rounds pixel values to `N` decimal places; `false` disables rounding; defaults to `false`
-          roundingPrecision: 'all=3',
-          specialComments: 'none' // denotes a number of /*! ... */ comments preserved; defaults to `all`
+      prop = new CleanCSS({
+        level: {
+          1: {
+            // rounds pixel values to `N` decimal places; `false` disables rounding; defaults to `false`
+            roundingPrecision: 'all=3',
+            specialComments: 'none' // denotes a number of /*! ... */ comments preserved; defaults to `all`
+          },
+          2: {
+            restructureRules: true // controls rule restructuring; defaults to false
+          }
         },
-        2: {
-          restructureRules: true // controls rule restructuring; defaults to false
-        }
-      },
-      compatibility: 'ie11',
-      ...opt.cleanCssOptions
-    }).minify(prop).styles;
+        compatibility: 'ie11',
+        ...opt.cleanCssOptions
+      }).minify(prop).styles;
 
-    prop = (await cssnano.process(prop, {from: undefined})).css;
-    return prop;
+      return prop;
+    };
+
+    return asyncMethod();
   };
 }());
 
@@ -203,9 +183,8 @@ function parseDom(childNodes, depth = 1) {
     .join(',');
 }
 
-
 function htmlToHyperscript(html) {
-  return '[' + parseDom(parseHtml(html, {treeAdapter: treeAdapter})) + '\n]';
+  return `[${parseDom(parseHtml(html, {treeAdapter}))}\n]`;
 }
 
 function icons(source, configuration = {}) {
@@ -321,5 +300,5 @@ let plugin = function (v) {
   v.htmlToHyperscript = htmlToHyperscript;
 };
 
+plugin.default = plugin;
 module.exports = plugin;
-module.exports.default = module.exports;
diff --git a/plugins/request.js b/plugins/request.js
@@ -134,4 +134,5 @@ let plugin = function (v) {
   v.request = Request();
 };
 
-export default plugin;
+plugin.default = plugin;
+module.exports = plugin;
diff --git a/plugins/router.js b/plugins/router.js
@@ -280,4 +280,5 @@ let plugin = function (v) {
 
 };
 
-export default plugin;
+plugin.default = plugin;
+module.exports = plugin;
diff --git a/plugins/signals.js b/plugins/signals.js
@@ -1,4 +1,4 @@
-let plugin = (v) => {
+let plugin = function (v) {
   let signals = new Map();
 
   function makeUnsubscribe(subscriptions, computed, handler, cleanup) {
@@ -127,4 +127,5 @@ let plugin = (v) => {
 
 };
 
-export default plugin;
+plugin.default = plugin;
+module.exports = plugin;