changes

- fix errors when running individual tasks
- remove wrap theme plugin
- add htmlSearchPaths option
- disable RTL by default
- disable Sass $theme variable injection by default

Author: lazabogdan

README.md

@@ -77,8 +77,18 @@ runTasks:
   copy: true
   sass: true
   html: true
-enableCssThemes: true
-enableCssRTL: true
+# injects $theme Sass variable
+enableCssThemes: false
+# create additional .rtl.css
+enableCssRTL: false
+# expose globals
+expose: []
+# copy assets list i.e. 
+# copyCwd: node_modules
+# copyDest: dist/assets/vendor
+# copy: 
+#  - bootstrap/dist/bootstrap.js
+# => will copy node_modules/bootstrap/dist/bootstrap.js to dist/assets/vendor/bootstrap.js
 copyCwd: node_modules
 copyDest: dist/assets/vendor
 copy:
@@ -94,8 +104,10 @@ sassSrc: src/sass/*.scss
 cssDest: dist/assets/css
 jsSrc: src/js/**/**.{js,vue}
 jsDest: dist/assets/js
+htmlSearchPaths:
+  - ./src/html
 htmlDest: dist/[path][name].html
-htmllint: true,
+htmllint: false
 laravelMixOptions:
   processCssUrls: false
 browserSync:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "theme-mix",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "author": "FrontendMatter <contact@frontendmatter.com> (http://www.frontendmatter.com)",
   "dependencies": {
     "async": "^2.4.1",

webpack-wrap-theme-plugin.js

@@ -20,9 +20,9 @@ config.merge({
     sass: true,
     html: true,
   },
-  enableCssThemes: true,
+  enableCssThemes: false,
   // create additional .rtl.css
-  enableCssRTL: true,
+  enableCssRTL: false,
   // expose globals
   expose: [],
   // copy assets list i.e. 
@@ -41,6 +41,9 @@ config.merge({
   cssDest: 'dist/assets/css',
   jsSrc: 'src/js/**/**.{js,vue}',
   jsDest: 'dist/assets/js',
+  htmlSearchPaths: [
+    './src/html'
+  ],
   htmlDest: 'dist/[path][name].html',
   htmllint: true,
   // options passed to laravel-mix
@@ -194,10 +197,10 @@ mix.extend('addSassIncludePaths', function(webpackConfig) {
   )
 })
 
-mix.addSassIncludePaths()
-
 // npm run development -- --env.run sass
 if (__RUN === 'sass' || (!__RUN && config.get('runTasks:sass'))) {
+  mix.addSassIncludePaths()
+
   let __DIST_CSS = config.get('cssDest')
 
   let sassOptions = {
@@ -239,26 +242,6 @@ if (__RUN === 'sass' || (!__RUN && config.get('runTasks:sass'))) {
       ]
     })
   }
-
-  ///////////////////////////////////
-  // WRAP CSS with .theme-$__THEME //
-  ///////////////////////////////////
-
-  if (config.get('enableCssThemes')) {
-    const WebpackWrapThemePlugin = require('./webpack-wrap-theme-plugin')
-    const cacheDirectory = path.resolve(path.join('temp', 'themeClass', __THEME))
-
-    del.sync(cacheDirectory)
-
-    webpackConfig = merge(webpackConfig, {
-      plugins: [
-        new WebpackWrapThemePlugin({ 
-          themeClass: '.theme-' + __THEME,
-          cacheDirectory
-        })
-      ]
-    })
-  }
 }
 
 //////////////
@@ -292,9 +275,7 @@ if (__RUN === 'html' || (!__RUN && config.get('runTasks:html'))) {
   loaders = loaders.concat(['jsbeautify-loader', {
     loader: 'nunjucks-html-loader',
     options: {
-      searchPaths: [
-        './src/html'
-      ]
+      searchPaths: config.get('htmlSearchPaths')
     }
   }, 'front-matter-loader'])