diff --git a/lib/metalsmith.js b/lib/metalsmith.js index 6cf24beb2f..eb141e0bda 100644 --- a/lib/metalsmith.js +++ b/lib/metalsmith.js @@ -7,7 +7,7 @@ const titleChecker = require('./metalsmith-title-checker.js') const env = require('metalsmith-env') // environment vars plugin const hashAssets = require('metalsmith-fingerprint-ignore') // add hash to specified files and ignores files that match a pattern const inplace = require('@metalsmith/in-place') // render templating syntax in your source files -const layouts = require('metalsmith-layouts') // apply layouts to source files +const layouts = require('@metalsmith/layouts') // apply layouts to source files const tagcleaner = require('metalsmith-tagcleaner') // Use tag cleaner to remove
tags around images const permalinks = require('metalsmith-permalinks') // apply a permalink pattern to files const canonical = require('metalsmith-canonical') // add a canonical url property to pages diff --git a/package-lock.json b/package-lock.json index 0d1cd4236d..6bfdab2e46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "devDependencies": { "@babel/plugin-transform-modules-commonjs": "^7.14.0", "@metalsmith/in-place": "^4.5.0", + "@metalsmith/layouts": "^2.5.1", "@metalsmith/sass": "^1.0.0", "accessible-autocomplete": "^2.0.2", "axe-puppeteer": "^1.0.0", @@ -46,7 +47,6 @@ "metalsmith-canonical": "^1.2.0", "metalsmith-env": "^2.2.0", "metalsmith-fingerprint-ignore": "^2.0.0", - "metalsmith-layouts": "^2.3.1", "metalsmith-permalinks": "^2.2.0", "metalsmith-rollup": "^2.0.0", "metalsmith-tagcleaner": "0.0.2", @@ -1910,6 +1910,47 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/@metalsmith/layouts": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@metalsmith/layouts/-/layouts-2.5.1.tgz", + "integrity": "sha512-VJPCvCAu5SX5qie3Z4DdywtiT6GLjV1IFUaCHb/Mq/0DpvFQTsB7z63lizCpS82M1wPVG3yOOUXLb1FqBUvScg==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "inputformat-to-jstransformer": "^1.4.0", + "is-utf8": "^0.2.1", + "jstransformer": "^1.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "metalsmith": "^2.4.1" + } + }, + "node_modules/@metalsmith/layouts/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/@metalsmith/layouts/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, "node_modules/@metalsmith/postcss": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@metalsmith/postcss/-/postcss-5.0.0.tgz", @@ -5954,9 +5995,10 @@ "license": "ISC" }, "node_modules/inputformat-to-jstransformer": { - "version": "1.3.2", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/inputformat-to-jstransformer/-/inputformat-to-jstransformer-1.4.0.tgz", + "integrity": "sha512-Ub+Wjb0mjaND4IS/GDvQ+TEyd1i9U4OdrF58mBY7QTYu8CK5K34DPV7mrvo/WQBJLj7UJWQc7QAmFb7CbQ5lLw==", "dev": true, - "license": "MIT", "dependencies": { "require-one": "^1.0.3" }, @@ -9576,31 +9618,6 @@ "slash": "^1.0.0" } }, - "node_modules/metalsmith-layouts": { - "version": "2.3.1", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^3.1.0", - "inputformat-to-jstransformer": "^1.2.1", - "is-utf8": "^0.2.1", - "jstransformer": "^1.0.0", - "multimatch": "^2.1.0" - } - }, - "node_modules/metalsmith-layouts/node_modules/debug": { - "version": "3.2.6", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/metalsmith-layouts/node_modules/ms": { - "version": "2.1.1", - "dev": true, - "license": "MIT" - }, "node_modules/metalsmith-permalinks": { "version": "2.2.0", "dev": true, @@ -15116,6 +15133,35 @@ } } }, + "@metalsmith/layouts": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@metalsmith/layouts/-/layouts-2.5.1.tgz", + "integrity": "sha512-VJPCvCAu5SX5qie3Z4DdywtiT6GLjV1IFUaCHb/Mq/0DpvFQTsB7z63lizCpS82M1wPVG3yOOUXLb1FqBUvScg==", + "dev": true, + "requires": { + "debug": "^4.3.4", + "inputformat-to-jstransformer": "^1.4.0", + "is-utf8": "^0.2.1", + "jstransformer": "^1.0.0" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "@metalsmith/postcss": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@metalsmith/postcss/-/postcss-5.0.0.tgz", @@ -17906,7 +17952,9 @@ "dev": true }, "inputformat-to-jstransformer": { - "version": "1.3.2", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/inputformat-to-jstransformer/-/inputformat-to-jstransformer-1.4.0.tgz", + "integrity": "sha512-Ub+Wjb0mjaND4IS/GDvQ+TEyd1i9U4OdrF58mBY7QTYu8CK5K34DPV7mrvo/WQBJLj7UJWQc7QAmFb7CbQ5lLw==", "dev": true, "requires": { "require-one": "^1.0.3" @@ -20339,30 +20387,6 @@ "slash": "^1.0.0" } }, - "metalsmith-layouts": { - "version": "2.3.1", - "dev": true, - "requires": { - "debug": "^3.1.0", - "inputformat-to-jstransformer": "^1.2.1", - "is-utf8": "^0.2.1", - "jstransformer": "^1.0.0", - "multimatch": "^2.1.0" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "dev": true - } - } - }, "metalsmith-permalinks": { "version": "2.2.0", "dev": true, diff --git a/package.json b/package.json index f748f21c9c..65f8ee6a2f 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "devDependencies": { "@babel/plugin-transform-modules-commonjs": "^7.14.0", "@metalsmith/in-place": "^4.5.0", + "@metalsmith/layouts": "^2.5.1", "@metalsmith/sass": "^1.0.0", "accessible-autocomplete": "^2.0.2", "axe-puppeteer": "^1.0.0", @@ -66,7 +67,6 @@ "metalsmith-canonical": "^1.2.0", "metalsmith-env": "^2.2.0", "metalsmith-fingerprint-ignore": "^2.0.0", - "metalsmith-layouts": "^2.3.1", "metalsmith-permalinks": "^2.2.0", "metalsmith-rollup": "^2.0.0", "metalsmith-tagcleaner": "0.0.2",