Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke committed Dec 4, 2021
2 parents d7b18ac + 49cd8f8 commit ecf076b
Show file tree
Hide file tree
Showing 3 changed files with 259 additions and 604 deletions.
5 changes: 4 additions & 1 deletion packages/docs/.eleventy.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ module.exports = function (config) {
config.addPassthroughCopy('src/js');
config.addPassthroughCopy('src/admin/config.yml');
config.addPassthroughCopy('src/admin/previews.js');
config.addPassthroughCopy('../../node_modules/nunjucks/browser/nunjucks-slim.js');
config.addPassthroughCopy({
'../../node_modules/nunjucks/browser/nunjucks-slim.js':
'node_modules/nunjucks/browser/nunjucks-slim.js',
});

const now = new Date();

Expand Down
8 changes: 4 additions & 4 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "The website for patternlab.io",
"main": "index.js",
"dependencies": {
"@11ty/eleventy": "^0.8.3",
"@11ty/eleventy-plugin-rss": "^1.0.6",
"@11ty/eleventy-plugin-syntaxhighlight": "^2.0.3",
"@11ty/eleventy": "^0.12.1",
"@11ty/eleventy-plugin-rss": "^1.1.2",
"@11ty/eleventy-plugin-syntaxhighlight": "^3.1.3",
"@tbranyen/jsdom": "^13.0.0",
"concurrently": "^4.1.0",
"html-minifier": "^4.0.0",
Expand All @@ -18,7 +18,7 @@
"stalfos": "github:hankchizljaw/stalfos#c8971d22726326cfc04089b2da4d51eeb1ebb0eb"
},
"devDependencies": {
"@11ty/eleventy-navigation": "^0.1.5",
"@11ty/eleventy-navigation": "^0.3.2",
"@erquhart/rollup-plugin-node-builtins": "^2.1.5",
"bl": "^3.0.0",
"chokidar-cli": "^2.1.0",
Expand Down
Loading

0 comments on commit ecf076b

Please sign in to comment.