@adobe/htlengine 6.3.5 → 6.4.0

package/.eslintrc.js

@@ -29,6 +29,7 @@ module.exports = {
   extends: 'airbnb-base',
   rules: {
     strict: 0,
+    'import/extensions': 0,
 
     // allow dangling underscores for 'fields'
     'no-underscore-dangle': ['error', { allowAfterThis: true }],

package/CHANGELOG.md

@@ -1,3 +1,33 @@
+# [6.4.0](https://github.com/adobe/htlengine/compare/v6.3.8...v6.4.0) (2021-12-16)
+
+
+### Features
+
+* trigger release ([a426c0a](https://github.com/adobe/htlengine/commit/a426c0a7ab41736a17d64dd321b69e34ad93d2ed))
+
+## [6.3.8](https://github.com/adobe/htlengine/compare/v6.3.7...v6.3.8) (2021-07-26)
+
+
+### Bug Fixes
+
+* use node 12 for release ([362ff07](https://github.com/adobe/htlengine/commit/362ff072816d75d308d9fdaa25307e2d80cfcb75))
+* use nodejs url instead of urijs ([821e0d9](https://github.com/adobe/htlengine/commit/821e0d97973975522d04ef1636ab994cfc1cacbd))
+* **deps:** update external major ([#327](https://github.com/adobe/htlengine/issues/327)) ([b2450d5](https://github.com/adobe/htlengine/commit/b2450d57ff833c22d50d41a98c210890c68fcc1e))
+
+## [6.3.7](https://github.com/adobe/htlengine/compare/v6.3.6...v6.3.7) (2021-02-16)
+
+
+### Bug Fixes
+
+* **deps:** update dependency xregexp to v5 ([#310](https://github.com/adobe/htlengine/issues/310)) ([e9ee1cd](https://github.com/adobe/htlengine/commit/e9ee1cda43b8564d3134d2c6556344fd2cc6cae2))
+
+## [6.3.6](https://github.com/adobe/htlengine/compare/v6.3.5...v6.3.6) (2021-02-13)
+
+
+### Bug Fixes
+
+* **deps:** update dependency urijs to v1.19.6 ([704baed](https://github.com/adobe/htlengine/commit/704baed842f66eda6276841aee64dc5290980a42))
+
 ## [6.3.5](https://github.com/adobe/htlengine/compare/v6.3.4...v6.3.5) (2021-02-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/htlengine",
-  "version": "6.3.5",
+  "version": "6.4.0",
   "description": "Javascript Based HTL (Sightly) parser",
   "main": "src/index.js",
   "license": "Apache-2.0",
@@ -9,7 +9,7 @@
     "url": "https://github.com/adobe/htlengine.git"
   },
   "engines": {
-    "node": ">=12.11.1 <15.0"
+    "node": ">=14"
   },
   "scripts": {
     "build": "npm run build:compile && npm run build:railroad",
@@ -19,10 +19,10 @@
     "start": "node src/run.js",
     "test": "c8 --check-coverage --branches 68 --statements 82 --lines 82 mocha",
     "test-ci": "npm run lint && npm run test && codecov",
-    "lint": "./node_modules/.bin/eslint ."
+    "lint": "eslint ."
   },
   "dependencies": {
-    "fs-extra": "9.1.0",
+    "fs-extra": "10.0.0",
     "he": "1.2.0",
     "moment": "2.29.1",
     "moo": "0.5.1",
@@ -32,30 +32,29 @@
     "rehype-parse": "7.0.1",
     "sanitizer": "0.1.3",
     "source-map": "0.7.3",
-    "unified": "9.2.0",
+    "unified": "9.2.2",
     "unist-util-inspect": "6.0.1",
-    "urijs": "1.19.5",
-    "xregexp": "4.4.1"
+    "xregexp": "5.1.0"
   },
   "devDependencies": {
-    "@semantic-release/changelog": "5.0.1",
-    "@semantic-release/git": "9.0.0",
-    "@semantic-release/github": "7.2.0",
-    "c8": "7.4.0",
-    "codecov": "3.8.1",
-    "eslint": "7.18.0",
-    "eslint-config-airbnb-base": "14.2.1",
-    "eslint-plugin-header": "3.1.0",
-    "eslint-plugin-import": "2.22.1",
+    "@semantic-release/changelog": "6.0.1",
+    "@semantic-release/git": "10.0.1",
+    "@semantic-release/github": "8.0.2",
+    "c8": "7.10.0",
+    "codecov": "3.8.3",
+    "eslint": "8.4.1",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-plugin-header": "3.1.1",
+    "eslint-plugin-import": "2.25.3",
     "ghooks": "2.0.4",
-    "jsdom": "16.4.0",
-    "lint-staged": "10.5.3",
-    "mocha": "8.2.1",
-    "mocha-junit-reporter": "2.0.0",
+    "jsdom": "19.0.0",
+    "lint-staged": "12.1.2",
+    "mocha": "9.1.3",
+    "mocha-junit-reporter": "2.0.2",
     "rehype-stringify": "8.0.0",
     "remark-parse": "9.0.0",
-    "remark-rehype": "8.0.0",
-    "semantic-release": "17.3.7"
+    "remark-rehype": "8.1.0",
+    "semantic-release": "18.0.1"
   },
   "lint-staged": {
     "*.js": "eslint"

package/src/compiler/Compiler.js

@@ -336,7 +336,10 @@ module.exports = class Compiler {
             } else {
               // parse the template
               const res = await this._parse(
-                templateSource, path.dirname(templatePath), mods, templates,
+                templateSource,
+                path.dirname(templatePath),
+                mods,
+                templates,
               );
 
               // extract the template functions and discard commands outside the functions

package/src/parser/plugins/UsePlugin.js

@@ -23,7 +23,9 @@ module.exports = class UsePlugin extends Plugin {
     if (this._expression.root instanceof StringConstant) {
       const lib = this._expression.root.text;
       stream.write(new FileReference(
-        variableName, lib, [new MapLiteral(this._expression.options)],
+        variableName,
+        lib,
+        [new MapLiteral(this._expression.options)],
       ), true);
       return;
     }

package/src/runtime/format_uri.js

@@ -26,24 +26,35 @@ const FRAGMENT = 'fragment';
 const QUERY = 'query';
 const ADD_QUERY = 'addQuery';
 const REMOVE_QUERY = 'removeQuery';
-
-const URI = require('urijs');
+const url = require('url');
+const querystring = require('querystring');
+const path = require('path').posix;
 
 module.exports = function formatUri(uri, opts) {
   if (!uri) {
     return null;
   }
 
-  const u = URI(uri);
+  let u;
+  if (uri.startsWith('//')) {
+    // no scheme, but parse will be wrong
+    u = url.parse(`fake:${uri}`);
+    u.protocol = '';
+  } else {
+    u = url.parse(uri);
+  }
   if (SCHEME in opts) {
-    u.scheme(opts[SCHEME]);
+    u.protocol = opts[SCHEME];
   }
   if (DOMAIN in opts) {
-    u.host(opts[DOMAIN]);
+    u.host = opts[DOMAIN];
+    u.hostname = opts[DOMAIN];
   }
+  u.search = null;
+  u.query = u.query ? querystring.parse(u.query) : {};
 
   // remove selectors and suffixes for path manipulation
-  const p = u.path();
+  const p = u.pathname;
   const idxSelStart = p.indexOf('.');
   let idxSuffix = idxSelStart < 0 ? -1 : p.indexOf('/', idxSelStart);
   if (idxSuffix < 0) {
@@ -54,25 +65,22 @@ module.exports = function formatUri(uri, opts) {
   let selectors = selectorString ? selectorString.substring(1).split('.') : [];
   let extension = idxExtension < 0 ? '' : p.substring(idxExtension, idxSuffix);
   let suffix = idxSuffix < 0 ? '' : p.substring(idxSuffix);
-  // const pp = idxSelStart < 0 ? p : p.substring(0, idxSelStart);
-
-  // console.log(`'${p}' -> '${pp}' '${selectors}' '${extension}' '${suffix}'`);
 
   if (idxSelStart >= 0) {
-    u.path(p.substring(0, idxSelStart));
+    u.pathname = p.substring(0, idxSelStart);
   }
 
   const setPath = opts[PATH];
   if (setPath) {
-    u.path(setPath);
+    u.pathname = setPath;
   }
   const appendPath = opts[APPEND_PATH];
   if (appendPath) {
-    u.path(`${u.path()}/${appendPath}`);
+    u.pathname = `${u.pathname}/${appendPath}`;
   }
   const prependPath = opts[PREPEND_PATH];
   if (prependPath) {
-    u.path(`${prependPath}/${u.path()}`);
+    u.pathname = `${prependPath}/${u.pathname}`;
   }
   if (SELECTORS in opts) {
     let setSelectors = opts[SELECTORS];
@@ -129,30 +137,27 @@ module.exports = function formatUri(uri, opts) {
   if (QUERY in opts) {
     const qry = opts[QUERY];
     if (!qry) {
-      u.query('');
+      u.query = {};
     } else {
-      u.query(qry);
+      u.query = qry;
     }
   }
   const addQuery = opts[ADD_QUERY];
   if (addQuery) {
-    const merged = Object.assign(u.query(true), addQuery);
-    u.query(merged);
+    u.query = Object.assign(u.query, addQuery);
   }
   const removeQuery = opts[REMOVE_QUERY];
   if (removeQuery) {
-    const qry = u.query(true);
     if (Array.isArray(removeQuery)) {
-      removeQuery.forEach((q) => delete qry[q]);
+      removeQuery.forEach((q) => delete u.query[q]);
     } else {
-      delete qry[removeQuery];
+      delete u.query[removeQuery];
     }
-    u.query(qry);
   }
   if (FRAGMENT in opts) {
-    u.fragment(opts[FRAGMENT] || '');
+    u.hash = opts[FRAGMENT] || '';
   }
   selectorString = selectors.length > 0 ? `.${selectors.join('.')}` : '';
-  u.path(u.path() + selectorString + extension + suffix);
-  return u.normalizePath().toString();
+  u.pathname = path.normalize(u.pathname + selectorString + extension + suffix);
+  return url.format(u);
 };