Skip to content

Commit d6efd39

Browse files
author
Jeff Escalante
committed
switch over to babel and postcss
1 parent 700ccc6 commit d6efd39

10 files changed

Lines changed: 35 additions & 96 deletions

File tree

root/app.coffee

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
axis = require 'axis'
2-
rupture = require 'rupture'
3-
autoprefixer = require 'autoprefixer-stylus'
4-
js_pipeline = require 'js-pipeline'
5-
css_pipeline = require 'css-pipeline'
1+
cssnext = require 'postcss-cssnext'
2+
imports = require 'postcss-import'
3+
whitespace = require 'css-whitespace'
4+
js_pipeline = require 'js-pipeline'
65

76
module.exports =
87
ignores: ['readme.md', '**/layout.*', '**/_*', '.gitignore', 'ship.*conf']
98

109
extensions: [
1110
js_pipeline(files: 'assets/js/*.coffee'),
12-
css_pipeline(files: 'assets/css/*.styl')
1311
]
1412

15-
stylus:
16-
use: [axis(), rupture(), autoprefixer()]
17-
sourcemap: true
13+
babel:
14+
presets: ['es2015', 'stage-2']
1815

19-
'coffee-script':
20-
sourcemap: true
16+
postcss:
17+
use: [imports(transform: whitespace), cssnext]
18+
from: 'assets/css/master.css'
2119

2220
jade:
2321
pretty: true

root/assets/css/_global.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
body
2+
padding: 50px
3+
font-family: "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif
4+
color: #555
5+
-webkit-font-smoothing: antialiased
6+
-webkit-text-size-adjust: 100%
7+
-ms-text-size-adjust: 100%
8+
font-size-adjust: auto

root/assets/css/_settings.styl

Lines changed: 0 additions & 68 deletions
This file was deleted.

root/assets/css/master.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/* See http://cssnext.io for extra available css features! */
2+
/* Use this file to split out your css to multiple files. Just make sure to
3+
@import the file name here so it's included! */
4+
5+
@import "_global"

root/assets/css/master.styl

Lines changed: 0 additions & 7 deletions
This file was deleted.

root/assets/js/main.coffee

Lines changed: 0 additions & 1 deletion
This file was deleted.

root/assets/js/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log('Hello there! You can use ES6 here : )')

root/package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22
"name": "<%= S(name).dasherize().value() %>",
33
"description": "<%= description %>",
44
"dependencies": {
5-
"autoprefixer-stylus": "0.8.x",
65
"axis": "0.5.x",
7-
"coffee-script": "^1.0.0",
8-
"css-pipeline": "0.3.x",
9-
"jade": "^1.0.0",
6+
"babel-core": "6.x",
7+
"babel-preset-es2015": "6.x",
8+
"babel-preset-stage-2": "6.x",
9+
"css-whitespace": "1.x",
10+
"postcss": "5.x",
11+
"postcss-cssnext": "2.x",
12+
"postcss-import": "8.x",
13+
"jade": "1.x",
1014
"js-pipeline": "0.2.x",
11-
"jstransformer-marked": "^1.0.0",
15+
"jstransformer-marked": "1.x",
1216
"marked": "0.3.x",
13-
"rupture": "0.6.x",
14-
"stylus": "0.52.x"
17+
"rupture": "0.6.x"
1518
}
1619
}

root/views/index.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extends layout
22

33
block content
4-
h3 Welcome to roots!
4+
h3 Welcome to Roots!
55
:marked
66
Find tutorials and documentation at http://roots.cx : )

root/views/layout.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ html
99
//- uncomment if your site is responsive!
1010
//- meta(name="viewport" content="width=device-width, initial-scale=1")
1111
title= _path
12-
!= css()
12+
link(rel='stylesheet', href='css/master.css')
1313

1414
body
1515
block content

0 commit comments

Comments
 (0)