Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"main": "src/index.js",
"scripts": {
"clean": "rimraf dist/*",
"start": "webpack-dev-server --mode development --open --hot --config webpack.config.dev.js",
"dist": "npm run clean && webpack --mode production --config webpack.config.prod.js",
"start": "webpack-dev-server --mode development --open --hot --config webpack.config.js",
"dist": "npm run clean && webpack --mode production --config webpack.config.js",
"deploy": "npm run dist && gh-pages -d dist",
"build:docker": "npm run dist && docker build -t reactdocker .",
"lint": "eslint ./src",
Expand Down
4 changes: 2 additions & 2 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// browser support list see here: https://github.com/ai/browserslist#queries
module.exports = ({ file, options, env }) => ({
plugins: {
'autoprefixer': { browsers: 'last 2 version' },
autoprefixer: { browsers: 'last 2 version' },
}
});
});
5 changes: 3 additions & 2 deletions src/containers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import React, { Component } from 'react';
export default class Main extends Component {
render() {
return (
<div>
<span>Hello, I`m ReactMaker.</span>
<div style={{ textAlign: 'center' }}>
<h2>Hello, I`m ReactMaker.</h2>
<p>To get started, edit containers/index.js</p>
</div>
);
}
Expand Down
27 changes: 13 additions & 14 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { AppContainer } from 'react-hot-loader';
import Main from 'containers/';

ReactDOM.render(
<AppContainer>
<Main />
</AppContainer>,
document.getElementById('app')
);
const render = () => {
const Main = require('containers').default;

ReactDOM.render(
<AppContainer>
<Main />
</AppContainer>,
document.getElementById('app')
);
};

render();

// migrate by this guide
// https://github.com/gaearon/react-hot-loader/tree/master/docs#migration-to-30
if (module.hot) {
module.hot.accept('containers/', () => {
const NewMain = require('containers/').default;
ReactDOM.render(
<AppContainer>
<NewMain />
</AppContainer>,
document.getElementById('app')
);
render();
});
}
6 changes: 0 additions & 6 deletions webpack.config.dev.js

This file was deleted.

1 change: 1 addition & 0 deletions webpack.config.base.js → webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const path = require('path');
const HtmlWebPackPlugin = require("html-webpack-plugin");

module.exports = {
module: {
rules: [
Expand Down
6 changes: 0 additions & 6 deletions webpack.config.prod.js

This file was deleted.