From 5fd60125e2bcf9d71807b60a3e99ec716871c783 Mon Sep 17 00:00:00 2001 From: james-owen Date: Fri, 5 Feb 2021 13:51:33 -0500 Subject: [PATCH 01/10] moves handlebars to peer dependencies --- package-lock.json | 4 ++-- package.json | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c2c036..7322421 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3333,7 +3333,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -3455,7 +3455,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } diff --git a/package.json b/package.json index b9ac26e..fd9debf 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "clayhandlebars": "^3.2.2", "clayutils": "^2.0.3", "glob": "^7.1.1", - "handlebars": "^4.0.6", "js-yaml": "^3.8.2", "lodash": "^4.17.5", "nymag-fs": "^1.0.1", @@ -26,6 +25,9 @@ "eslint": "^3.19.0", "jest": "23.6.0" }, + "peerDependencies": { + "handlebars": "4" + }, "repository": { "type": "git", "url": "git+https://github.com/nymag/amphora-html.git" From 4ecfa4a77e3fb4ceb080bbec1f27d0563ae2c485 Mon Sep 17 00:00:00 2001 From: james-owen Date: Tue, 9 Feb 2021 13:50:48 -0500 Subject: [PATCH 02/10] clayhandlebars pin hbs --- package-lock.json | 62 +++++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 45 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7322421..1edfbae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1052,23 +1052,41 @@ } }, "clayhandlebars": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/clayhandlebars/-/clayhandlebars-3.2.6.tgz", - "integrity": "sha512-Ov7B0jA3mamvpb8UkU0Cr9m2q0v8pmNGc9wGZzn/k/9s7MtKAxEFbpDmUSHq7who3S2viXngFwvKxf341D3G4w==", + "version": "github:clay/handlebars#943a760f6e07262419b3b54d77fc3f615f8270ae", + "from": "github:clay/handlebars#handlebars_peer_dependency", "requires": { "comma-it": "0.0.7", - "date-fns": "^1.28.2", - "glob": "^7.1.1", - "handlebars": "^4.0.6", - "he": "^1.1.0", + "date-fns": "^1.30.1", + "glob": "^7.1.6", + "he": "^1.2.0", "helper-yaml": "^0.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.5", + "lodash": "^4.17.15", "outdent": "^0.3.0", "randomstring": "^1.1.5", "sinon": "^2.1.0", "speakingurl": "^11.0.0", "striptags": "^2.1.1" + }, + "dependencies": { + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + } } }, "clayutils": { @@ -1193,6 +1211,7 @@ "version": "2.20.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "dev": true, "optional": true }, "component-emitter": { @@ -1335,9 +1354,9 @@ } }, "date-fns": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz", - "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==" + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", + "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" }, "debug": { "version": "2.6.9", @@ -2712,6 +2731,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "dev": true, "requires": { "neo-async": "^2.6.0", "optimist": "^0.6.1", @@ -4152,7 +4172,8 @@ "minimist": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true }, "mixin-deep": { "version": "1.3.2", @@ -4264,7 +4285,8 @@ "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "dev": true }, "next-tick": { "version": "1.0.0", @@ -4454,6 +4476,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -4602,9 +4625,9 @@ "dev": true }, "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", "requires": { "isarray": "0.0.1" }, @@ -5676,7 +5699,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, "source-map-resolve": { "version": "0.5.2", @@ -6180,6 +6204,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", + "dev": true, "optional": true, "requires": { "commander": "~2.20.0", @@ -6425,7 +6450,8 @@ "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true }, "wrap-ansi": { "version": "2.1.0", diff --git a/package.json b/package.json index fd9debf..a195e81 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "amphora-fs": "1.0.1", "bluebird": "^3.5.0", "clay-log": "^1.2.0", - "clayhandlebars": "^3.2.2", + "clayhandlebars": "clay/handlebars#handlebars_peer_dependency", "clayutils": "^2.0.3", "glob": "^7.1.1", "js-yaml": "^3.8.2", From b6e9a72d28b04e98616354240ec52f654f7ab2a4 Mon Sep 17 00:00:00 2001 From: james-owen Date: Thu, 11 Feb 2021 15:29:41 -0500 Subject: [PATCH 03/10] pin clayhbs to prerelease --- package-lock.json | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1edfbae..e7a849f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1052,8 +1052,9 @@ } }, "clayhandlebars": { - "version": "github:clay/handlebars#943a760f6e07262419b3b54d77fc3f615f8270ae", - "from": "github:clay/handlebars#handlebars_peer_dependency", + "version": "5.0.2-0", + "resolved": "https://registry.npmjs.org/clayhandlebars/-/clayhandlebars-5.0.2-0.tgz", + "integrity": "sha512-yLKcyrNrULzRQTC7BRDdTEwoAj0zXcizbq2YE/t1IWsh3Bijjoi+rig6gUSxFeTzdyHkBIcKbWVZ8STRxi87WQ==", "requires": { "comma-it": "0.0.7", "date-fns": "^1.30.1", diff --git a/package.json b/package.json index a195e81..2d178e7 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "amphora-fs": "1.0.1", "bluebird": "^3.5.0", "clay-log": "^1.2.0", - "clayhandlebars": "clay/handlebars#handlebars_peer_dependency", + "clayhandlebars": "5.0.2-0", "clayutils": "^2.0.3", "glob": "^7.1.1", "js-yaml": "^3.8.2", From 03da9fccfeaac722f292afa4ffbb97468f77ab43 Mon Sep 17 00:00:00 2001 From: Jeffrey Pope Date: Fri, 12 Feb 2021 13:38:40 -0500 Subject: [PATCH 04/10] use new clayutils --- package-lock.json | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7a849f..5316030 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1091,9 +1091,8 @@ } }, "clayutils": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/clayutils/-/clayutils-2.6.1.tgz", - "integrity": "sha512-APLeQNZ9ZvAD1FupDYrTOI9WlFJWm5pN0ntXytdQlipLSyqRmCxpdJ+pYhoCwI7xa+H9Wlvd5RrZoQs8Yjnkew==", + "version": "github:clay/clayutils#1c2aab0b334f25904e9253c912eecb04064beaa1", + "from": "github:clay/clayutils#handlebars_peer_dependency", "requires": { "glob": "^7.1.1", "lodash": "^4.17.4", diff --git a/package.json b/package.json index 2d178e7..3f5898a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "bluebird": "^3.5.0", "clay-log": "^1.2.0", "clayhandlebars": "5.0.2-0", - "clayutils": "^2.0.3", + "clayutils": "clay/clayutils#handlebars_peer_dependency", "glob": "^7.1.1", "js-yaml": "^3.8.2", "lodash": "^4.17.5", From 0de4ef84b1171f56f7c1c67da04a997c12d47f9b Mon Sep 17 00:00:00 2001 From: james-owen Date: Tue, 16 Feb 2021 16:34:44 -0500 Subject: [PATCH 05/10] clayhbs to peer dep --- package-lock.json | 156 ++-------------------------------------------- package.json | 4 +- 2 files changed, 6 insertions(+), 154 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7a849f..9d782b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -464,11 +464,6 @@ "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, - "array-uniq": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz", - "integrity": "sha1-X8w3OSB3VyPP1k1lxkvvU7+eum0=" - }, "array-unique": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", @@ -1051,45 +1046,6 @@ "pino": "^4.7.1" } }, - "clayhandlebars": { - "version": "5.0.2-0", - "resolved": "https://registry.npmjs.org/clayhandlebars/-/clayhandlebars-5.0.2-0.tgz", - "integrity": "sha512-yLKcyrNrULzRQTC7BRDdTEwoAj0zXcizbq2YE/t1IWsh3Bijjoi+rig6gUSxFeTzdyHkBIcKbWVZ8STRxi87WQ==", - "requires": { - "comma-it": "0.0.7", - "date-fns": "^1.30.1", - "glob": "^7.1.6", - "he": "^1.2.0", - "helper-yaml": "^0.1.0", - "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.15", - "outdent": "^0.3.0", - "randomstring": "^1.1.5", - "sinon": "^2.1.0", - "speakingurl": "^11.0.0", - "striptags": "^2.1.1" - }, - "dependencies": { - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" - } - } - }, "clayutils": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/clayutils/-/clayutils-2.6.1.tgz", @@ -1203,11 +1159,6 @@ "delayed-stream": "~1.0.0" } }, - "comma-it": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/comma-it/-/comma-it-0.0.7.tgz", - "integrity": "sha1-MfRYG5xENCcxjO3/kfnKjQJLwxs=" - }, "commander": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", @@ -1354,11 +1305,6 @@ } } }, - "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1492,7 +1438,8 @@ "diff": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==" + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true }, "doctrine": { "version": "2.1.0", @@ -2051,14 +1998,6 @@ "mime-types": "^2.1.12" } }, - "formatio": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", - "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", - "requires": { - "samsam": "1.x" - } - }, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -2845,16 +2784,6 @@ } } }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" - }, - "helper-yaml": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/helper-yaml/-/helper-yaml-0.1.0.tgz", - "integrity": "sha1-iXsYk/gNugLcaoVqPLMJjbQm2SY=" - }, "home-or-tmp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", @@ -3907,7 +3836,8 @@ "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true }, "json5": { "version": "0.5.1", @@ -4042,11 +3972,6 @@ "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", "dev": true }, - "lolex": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", - "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=" - }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -4272,11 +4197,6 @@ } } }, - "native-promise-only": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", - "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=" - }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -4528,11 +4448,6 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, - "outdent": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.3.0.tgz", - "integrity": "sha1-+tGKnAYaCTjzjoBx0WxAJEI/QyM=" - }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -4625,21 +4540,6 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, - "path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - } - } - }, "path-type": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", @@ -4848,14 +4748,6 @@ } } }, - "randomstring": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/randomstring/-/randomstring-1.1.5.tgz", - "integrity": "sha1-bfBij3XL1ZMpMNn+OrTpVqGFGMM=", - "requires": { - "array-uniq": "1.0.2" - } - }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -5167,11 +5059,6 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "samsam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", - "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==" - }, "sane": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz", @@ -5550,21 +5437,6 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, - "sinon": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.4.1.tgz", - "integrity": "sha512-vFTrO9Wt0ECffDYIPSP/E5bBugt0UjcBQOfQUMh66xzkyPEnhl/vM2LRZi2ajuTdkH07sA6DzrM6KvdvGIH8xw==", - "requires": { - "diff": "^3.1.0", - "formatio": "1.2.0", - "lolex": "^1.6.0", - "native-promise-only": "^0.8.1", - "path-to-regexp": "^1.7.0", - "samsam": "^1.1.3", - "text-encoding": "0.6.4", - "type-detect": "^4.0.0" - } - }, "sisteransi": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-0.1.1.tgz", @@ -5771,11 +5643,6 @@ "integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==", "dev": true }, - "speakingurl": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-11.0.0.tgz", - "integrity": "sha1-IOXO/AmzL8/jnuCy6XiT+zkoGbM=" - }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -5921,11 +5788,6 @@ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, - "striptags": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/striptags/-/striptags-2.2.1.tgz", - "integrity": "sha1-TEULcI1BuL85zyTEn/I0/Gqr/TI=" - }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -6042,11 +5904,6 @@ "require-main-filename": "^1.0.1" } }, - "text-encoding": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", - "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=" - }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -6190,11 +6047,6 @@ "prelude-ls": "~1.1.2" } }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==" - }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", diff --git a/package.json b/package.json index 2d178e7..28c456b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "amphora-fs": "1.0.1", "bluebird": "^3.5.0", "clay-log": "^1.2.0", - "clayhandlebars": "5.0.2-0", "clayutils": "^2.0.3", "glob": "^7.1.1", "js-yaml": "^3.8.2", @@ -26,7 +25,8 @@ "jest": "23.6.0" }, "peerDependencies": { - "handlebars": "4" + "handlebars": "4", + "clayhandlebars": "5" }, "repository": { "type": "git", From 7b6d7481f3516be1b577a9cb7a7ab65f598a8801 Mon Sep 17 00:00:00 2001 From: james-owen Date: Tue, 16 Feb 2021 16:37:18 -0500 Subject: [PATCH 06/10] clayhbs to peer dependency --- package-lock.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2d2e87b..28e9b3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1047,8 +1047,9 @@ } }, "clayutils": { - "version": "github:clay/clayutils#1c2aab0b334f25904e9253c912eecb04064beaa1", - "from": "github:clay/clayutils#handlebars_peer_dependency", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/clayutils/-/clayutils-2.7.1.tgz", + "integrity": "sha512-At5ZsLG2ZbYydHwv+WH4rbjMYWrLIr+m5m37RopfYV3fjmZNp193Hr2vw88/xRKITzXOTSGOj6EU6KsDH5ACHg==", "requires": { "glob": "^7.1.1", "lodash": "^4.17.4", From 024b36610831b574033c3527a6a906adac051796 Mon Sep 17 00:00:00 2001 From: james-owen Date: Wed, 17 Feb 2021 12:04:54 -0500 Subject: [PATCH 07/10] update dev dependencies --- package-lock.json | 34 +++++++++++++++++++++++++--------- package.json | 4 ++-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 28e9b3a..9359628 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,14 +104,30 @@ "dev": true }, "amphora-fs": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amphora-fs/-/amphora-fs-1.0.1.tgz", - "integrity": "sha512-ZYCvWkgQL6ooDfYIh5wM7+kBUmPObwBm3Wz6G02HBKL5jZWKJWciIkNvuQPTrkcHYXBFBeKmxxMjAqCUPSFS/Q==", + "version": "2.0.0-0", + "resolved": "https://registry.npmjs.org/amphora-fs/-/amphora-fs-2.0.0-0.tgz", + "integrity": "sha512-Dce381wJdCrT2SQMV0U2On0k//ki60zVad6KqyQt9+HMPeU0g5cZu2/sbNX9TL2vtCJ2OudbYUhWu4bAXxPDcA==", "requires": { - "clayutils": "^2.1.0", - "js-yaml": "^3.12.0", - "lodash": "^4.17.4", + "clayutils": "3.0.0-0", + "js-yaml": "^3.14.1", + "lodash": "^4.17.20", "template2env": "^1.0.4" + }, + "dependencies": { + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "lodash": { + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + } } }, "ansi-escapes": { @@ -1047,9 +1063,9 @@ } }, "clayutils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/clayutils/-/clayutils-2.7.1.tgz", - "integrity": "sha512-At5ZsLG2ZbYydHwv+WH4rbjMYWrLIr+m5m37RopfYV3fjmZNp193Hr2vw88/xRKITzXOTSGOj6EU6KsDH5ACHg==", + "version": "3.0.0-0", + "resolved": "https://registry.npmjs.org/clayutils/-/clayutils-3.0.0-0.tgz", + "integrity": "sha512-rUrJ8e3vl+zOyrUtVGqOaP8iy305xSVR8KGmWnyQQU0Ov98XxSjXChawFIy0f6ibx+9YuAhb5+Dv99i0YT98Jg==", "requires": { "glob": "^7.1.1", "lodash": "^4.17.4", diff --git a/package.json b/package.json index 28c456b..769b9f1 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "jest": "jest" }, "dependencies": { - "amphora-fs": "1.0.1", + "amphora-fs": "^2.0.0-0", "bluebird": "^3.5.0", "clay-log": "^1.2.0", - "clayutils": "^2.0.3", + "clayutils": "^3.0.0-0", "glob": "^7.1.1", "js-yaml": "^3.8.2", "lodash": "^4.17.5", From 2bd40311be38e5839ccaa077f0850430405be3c0 Mon Sep 17 00:00:00 2001 From: james-owen Date: Wed, 17 Feb 2021 12:05:07 -0500 Subject: [PATCH 08/10] 5.0.0-0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9359628..55c2851 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "amphora-html", - "version": "4.2.1", + "version": "5.0.0-0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 769b9f1..4a6833e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "amphora-html", - "version": "4.2.1", + "version": "5.0.0-0", "description": "An HTML renderer for component data", "main": "index.js", "scripts": { From 5d7afc851f63943509d4cd09dac43c04e6770ba7 Mon Sep 17 00:00:00 2001 From: james-owen Date: Wed, 17 Mar 2021 16:04:57 -0400 Subject: [PATCH 09/10] revert version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a6833e..769b9f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "amphora-html", - "version": "5.0.0-0", + "version": "4.2.1", "description": "An HTML renderer for component data", "main": "index.js", "scripts": { From 814e10c0d64daa87ae5f46c1234745dacef2d472 Mon Sep 17 00:00:00 2001 From: james-owen Date: Wed, 17 Mar 2021 16:11:41 -0400 Subject: [PATCH 10/10] update amphora-fs and clayutils to latest --- package-lock.json | 22 +++++++++++----------- package.json | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55c2851..945d87a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "amphora-html", - "version": "5.0.0-0", + "version": "4.2.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -104,11 +104,11 @@ "dev": true }, "amphora-fs": { - "version": "2.0.0-0", - "resolved": "https://registry.npmjs.org/amphora-fs/-/amphora-fs-2.0.0-0.tgz", - "integrity": "sha512-Dce381wJdCrT2SQMV0U2On0k//ki60zVad6KqyQt9+HMPeU0g5cZu2/sbNX9TL2vtCJ2OudbYUhWu4bAXxPDcA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/amphora-fs/-/amphora-fs-2.0.0.tgz", + "integrity": "sha512-Sa/jlbsdXjDp9J+Ak6/A14NiQKu9KWTtYHEKlzmtF9PHnc3/hblkVTPDVZbLHJWaKbFXBzv5htPX0FDxscLRsQ==", "requires": { - "clayutils": "3.0.0-0", + "clayutils": "^3.0.0", "js-yaml": "^3.14.1", "lodash": "^4.17.20", "template2env": "^1.0.4" @@ -124,9 +124,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" } } }, @@ -1063,9 +1063,9 @@ } }, "clayutils": { - "version": "3.0.0-0", - "resolved": "https://registry.npmjs.org/clayutils/-/clayutils-3.0.0-0.tgz", - "integrity": "sha512-rUrJ8e3vl+zOyrUtVGqOaP8iy305xSVR8KGmWnyQQU0Ov98XxSjXChawFIy0f6ibx+9YuAhb5+Dv99i0YT98Jg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/clayutils/-/clayutils-3.0.0.tgz", + "integrity": "sha512-xW01NwKuoFuJ47QLl2BPhfAAGTZrIZEu0rLFgqOS9lGxB3PeFzxr1ZPYiZePdLpRvH/3r0pI0XP2PTviAyC3wA==", "requires": { "glob": "^7.1.1", "lodash": "^4.17.4", diff --git a/package.json b/package.json index 769b9f1..94eec90 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "jest": "jest" }, "dependencies": { - "amphora-fs": "^2.0.0-0", + "amphora-fs": "^2.0.0", "bluebird": "^3.5.0", "clay-log": "^1.2.0", - "clayutils": "^3.0.0-0", + "clayutils": "^3.0.0", "glob": "^7.1.1", "js-yaml": "^3.8.2", "lodash": "^4.17.5",