Merge branch 'use-npm-remove-gulp'

.travis.yml

@@ -12,7 +12,8 @@ cache:
         - $HOME/.composer/cache
 
 before_install:
-    - npm install --production
+    - npm install
+    - npm run prod
     - composer install --prefer-dist --no-dev
 
 script:

assets/sass/main.sass

@@ -1,4 +1,4 @@
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap'
 
 @import 'base'
 @import 'mixins'

assets/sass/pages/_blog.sass

@@ -1,4 +1,4 @@
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
 
 .page--blog__list
     ul.posts

assets/sass/pages/_experience.sass

@@ -1,6 +1,6 @@
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
-@import 'mixins'
+@import '../mixins'
 
 .experience-item
     margin-bottom: $padding-large-vertical * 3

assets/sass/pages/_post.sass

@@ -1,4 +1,4 @@
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
 
 .post-pager
     clear: both

assets/sass/pages/_project.sass

@@ -1,5 +1,5 @@
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
-@import 'mixins'
+@import '../mixins'
 
 .project-company
     &.has-logo

assets/sass/pages/_talk.sass

@@ -1,5 +1,5 @@
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
-@import 'mixins'
+@import '../mixins'
 
 .talk-full h1
     margin-bottom: 25px

assets/sass/pages/_testimonials.sass

@@ -1,6 +1,6 @@
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins/clearfix'
-@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
+@import 'node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables'
-@import 'mixins'
+@import '../mixins'
 
 .testimonial
     +clearfix

package.json

@@ -1,26 +1,42 @@
 {
+  "config": {
+    "cssOutputDir": "source/assets/css/",
+    "cssOutputFile": "main.css",
+    "fontsDir": "source/assets/fonts/",
+    "jsInputDir": "assets/js/",
+    "jsOutputDir": "source/assets/js/",
+    "jsOutputFile": "site.js",
+    "sassDir": "assets/sass/"
+  },
   "scripts": {
-    "init": "yarn --pure-lockfile && bower install",
+    "build": "npm run clean && npm-run-all -p sass js fonts:copy",
-    "dev": "gulp watch",
+    "clean": "npm-run-all -p sass:clean fonts:clean js:clean",
-    "production": "gulp --production"
+    "dev": "npm run development",
+    "development": "npm run build && npm-run-all -p sass:watch js:watch",
+    "fonts:clean": "rm -rf $npm_package_config_fontsDir output_*/assets/fonts/",
+    "fonts:copy": "mkdir -p $npm_package_config_fontsDir && cp -R node_modules/font-awesome/fonts/* $npm_package_config_fontsDir",
+    "js": "npm run js:concat",
+    "js:clean": "rm -rf $npm_package_config_jsOutputDir output_*/assets/js/",
+    "js:concat": "mkdir -p $npm_package_config_jsOutputDir && concat node_modules/jquery/dist/jquery.js node_modules/bootstrap-sass/assets/javascripts/bootstrap.js node_modules/prismjs/prism.js node_modules/prismjs/components/prism-{apacheconf,bash,css,diff,ini,json,nginx,php,sass,scss,sql,less,twig,yaml}.js $npm_package_config_jsInputDir/**/*.js $npm_package_config_jsInputDir/main.js -o $npm_package_config_jsOutputDir$npm_package_config_jsOutputFile",
+    "js:watch": "onchange $npm_package_config_jsInputDir -v -- npm run js",
+    "prod": "npm run production",
+    "production": "npm run build",
+    "sass": "npm run sass:build && npm run sass:move",
+    "sass:build": "npm run sass:compile && npm run sass:concat",
+    "sass:clean": "rm -rf $npm_package_config_cssOutputDir output_*/assets/css/",
+    "sass:compile": "node-sass assets/sass/main.sass $npm_package_config_cssOutputFile --source-map true",
+    "sass:concat": "mkdir -p $npm_package_config_cssOutputDir && concat node_modules/font-awesome/css/font-awesome.css node_modules/prismjs/themes/prism-twilight.css $npm_package_config_cssOutputFile -o $npm_package_config_cssOutputFile",
+    "sass:move": "mv $npm_package_config_cssOutputFile $npm_package_config_cssOutputFile.map $npm_package_config_cssOutputDir",
+    "sass:watch": "onchange $npm_package_config_sassDir -v -- npm run sass"
   },
   "devDependencies": {
-    "bower": "^1.7.7",
+    "autoprefixer": "^7.1.2",
-    "del": "^2.2.0",
+    "concat": "^1.0.3",
-    "gulp": "^3.9.0",
+    "copy": "^0.3.0",
-    "gulp-autoprefixer": "^3.1.0",
+    "node-sass": "^4.5.3",
-    "gulp-clean-css": "^2.3.2",
+    "npm-run-all": "^4.0.2",
-    "gulp-concat": "^2.6.0",
+    "onchange": "^3.2.1",
-    "gulp-if": "^2.0.0",
+    "purify-css": "^1.2.5"
-    "gulp-load-plugins": "^1.1.0",
-    "gulp-plumber": "^1.0.1",
-    "gulp-purifycss": "^0.2.0",
-    "gulp-refresh": "^1.1.0",
-    "gulp-sass": "^2.3.2",
-    "gulp-sass-glob": "^1.0.5",
-    "gulp-sourcemaps": "^1.6.0",
-    "gulp-uglify": "^1.5.3",
-    "gulp-util": "^3.0.7"
   },
   "dependencies": {
     "bootstrap-sass": "^3.3.7",