Merge pull request #11 from jvmn/feature/2.3.0-rc

Feature/2.3.0 rc
jvmn · Feb 2, 2021 · 6ff0284 · 6ff0284
2 parents 69146a3 + f37e21a
commit 6ff0284
Show file tree

Hide file tree

Showing 24 changed files with 702 additions and 427 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,4 +1,3 @@
-console.log('using babel default')
 module.exports = function (api) {
   api.cache(true)
 

diff --git a/cli/build.js b/cli/build.js
@@ -11,27 +11,27 @@ process.env.MODE = 'development'
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.dev.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_DEV_CONFIG = `${process.env.PROJECT_CWD}/webpack.dev.js`
-  console.log('-> using webpack.dev project config!')
+  console.log('✳️  using local webpack.dev config')
 } catch (err) {
-  console.log('-> using webpack.dev package config!')
+  console.log('⚛︎  using Taskrunner webpack.dev config!')
   process.env.WEBPACK_DEV_CONFIG = `./webpack.dev.js`
 }
 // check if we have a webpack.critical config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.critical.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_CRITICAL_CONFIG = `${process.env.PROJECT_CWD}/webpack.critical.js`
-  console.log('-> using webpack.critical project config!')
+  console.log('✳️  using local webpack.critical config !')
 } catch (err) {
-  console.log('-> using webpack.critical package config!')
+  console.log('⚛︎  using Taskrunner webpack.critical config!')
   process.env.WEBPACK_CRITICAL_CONFIG = `./webpack.critical.js`
 }
 // check if we have a svg-sprite config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/svg-sprite.config.json`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.SPRITE_CONFIG = `${process.env.PROJECT_CWD}/svg-sprite.config.json`
-  console.log('-> using svg-sprite.config project config!')
+  console.log('✳️  using local svg-sprite.config !')
 } catch (err) {
-  console.log('-> using svg-sprite.config package config!')
+  console.log('⚛︎  using Taskrunner svg-sprite.config !')
   process.env.SPRITE_CONFIG = `./svg-sprite.config.json`
 }
 
@@ -49,6 +49,10 @@ if (child.stdin) {
   process.stdin.pipe(child.stdin)
 }
 
+if (child.stderr) {
+  process.stderr.pipe(child.stderr)
+}
+
 if (child.stdout) {
   child.stdout.on('data', (data) => {
     console.log(`child stdout:\n${data}`)

diff --git a/cli/deploy.js b/cli/deploy.js
@@ -13,18 +13,18 @@ process.env.PROJECT_CWD = process.env.PWD
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.dev.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_DEV_CONFIG = `${process.env.PROJECT_CWD}/webpack.dev.js`
-  console.log('-> using webpack.dev project config!')
+  console.log('✳️  using local webpack.dev config')
 } catch (err) {
-  console.log('-> using webpack.dev package config!')
+  console.log('⚛︎  using Taskrunner webpack.dev config!')
   process.env.WEBPACK_DEV_CONFIG = `./webpack.dev.js`
 }
 // check if we have a svg-sprite config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/svg-sprite.config.json`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.SPRITE_CONFIG = `${process.env.PROJECT_CWD}/svg-sprite.config.json`
-  console.log('-> using svg-sprite.config project config!')
+  console.log('✳️  using local svg-sprite.config !')
 } catch (err) {
-  console.log('-> using svg-sprite.config package config!')
+  console.log('⚛︎  using Taskrunner svg-sprite.config !')
   process.env.SPRITE_CONFIG = `./svg-sprite.config.json`
 }
 
@@ -52,6 +52,10 @@ if (child.stdin) {
   process.stdin.pipe(child.stdin)
 }
 
+if (child.stderr) {
+  process.stderr.pipe(child.stderr)
+}
+
 if (child.stdout) {
   child.stdout.on('data', (data) => {
     console.log(`child stdout:\n${data}`)

diff --git a/cli/dev.js b/cli/dev.js
@@ -11,27 +11,27 @@ process.env.PROJECT_CWD = process.env.PWD
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.dev.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_DEV_CONFIG = `${process.env.PROJECT_CWD}/webpack.dev.js`
-  console.log('-> using webpack.dev project config!')
+  console.log('✳️  using local webpack.dev config')
 } catch (err) {
-  console.log('-> using webpack.dev package config!')
+  console.log('⚛︎  using Taskrunner webpack.dev config!')
   process.env.WEBPACK_DEV_CONFIG = `./webpack.dev.js`
 }
 // check if we have a webpack.critical config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.critical.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_CRITICAL_CONFIG = `${process.env.PROJECT_CWD}/webpack.critical.js`
-  console.log('-> using webpack.critical project config!')
+  console.log('✳️  using local webpack.critical config !')
 } catch (err) {
-  console.log('-> using webpack.critical package config!')
+  console.log('⚛︎  using Taskrunner webpack.critical config!')
   process.env.WEBPACK_CRITICAL_CONFIG = `./webpack.critical.js`
 }
 // check if we have a svg-sprite config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/svg-sprite.config.json`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.SPRITE_CONFIG = `${process.env.PROJECT_CWD}/svg-sprite.config.json`
-  console.log('-> using svg-sprite.config project config!')
+  console.log('✳️  using local svg-sprite.config !')
 } catch (err) {
-  console.log('-> using svg-sprite.config package config!')
+  console.log('⚛︎  using Taskrunner svg-sprite.config !')
   process.env.SPRITE_CONFIG = `./svg-sprite.config.json`
 }
 
@@ -49,6 +49,10 @@ if (child.stdin) {
   process.stdin.pipe(child.stdin)
 }
 
+if (child.stderr) {
+  process.stderr.pipe(child.stderr)
+}
+
 if (child.stdout) {
   child.stdout.on('data', (data) => {
     console.log(`child stdout:\n${data}`)

diff --git a/cli/export.js b/cli/export.js
@@ -21,6 +21,10 @@ if (child.stdin) {
   process.stdin.pipe(child.stdin)
 }
 
+if (child.stderr) {
+  process.stderr.pipe(child.stderr)
+}
+
 if (child.stdout) {
   child.stdout.on('data', (data) => {
     console.log(`child stdout:\n${data}`)

diff --git a/cli/newpattern.js b/cli/newpattern.js
@@ -21,6 +21,10 @@ if (child.stdin) {
   process.stdin.pipe(child.stdin)
 }
 
+if (child.stderr) {
+  process.stderr.pipe(child.stderr)
+}
+
 if (child.stdout) {
   child.stdout.on('data', (data) => {
     console.log(`child stdout:\n${data}`)

diff --git a/cli/release.js b/cli/release.js
@@ -12,45 +12,45 @@ const config = require(getProjectConfig())
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.dev.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_DEV_CONFIG = `${process.env.PROJECT_CWD}/webpack.dev.js`
-  console.log('-> using webpack.dev project config!')
+  console.log('✳️  using local webpack.dev config')
 } catch (err) {
-  console.log('-> using webpack.dev package config!')
+  console.log('⚛︎  using Taskrunner webpack.dev config!')
   process.env.WEBPACK_DEV_CONFIG = `./webpack.dev.js`
 }
 // check if we have a webpack.prod config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.prod.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_PROD_CONFIG = `${process.env.PROJECT_CWD}/webpack.prod.js`
-  console.log('-> using webpack.prod project config!')
+  console.log('✳️  using local webpack.prod config !')
 } catch (err) {
-  console.log('-> using webpack.prod package config!')
+  console.log('⚛︎  using Taskrunner webpack.prod config !')
   process.env.WEBPACK_PROD_CONFIG = `./webpack.prod.js`
 }
 // check if we have a webpack.cssmod config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.cssmod.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_CSSMOD_CONFIG = `${process.env.PROJECT_CWD}/webpack.cssmod.js`
-  console.log('-> using webpack.cssmod project config!')
+  console.log('✳️  using local webpack.cssmod config !')
 } catch (err) {
-  console.log('-> using webpack.cssmod package config!')
+  console.log('⚛︎  using Taskrunner webpack.cssmod config !')
   process.env.WEBPACK_CSSMOD_CONFIG = `./webpack.cssmod.js`
 }
 // check if we have a webpack.critical config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.critical.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_CRITICAL_CONFIG = `${process.env.PROJECT_CWD}/webpack.critical.js`
-  console.log('-> using webpack.critical project config!')
+  console.log('✳️  using local webpack.critical config !')
 } catch (err) {
-  console.log('-> using webpack.critical package config!')
+  console.log('⚛︎  using Taskrunner webpack.critical config!')
   process.env.WEBPACK_CRITICAL_CONFIG = `./webpack.critical.js`
 }
 // check if we have a svg-sprite config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/svg-sprite.config.json`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.SPRITE_CONFIG = `${process.env.PROJECT_CWD}/svg-sprite.config.json`
-  console.log('-> using svg-sprite.config project config!')
+  console.log('✳️  using local svg-sprite.config !')
 } catch (err) {
-  console.log('-> using svg-sprite.config package config!')
+  console.log('⚛︎  using Taskrunner svg-sprite.config !')
   process.env.SPRITE_CONFIG = `./svg-sprite.config.json`
 }
 
@@ -70,6 +70,10 @@ if (child.stdin) {
   process.stdin.pipe(child.stdin)
 }
 
+if (child.stderr) {
+  process.stderr.pipe(child.stderr)
+}
+
 if (child.stdout) {
   child.stdout.on('data', (data) => {
     console.log(`child stdout:\n${data}`)

diff --git a/cli/rsync.js b/cli/rsync.js
@@ -13,18 +13,18 @@ process.env.PROJECT_CWD = process.env.PWD
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/webpack.dev.js`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.WEBPACK_DEV_CONFIG = `${process.env.PROJECT_CWD}/webpack.dev.js`
-  console.log('-> using webpack.dev project config!')
+  console.log('✳️  using local webpack.dev config')
 } catch (err) {
-  console.log('-> using webpack.dev package config!')
+  console.log('⚛︎  using Taskrunner webpack.dev config!')
   process.env.WEBPACK_DEV_CONFIG = `./webpack.dev.js`
 }
 // check if we have a svg-sprite config in project root
 try {
   fs.accessSync(`${ process.env.PROJECT_CWD }/svg-sprite.config.json`, fs.constants.R_OK | fs.constants.W_OK)
   process.env.SPRITE_CONFIG = `${process.env.PROJECT_CWD}/svg-sprite.config.json`
-  console.log('-> using svg-sprite.config project config!')
+  console.log('✳️  using local svg-sprite.config !')
 } catch (err) {
-  console.log('-> using svg-sprite.config package config!')
+  console.log('⚛︎  using Taskrunner svg-sprite.config !')
   process.env.SPRITE_CONFIG = `./svg-sprite.config.json`
 }
 
@@ -52,6 +52,10 @@ if (child.stdin) {
   process.stdin.pipe(child.stdin)
 }
 
+if (child.stderr) {
+  process.stderr.pipe(child.stderr)
+}
+
 if (child.stdout) {
   child.stdout.on('data', (data) => {
     console.log(`child stdout:\n${data}`)

diff --git a/fractal-config.js b/fractal-config.js
@@ -123,12 +123,12 @@ try {
 
   if (config.server) {
     fractalServerConfig = _.defaultsDeep(config.server, fractalServerConfig)
-    console.error('found Fractal server config in project!')
+    console.log('✳️  using local Fractal config!')
   }
 
   if (config.mandelbrot) {
     mandelbrotDefaults = _.defaultsDeep(config.mandelbrot, mandelbrotDefaults)
-    console.error('found Fractal mandelbrot config in project!')
+    console.log('✳️  using local mandelbrot config!')
   }
 
   const hooks = config.hooks
@@ -148,9 +148,9 @@ try {
       }
     })
   })
-  console.error('found Fractal hooks in project!')
+  console.log('✳️  using local Fractal hooks!')
 } catch (err) {
-  console.error('no hooks found in project!', err)
+  console.error(err)
 }
 
 /*

diff --git a/lib/critical-css.js b/lib/critical-css.js
@@ -22,11 +22,17 @@ module.exports = {
         data: file,
       })
       // autoprefix
-      let postCss = useAutoprefixer ? postcss([autoprefixer]).process(cssStream.css, { from: undefined }).css : cssStream.css
+      let css = ''
+      if (useAutoprefixer) {
+        // [autoprefixer({ grid: 'autoplace' })]
+        css = postcss([autoprefixer]).process(cssStream.css, { from: undefined }).css
+      } else {
+        css = cssStream.css.toString()
+      }
       // fix font paths
-      postCss = postCss.replace(/(\.\.\/fonts\/)/gm, '/assets/fonts/')
+      css = css.replace(/(\.\.\/fonts\/)/gm, '/assets/fonts/')
       // minify
-      const minifiedCss = csso.minify(postCss).css
+      const minifiedCss = csso.minify(css).css
       // return string
       return '/* critical css injection */\n' + minifiedCss
     } catch (err) {