Merge branch 'dev' into fix/annotations-tooltip-rendering

quelltexterin · Jan 19, 2022 · 2c715ae · 2c715ae
2 parents 5effb4f + 0de4737
commit 2c715ae
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 35 deletions.
diff --git a/packages/cli/bin/scaffold.js b/packages/cli/bin/scaffold.js
@@ -1,7 +1,7 @@
 'use strict';
 const path = require('path');
 const execa = require('execa');
-const fs = require('fs-extra');
+const fs = require('fs');
 const wrapAsync = require('./utils').wrapAsync;
 const mkdirsAsync = require('./utils').mkdirsAsync;
 
@@ -18,7 +18,6 @@ const scaffold = (projectDir, sourceDir, publicDir, exportDir) =>
   wrapAsync(function* () {
     const projectPath = path.join(process.cwd(), projectDir);
     if (!fs.existsSync(path.join(projectPath, 'package.json'))) {
-      fs.ensureDirSync(projectPath);
       execa.sync('npm', ['init', '-y'], {
         cwd: projectPath,
       });

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -47,7 +47,7 @@
   ],
   "scripts": {
     "lint": "eslint ./{bin,test}",
-    "test:separate": "tap ./test/*.test.js --reporter spec --timeout=120",
+    "test:separate": "tap './test/*.test.js' --reporter spec --timeout=120",
     "prepublish": "npx dos2unix-cli bin/patternlab.js"
   },
   "repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli",

diff --git a/packages/core/src/lib/server.js b/packages/core/src/lib/server.js
@@ -36,30 +36,6 @@ const server = (patternlab) => {
             patternlab.config.paths.public.root
           )
         );
-        defaults.assets = [
-          path.resolve(
-            path.join(
-              process.cwd(),
-              patternlab.config.paths.source.js,
-              '**',
-              '*.js' // prevent preprocessors like typescript from reloading
-            )
-          ),
-          path.resolve(
-            path.join(process.cwd(), patternlab.config.paths.source.images)
-          ),
-          path.resolve(
-            path.join(process.cwd(), patternlab.config.paths.source.fonts)
-          ),
-          path.resolve(
-            path.join(
-              process.cwd(),
-              patternlab.config.paths.source.css,
-              '**',
-              '*.css' // prevent preprocessors from reloading
-            )
-          ),
-        ];
 
         // allow for overrides should they exist inside patternlab-config.json
         const liveServerConfig = Object.assign(

diff --git a/packages/development-edition-engine-react/source/_meta/_head.html b/packages/development-edition-engine-react/source/_meta/_head.html
@@ -20,4 +20,5 @@
     {{{ patternLabHead }}}
     <!-- End Pattern Lab -->
   </head>
-  <body class="{{ bodyClass }}">
+  <body class="{{ bodyClass }}"></body>
+</html>
diff --git a/packages/edition-node-gulp/gulpfile.js b/packages/edition-node-gulp/gulpfile.js
@@ -27,7 +27,6 @@ function serve() {
   return patternlab.server
     .serve({
       cleanPublic: config.cleanPublic,
-      watch: true,
     })
     .then(() => {
       // do something else when this promise resolves

diff --git a/packages/engine-twig/lib/engine_twig.js b/packages/engine-twig/lib/engine_twig.js
@@ -124,7 +124,8 @@ var engine_twig = {
   engineFileExtension: '.twig',
 
   // regexes, stored here so they're only compiled once
-  findPartialsRE: /{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
+  findPartialsRE:
+    /{%[-]?\s*(?:extends|include|embed|from|import|use)\s+('[^']+'|"[^"]+").*?%}/g,
   findPartialKeyRE: /"((?:\\.|[^"\\])*)"/,
   findListItemsRE:
     /({{#( )?)(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

diff --git a/packages/engine-underscore/_meta/_head.html b/packages/engine-underscore/_meta/_head.html
@@ -20,4 +20,5 @@
     {{{ patternLabHead }}}
     <!-- End Pattern Lab -->
   </head>
-  <body class="{{ bodyClass }}">
+  <body class="{{ bodyClass }}"></body>
+</html>
diff --git a/packages/uikit-workshop/src/html/partials/base-template.html b/packages/uikit-workshop/src/html/partials/base-template.html
@@ -2,10 +2,7 @@
 {{# descBlockExists }}
 
 <div
-  class="
-    pl-c-pattern-info__panel pl-c-pattern-info__panel--info
-    pl-js-pattern-info
-  "
+  class="pl-c-pattern-info__panel pl-c-pattern-info__panel--info pl-js-pattern-info"
 >
   {{# isPatternView }}
   <!-- extra info for modal view -->