Skip to content

Commit 2c27360

Browse files
mfranzkemfranzke
committed
Revert "Revert "Merge branch 'dev' into refactor/updated-lerna-dependency""
This reverts commit ed365ea.
1 parent 4ffd569 commit 2c27360

File tree

18 files changed

+44
-54
lines changed

18 files changed

+44
-54
lines changed

‎packages/cli/bin/scaffold.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
const path = require('path');
33
const execa = require('execa');
4-
const fs = require('fs-extra');
4+
const fs = require('fs');
55
const wrapAsync = require('./utils').wrapAsync;
66
const mkdirsAsync = require('./utils').mkdirsAsync;
77

@@ -18,7 +18,6 @@ const scaffold = (projectDir, sourceDir, publicDir, exportDir) =>
1818
wrapAsync(function* () {
1919
const projectPath = path.join(process.cwd(), projectDir);
2020
if (!fs.existsSync(path.join(projectPath, 'package.json'))) {
21-
fs.ensureDirSync(projectPath);
2221
execa.sync('npm', ['init', '-y'], {
2322
cwd: projectPath,
2423
});

‎packages/cli/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"dependencies": {
1212
"@pattern-lab/core": "^5.15.2",
1313
"@pattern-lab/live-server": "^5.15.1",
14-
"@pattern-lab/starterkit-mustache-base": "3.0.3",
1514
"archiver": "2.1.1",
1615
"chalk": "4.1.0",
1716
"commander": "2.15.1",
@@ -24,18 +23,19 @@
2423
"lodash": "4.17.21",
2524
"ora": "2.1.0",
2625
"path-exists": "3.0.0",
27-
"sanitize-filename": "1.6.3",
28-
"starterkit-mustache-acidtest": "0.0.3",
29-
"starterkit-mustache-bootstrap": "0.1.1",
30-
"starterkit-mustache-foundation": "0.1.1",
31-
"starterkit-mustache-materialdesign": "0.1.2"
26+
"sanitize-filename": "1.6.3"
3227
},
3328
"devDependencies": {
29+
"@pattern-lab/starterkit-mustache-base": "3.0.3",
3430
"eslint": "4.18.2",
3531
"eslint-config-prettier": "2.9.0",
3632
"eslint-plugin-prettier": "2.6.0",
3733
"prettier": "2.2.1",
3834
"proxyquire": "2.1.3",
35+
"starterkit-mustache-acidtest": "0.0.3",
36+
"starterkit-mustache-bootstrap": "0.1.1",
37+
"starterkit-mustache-foundation": "0.1.1",
38+
"starterkit-mustache-materialdesign": "0.1.2",
3939
"tap": "14.11.0"
4040
},
4141
"files": [
@@ -49,7 +49,7 @@
4949
],
5050
"scripts": {
5151
"lint": "eslint ./{bin,test}",
52-
"test:separate": "tap ./test/*.test.js --reporter spec --timeout=120"
52+
"test:separate": "tap './test/*.test.js' --reporter spec --timeout=120"
5353
},
5454
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",
5555
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",

‎packages/core/src/lib/server.js‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,6 @@ const server = (patternlab) => {
3636
patternlab.config.paths.public.root
3737
)
3838
);
39-
defaults.assets = [
40-
path.resolve(
41-
path.join(
42-
process.cwd(),
43-
patternlab.config.paths.source.js,
44-
'**',
45-
'*.js' // prevent preprocessors like typescript from reloading
46-
)
47-
),
48-
path.resolve(
49-
path.join(process.cwd(), patternlab.config.paths.source.images)
50-
),
51-
path.resolve(
52-
path.join(process.cwd(), patternlab.config.paths.source.fonts)
53-
),
54-
path.resolve(
55-
path.join(
56-
process.cwd(),
57-
patternlab.config.paths.source.css,
58-
'**',
59-
'*.css' // prevent preprocessors from reloading
60-
)
61-
),
62-
];
6339

6440
// allow for overrides should they exist inside patternlab-config.json
6541
const liveServerConfig = Object.assign(

‎packages/development-edition-engine-react/source/_meta/_head.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
{{{ patternLabHead }}}
2121
<!-- End Pattern Lab -->
2222
</head>
23-
<body class="{{ bodyClass }}">
23+
<body class="{{ bodyClass }}"></body>
24+
</html>

‎packages/docs/.eleventy.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ module.exports = function (config) {
3333
config.addPassthroughCopy('src/js');
3434
config.addPassthroughCopy('src/admin/config.yml');
3535
config.addPassthroughCopy('src/admin/previews.js');
36-
config.addPassthroughCopy('../../node_modules/nunjucks/browser/nunjucks-slim.js');
36+
config.addPassthroughCopy({
37+
'../../node_modules/nunjucks/browser/nunjucks-slim.js':
38+
'node_modules/nunjucks/browser/nunjucks-slim.js',
39+
});
3740

3841
const now = new Date();
3942

‎packages/docs/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"description": "The website for patternlab.io",
55
"main": "index.js",
66
"dependencies": {
7-
"@11ty/eleventy": "^0.8.3",
8-
"@11ty/eleventy-plugin-rss": "^1.0.6",
9-
"@11ty/eleventy-plugin-syntaxhighlight": "^2.0.3",
7+
"@11ty/eleventy": "^0.12.1",
8+
"@11ty/eleventy-plugin-rss": "^1.1.2",
9+
"@11ty/eleventy-plugin-syntaxhighlight": "^3.1.3",
1010
"@tbranyen/jsdom": "^13.0.0",
1111
"concurrently": "^4.1.0",
1212
"html-minifier": "^4.0.0",
@@ -18,7 +18,7 @@
1818
"stalfos": "github:hankchizljaw/stalfos#c8971d22726326cfc04089b2da4d51eeb1ebb0eb"
1919
},
2020
"devDependencies": {
21-
"@11ty/eleventy-navigation": "^0.1.5",
21+
"@11ty/eleventy-navigation": "^0.3.2",
2222
"@erquhart/rollup-plugin-node-builtins": "^2.1.5",
2323
"bl": "^3.0.0",
2424
"chokidar-cli": "^2.1.0",

‎packages/docs/src/docs/advanced-config-options.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ Sets whether or not you want the styleguide to load with the pattern info open o
4747

4848
**default**: `false`
4949

50+
## defaultInitialViewportWidth (optional)
51+
52+
Possibility to define whether the initial viewport width on opening pattern lab in the browser should take the default of `100%` (value `true`) or take the (permanently) persisted value after the users have interacted with the viewport resize buttons previously (value `false`). This is especially beneficial in case that you'd expect the pages in full viewport at revisits, and even further if your startpage is defined as a "static" markdown welcome / orientation page.
53+
54+
**default**: `false`
55+
5056
## defaultPatternInfoPanelCode (optional)
5157

5258
Sets default active pattern info code panel by file extension - if unset, uses the value out of _patternExtension_ config value, or instead use value `html` to display the html code initially, or the value defined for the _patternExtension_.

‎packages/edition-node-gulp/gulpfile.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ function serve() {
2727
return patternlab.server
2828
.serve({
2929
cleanPublic: config.cleanPublic,
30-
watch: true,
3130
})
3231
.then(() => {
3332
// do something else when this promise resolves

‎packages/engine-twig/lib/engine_twig.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ var engine_twig = {
124124
engineFileExtension: '.twig',
125125

126126
// regexes, stored here so they're only compiled once
127-
findPartialsRE: /{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
127+
findPartialsRE:
128+
/{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
128129
findPartialKeyRE: /"((?:\\.|[^"\\])*)"/,
129130
findListItemsRE:
130131
/({{#( )?)(list(I|i)tems.)(one|two|three|four|five|six|seven|eight|nine|ten|eleven|twelve|thirteen|fourteen|fifteen|sixteen|seventeen|eighteen|nineteen|twenty)( )?}}/g, // TODO

‎packages/engine-underscore/_meta/_head.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
{{{ patternLabHead }}}
2121
<!-- End Pattern Lab -->
2222
</head>
23-
<body class="{{ bodyClass }}">
23+
<body class="{{ bodyClass }}"></body>
24+
</html>

0 commit comments

Comments
 (0)