From 7917697cfefd79cc4d673161e5ebfb9646aa692a Mon Sep 17 00:00:00 2001
From: codecalm <codecalm@gmail.com>
Date: Sat, 21 Dec 2019 00:17:40 +0100
Subject: [PATCH] tmp-dist build dir fix

---
 .gitignore             |  1 +
 build/browsersync.js   |  2 +-
 build/rollup.config.js |  5 ++++-
 build/scss-compile.js  | 10 +++++++---
 package.json           | 10 ++++++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36908154b..f5c2ec772 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ node_modules/
 .jekyll-metadata
 .jekyll-cache
 tmp/
+tmp-dist/
 /yarn.lock
 .DS_Store
 /Gemfile.lock
diff --git a/build/browsersync.js b/build/browsersync.js
index e787e6959..09678293c 100755
--- a/build/browsersync.js
+++ b/build/browsersync.js
@@ -12,7 +12,7 @@ bs.init({
   server: {
     routes: {
       '/': 'tmp',
-      '/dist': 'dist',
+      '/dist': 'tmp-dist',
       '/dist/fonts': 'fonts',
       '/libs': 'static/libs',
       '/img': 'static/img',
diff --git a/build/rollup.config.js b/build/rollup.config.js
index ff34a1d7f..f7ec051b2 100644
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -8,6 +8,7 @@
 'use strict';
 
 const BUNDLE  = process.env.BUNDLE === 'true';
+const dir = BUNDLE ? 'dist' : 'tmp-dist';
 
 import path from 'path';
 import babel from 'rollup-plugin-babel';
@@ -34,6 +35,8 @@ if (BUNDLE) {
   ]);
 }
 
+
+
 module.exports = {
   context: "window",
   input: {
@@ -43,7 +46,7 @@ module.exports = {
   output: {
     banner,
     // name: 'tabler',
-    dir: path.resolve(__dirname, `../dist/js/`),
+    dir: path.resolve(__dirname, `../${dir}/js/`),
     entryFileNames: BUNDLE ? '[name].min.js' : '[name].js',
     format: 'cjs'
   },
diff --git a/build/scss-compile.js b/build/scss-compile.js
index de4502fcb..802da3c8d 100644
--- a/build/scss-compile.js
+++ b/build/scss-compile.js
@@ -5,12 +5,16 @@
  * Licensed under MIT (https://github.com/tabler/tabler/blob/master/LICENSE)
  */
 
+const BUNDLE  = process.env.BUNDLE === 'true';
+
 const path = require('path'),
   glob = require("glob"),
   fs = require("fs"),
   sass = require("node-sass"),
   packageImporter = require('node-sass-package-importer');
 
+const dir = BUNDLE ? 'dist' : 'tmp-dist';
+
 glob("scss/tabler*.scss", {}, function (er, files) {
   files.forEach(function(file){
     var basename = path.basename(file, '.scss');
@@ -18,7 +22,7 @@ glob("scss/tabler*.scss", {}, function (er, files) {
     sass.render(
       {
         file: file,
-        outFile: `dist/css/${basename}.css`,
+        outFile: `${dir}/css/${basename}.css`,
         sourceMap: true,
         sourceMapContents: true,
         precision: 7,
@@ -26,13 +30,13 @@ glob("scss/tabler*.scss", {}, function (er, files) {
       },
       (error, result) => {
         if (!error) {
-          fs.writeFile(`dist/css/${basename}.css`, result.css, error => {
+          fs.writeFile(`${dir}/css/${basename}.css`, result.css, error => {
             if (error) {
               console.log(error);
             }
           });
 
-          fs.writeFile(`dist/css/${basename}.css.map`, result.map, error => {
+          fs.writeFile(`${dir}/css/${basename}.css.map`, result.map, error => {
             if (error) {
               console.log(error);
             }
diff --git a/package.json b/package.json
index 102620818..e40b3deec 100644
--- a/package.json
+++ b/package.json
@@ -6,20 +6,22 @@
   "scripts": {
     "start": "npm-run-all clean css-main js-compile-standalone --parallel browsersync watch",
     "start-incremental": "npm-run-all clean css-main js-compile-standalone --parallel browsersync watch-incremental",
-    "build": "npm-run-all clean html-build css js assets-copy",
+    "build": "BUNDLE:true npm-run-all clean-build html-build css js assets-copy",
     "bundlesize": "bundlesize",
     "browsersync": "node build/browsersync.js",
     "assets-copy": "mkdir -p demo/dist && cp -R dist/* demo/dist/ && cp -R static/* demo/",
     "html-build": "JEKYLL_ENV=production bundle exec jekyll build --destination demo",
     "lint": "npm-run-all --parallel js-lint css-lint",
-    "clean": "rm -rf dist && mkdir dist && mkdir dist/css && mkdir dist/js",
+    "clean": "rm -rf tmp-dist && mkdir tmp-dist && mkdir tmp-dist/css && mkdir tmp-dist/js",
+    "clean-build": "rm -rf dist && mkdir dist && mkdir dist/css && mkdir dist/js",
     "css": "npm-run-all css-compile css-prefix css-minify",
     "css-compile": "node build/scss-compile.js",
-    "css-prefix": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"",
+    "css-prefix": "postcss --config build/postcss.config.js --replace \"tmp-dist/css/*.css\" \"!tmp-dist/css/*.min.css\"",
+    "css-prefix-build": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"",
     "css-minify": "for i in dist/css/tabler*.css;do echo $i; N=`echo $i | sed -e 's/^dist\\/css\\///g' | sed -e 's/\\\\.css//g'`; echo $N; cleancss --level 1 --format breakWith=lf --source-map --source-map-inline-sources --output dist/css/$N.min.css dist/css/$N.css; done",
     "css-lint": "stylelint \"scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache",
     "css-main": "npm-run-all css-compile css-prefix",
-    "css-main-build": "npm-run-all css-lint css-compile css-prefix css-minify",
+    "css-main-build": "npm-run-all css-lint css-compile css-prefix-build css-minify",
     "watch": "npm-run-all --parallel watch-css watch-js watch-html",
     "watch-incremental": "npm-run-all --parallel watch-css watch-js watch-html-incremental",
     "watch-css": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"",