Skip to content

Commit dd9fa47

Browse files
committed
sass compilation added
1 parent 89d3678 commit dd9fa47

File tree

6 files changed

+47
-41
lines changed

6 files changed

+47
-41
lines changed

bundle.js

+10-3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868

6969
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
7070

71+
__webpack_require__(332);
72+
7173
_reactDom2.default.render(_react2.default.createElement(
7274
_reactRedux.Provider,
7375
{ store: _store2.default },
@@ -34135,7 +34137,7 @@
3413534137

3413634138
var _posts_reducer2 = _interopRequireDefault(_posts_reducer);
3413734139

34138-
var _menu_reducer = __webpack_require__(332);
34140+
var _menu_reducer = __webpack_require__(331);
3413934141

3414034142
var _menu_reducer2 = _interopRequireDefault(_menu_reducer);
3414134143

@@ -34172,8 +34174,7 @@
3417234174
var _actions = __webpack_require__(273);
3417334175

3417434176
/***/ },
34175-
/* 331 */,
34176-
/* 332 */
34177+
/* 331 */
3417734178
/***/ function(module, exports, __webpack_require__) {
3417834179

3417934180
"use strict";
@@ -34195,5 +34196,11 @@
3419534196

3419634197
var _actions = __webpack_require__(273);
3419734198

34199+
/***/ },
34200+
/* 332 */
34201+
/***/ function(module, exports) {
34202+
34203+
// removed by extract-text-webpack-plugin
34204+
3419834205
/***/ }
3419934206
/******/ ]);

lib/theme-enqueue.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function theme() {
2727
'nonce' => wp_create_nonce( 'wp_rest' ),
2828
'siteName' => get_bloginfo('name')
2929
) );
30-
wp_enqueue_style(get_stylesheet(),get_stylesheet_uri());
30+
wp_enqueue_style(get_stylesheet(),get_template_directory_uri() . '/bundle.css');
3131
}
3232
}
3333

package.json

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
"babel-preset-es2015": "^6.18",
1717
"babel-preset-react": "^6.16",
1818
"babel-preset-stage-2": "^6.18",
19+
"css-loader": "^0.26.1",
20+
"extract-text-webpack-plugin": "^1.0.1",
21+
"node-sass": "^4.3.0",
22+
"postcss-loader": "^1.2.2",
1923
"react": "^15.4",
2024
"react-addons-css-transition-group": "^15.4.2",
2125
"react-dom": "^15.4",
@@ -25,6 +29,8 @@
2529
"redux-logger": "^2.7.4",
2630
"redux-promise-middleware": "^4.2.0",
2731
"redux-thunk": "^2.1.0",
32+
"sass-loader": "^4.1.1",
33+
"style-loader": "^0.13.1",
2834
"webpack": "^1.14"
2935
}
3036
}

src/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require('./sass/style.scss');
2+
13
import React from 'react';
24
import ReactDom from 'react-dom';
35
import {Provider} from 'react-redux';

style.css

-23
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,3 @@
22
Theme Name: React theme
33
Author: Jack Reichert
44
*/
5-
6-
.fade-enter {
7-
opacity: 0;
8-
}
9-
10-
.fade-enter-active {
11-
opacity: 1.0;
12-
transition: 0.5s ease-in all;
13-
}
14-
15-
.fade-leave {
16-
opacity: 1.0;
17-
}
18-
19-
.fade-leave-active {
20-
opacity: 0;
21-
transition: .01s ease-in all;
22-
}
23-
24-
img {
25-
max-width: 100%;
26-
height: auto;
27-
}

webpack.config.js

+28-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
1+
const ExtractTextPlugin = require("extract-text-webpack-plugin");
2+
const autoPrefixer = require('autoprefixer');
3+
14
module.exports = {
2-
entry: './src/index.js',
3-
output: { path: __dirname, filename: 'bundle.js' },
4-
module: {
5-
loaders: [
6-
{
7-
test: /.jsx?$/,
8-
exclude: /(node_modules|bower_components)/,
9-
loader: 'babel-loader',
10-
query: {
11-
presets: ['es2015', 'stage-2', 'react']
12-
}
13-
}
14-
]
15-
}
5+
entry: './src/index.js',
6+
output: {
7+
path: __dirname,
8+
filename: 'bundle.js'
9+
},
10+
module: {
11+
loaders: [
12+
{
13+
test: /\.jsx?$/,
14+
exclude: /(node_modules|bower_components)/,
15+
loader: 'babel-loader',
16+
query: {
17+
presets: ['es2015', 'stage-2', 'react']
18+
}
19+
},
20+
{
21+
test: /\.scss$/,
22+
loader: ExtractTextPlugin.extract('style-loader', 'css!sass!postcss?sourceMap')
23+
}
24+
]
25+
},
26+
plugins: [
27+
new ExtractTextPlugin("bundle.css", {allChunks: true})
28+
],
29+
postcss: [autoPrefixer({browsers: ['last 3 versions']})]
1630
};

0 commit comments

Comments
 (0)