From e1e34387456d5e9d41fa9ca0f9edcd4e1ed53d41 Mon Sep 17 00:00:00 2001
From: Thomas Cazade <cazade.thomas@gmail.com>
Date: Sat, 9 Dec 2017 10:07:58 +0100
Subject: [PATCH] Another attempt to include properly normalize.css

---
 gulpfile.js        |  6 +++--
 package-lock.json  | 66 ++++++++++++++++++++++++++++++++++++++++++++--
 package.json       |  1 +
 src/normalize.less |  1 -
 src/styles.less    |  1 -
 5 files changed, 69 insertions(+), 6 deletions(-)
 delete mode 100644 src/normalize.less

diff --git a/gulpfile.js b/gulpfile.js
index abaaa44..dbe50d8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,7 +2,8 @@ const gulp = require('gulp'),
   connect = require('gulp-connect'),
   less = require('gulp-less'),
   cleanCSS = require('gulp-clean-css'),
-  rename = require('gulp-rename');
+  rename = require('gulp-rename'),
+  concat = require('gulp-concat');
 
 gulp.task('webserver', function() {
   connect.server({
@@ -11,7 +12,8 @@ gulp.task('webserver', function() {
 });
 
 gulp.task('less', function() {
-  gulp.src('src/styles.less')
+  gulp.src(['node_modules/normalize.less/normalize.less', 'src/styles.less'])
+    .pipe(concat('papercss.less'))
     .pipe(less())
     .pipe(cleanCSS({format: 'beautify'}))
     .pipe(rename('paper.css'))
diff --git a/package-lock.json b/package-lock.json
index 378863b..76ee8c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1065,6 +1065,11 @@
       "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
       "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk="
     },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
+    },
     "clone-function": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/clone-function/-/clone-function-1.0.6.tgz",
@@ -1076,6 +1081,16 @@
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
       "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
     },
+    "cloneable-readable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
+      "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
+      "requires": {
+        "inherits": "2.0.3",
+        "process-nextick-args": "1.0.7",
+        "through2": "2.0.3"
+      }
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -1238,6 +1253,14 @@
         }
       }
     },
+    "concat-with-sourcemaps": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz",
+      "integrity": "sha1-9Vs74q60dgGxCi1SWcz7cP0vHdY=",
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
     "configstore": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
@@ -5002,6 +5025,46 @@
         "vinyl-sourcemaps-apply": "0.2.1"
       }
     },
+    "gulp-concat": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
+      "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
+      "requires": {
+        "concat-with-sourcemaps": "1.0.4",
+        "through2": "2.0.3",
+        "vinyl": "2.1.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs="
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA="
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs="
+        },
+        "vinyl": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
+          "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
+          "requires": {
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
+          }
+        }
+      }
+    },
     "gulp-connect": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.0.0.tgz",
@@ -11366,8 +11429,7 @@
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
       "version": "1.1.2",
diff --git a/package.json b/package.json
index ed80ef5..06b8dc1 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
   "dependencies": {
     "gulp": "3.9.1",
     "gulp-clean-css": "3.9.0",
+    "gulp-concat": "^2.6.1",
     "gulp-connect": "5.0.0",
     "gulp-less": "3.3.2",
     "gulp-plumber": "1.1.0",
diff --git a/src/normalize.less b/src/normalize.less
deleted file mode 100644
index 5e12d42..0000000
--- a/src/normalize.less
+++ /dev/null
@@ -1 +0,0 @@
-@import (less) "node_modules/normalize.less/normalize.less";
diff --git a/src/styles.less b/src/styles.less
index 73166c0..812fa3f 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -1,4 +1,3 @@
-@import (less) "./normalize.less";
 @import (less) "./boxreset.less";
 @import (less) "./colors.less";
 @import (less) "./fonts.less";