Skip to content

Commit

Permalink
Update build tools.
Browse files Browse the repository at this point in the history
  • Loading branch information
@randallknutson
randallknutson committed Jun 13, 2017
1 parent 672c83f commit 1a5ca83
Show file tree
Hide file tree
Showing 9 changed files with 110 additions and 55 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -2,3 +2,4 @@
coverage/
dist/
node_modules/
package-lock.json
4 changes: 4 additions & 0 deletions conf/webpack-dist.conf.js
View file
Expand Up @@ -30,6 +30,10 @@ module.exports = {
use: 'css-loader?minimize!sass-loader!postcss-loader'
})
},
{
test: /\.(woff2?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
loader: "file-loader?name=fonts/[name].[ext]"
},
{
test: /\.js$/,
exclude: /node_modules/,
Expand Down
4 changes: 4 additions & 0 deletions conf/webpack-test.conf.js
View file
Expand Up @@ -14,6 +14,10 @@ module.exports = {
loader: 'eslint-loader',
enforce: 'pre'
},
{
test: /\.(woff2?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
loader: "file-loader?name=fonts/[name].[ext]"
},
{
test: /\.js$/,
exclude: /node_modules/,
Expand Down
4 changes: 4 additions & 0 deletions conf/webpack.conf.js
View file
Expand Up @@ -30,6 +30,10 @@ module.exports = {
'postcss-loader'
]
},
{
test: /\.(woff2?|ttf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
loader: "file-loader?name=fonts/[name].[ext]"
},
{
test: /\.js$/,
exclude: /node_modules/,
Expand Down
94 changes: 58 additions & 36 deletions package.json
View file
@@ -1,61 +1,74 @@
{
"dependencies": {
"babel-polyfill": "^6.23.0",
"bootstrap-sass": "^3.3.7",
"bootswatch": "^3.3.7",
"classnames": "^2.2.5",
"es6-shim": "^0.35.3",
"eslint-config-formio": "^1.1.2",
"file-loader": "^0.11.2",
"prop-types": "^15.5.10",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-formio": "^2.0.0-alpha2",
"react-redux": "^5.0.2",
"react-router": "^3.0.2",
"axios": "^0.15.3"
"redux": "^3.6.0"
},
"devDependencies": {
"react-addons-test-utils": "^15.4.2",
"@types/classnames": "^0.0.32",
"@types/react": "^15.0.11",
"@types/react-dom": "^0.14.23",
"@types/react-addons-test-utils": "^0.14.17",
"@types/react-dom": "^0.14.23",
"@types/react-redux": "^4.4.36",
"@types/react-router": "^3.0.3",
"autoprefixer": "^6.7.3",
"babel-core": "^6.23.1",
"babel-eslint": "^7.1.1",
"babel-loader": "^6.3.2",
"babel-plugin-istanbul": "^4.0.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.23.0",
"browser-sync": "^2.18.8",
"browser-sync-spa": "^1.0.3",
"css-loader": "^0.26.1",
"del": "^2.2.2",
"es6-shim": "^0.35.3",
"eslint": "^3.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-config-formio": "^1.1.3",
"eslint-loader": "^1.6.1",
"eslint-plugin-babel": "^4.0.1",
"eslint-plugin-import": "^2.3.0",
"eslint-plugin-jsx-a11y": "^5.0.3",
"eslint-plugin-react": "^7.0.1",
"extract-text-webpack-plugin": "^2.0.0-rc.3",
"gulp": "gulpjs/gulp#4ed9a4a3275559c73a396eff7e1fde3824951ebb",
"gulp-hub": "frankwallis/gulp-hub#d461b9c700df9010d0a8694e4af1fb96d9f38bf4",
"gulp-filter": "^5.0.0",
"gulp-util": "^3.0.8",
"gulp-hub": "frankwallis/gulp-hub#d461b9c700df9010d0a8694e4af1fb96d9f38bf4",
"gulp-sass": "^3.1.0",
"browser-sync": "^2.18.8",
"browser-sync-spa": "^1.0.3",
"gulp-util": "^3.0.8",
"html-webpack-plugin": "^2.28.0",
"jasmine": "^2.5.3",
"json-loader": "^0.5.4",
"karma": "^1.4.1",
"karma-coverage": "^1.1.1",
"karma-jasmine": "^1.1.0",
"karma-junit-reporter": "^1.2.0",
"jasmine": "^2.5.3",
"es6-shim": "^0.35.3",
"karma-phantomjs-launcher": "^1.0.2",
"karma-phantomjs-shim": "^1.4.0",
"phantomjs-prebuilt": "^2.1.14",
"karma-webpack": "^2.0.2",
"babel-plugin-istanbul": "^4.0.0",
"webpack": "^2.2.1",
"html-webpack-plugin": "^2.28.0",
"style-loader": "^0.13.1",
"css-loader": "^0.26.1",
"node-sass": "^4.5.0",
"phantomjs-prebuilt": "^2.1.14",
"postcss-loader": "^1.3.1",
"autoprefixer": "^6.7.3",
"json-loader": "^0.5.4",
"extract-text-webpack-plugin": "^2.0.0-rc.3",
"webpack-fail-plugin": "^1.0.5",
"webpack-dev-middleware": "^1.10.1",
"webpack-hot-middleware": "^2.17.0",
"react-addons-test-utils": "^15.4.2",
"react-hot-loader": "^1.3.1",
"sass-loader": "^6.0.1",
"node-sass": "^4.5.0",
"eslint": "^3.15.0",
"eslint-config-xo-space": "^0.15.0",
"babel-preset-react": "^6.23.0",
"eslint-config-xo-react": "^0.10.0",
"eslint-plugin-react": "^6.10.0",
"eslint-loader": "^1.6.1",
"babel-loader": "^6.3.2",
"babel-eslint": "^7.1.1",
"eslint-plugin-babel": "^4.0.1",
"babel-core": "^6.23.1",
"babel-polyfill": "^6.23.0",
"babel-preset-es2015": "^6.22.0"
"style-loader": "^0.13.1",
"webpack": "^2.6.1",
"webpack-dev-middleware": "^1.10.1",
"webpack-fail-plugin": "^1.0.5",
"webpack-hot-middleware": "^2.17.0"
},
"scripts": {
"build": "gulp",
Expand All @@ -71,9 +84,18 @@
"jasmine": true
},
"extends": [
"xo-react/space",
"xo-space/esnext"
"airbnb",
"formio"
],
"globals": {
"window": true,
"document": true,
"require": true,
"module": true,
"global": true,
"fetch": true,
"FormioComponents": true
},
"parser": "babel-eslint"
}
}
8 changes: 4 additions & 4 deletions src/app/main.js
View file
Expand Up @@ -21,12 +21,12 @@ export class Main extends Component {
render() {
return (
<div style={styles.container}>
<Header/>
<Header />
<main style={styles.main}>
<Title/>
<Techs/>
<Title />
<Techs />
</main>
<Footer/>
<Footer />
</div>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/title.js
View file
Expand Up @@ -33,8 +33,8 @@ export class Title extends Component {
<div style={styles.title}>
<h1 style={styles.h1}>&apos;Allo, &apos;Allo!</h1>
<div>
<img style={styles.logo} src="http://fountainjs.io/assets/imgs/yeoman.png"/>
<img style={styles.logo} src="http://fountainjs.io/assets/imgs/fountain.png"/>
<img style={styles.logo} src="http://fountainjs.io/assets/imgs/yeoman.png" />
<img style={styles.logo} src="http://fountainjs.io/assets/imgs/fountain.png" />
</div>
<h2 style={styles.h2}>Always a pleasure scaffolding your apps.</h2>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
View file
Expand Up @@ -10,7 +10,7 @@ import './index.scss';

ReactDOM.render(
<Router history={browserHistory}>
<Route path="/" component={Main}/>
<Route path="/" component={Main} />
</Router>,
document.getElementById('root')
);
44 changes: 32 additions & 12 deletions src/index.scss
View file
@@ -1,18 +1,38 @@
html, body, #root {
margin: 0;
height: 100%;
font-family: 'Open Sans', sans-serif;
$icon-font-path: "../node_modules/bootstrap-sass/assets/fonts/bootstrap/";
@import "../node_modules/bootswatch/yeti/_variables.scss";
@import "../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
@import "../node_modules/bootswatch/yeti/_bootswatch.scss";

.navbar {
margin-bottom: 0;
}

.text-blue {
color: #127ABF;
}

.text-green {
color: #449414;
}

.hero-image {
display: inline;
height: 2em;
}

body, h1, h2, h3 {
font-weight: 300
.main {
margin-top: 40px;
}

a {
color: white;
text-decoration: none;
.logo {
height: 2em;
margin-top: -0.5em;
}

&:hover {
color: #5aadbb;
}
.footer {
text-align: center;
padding: 3em;
color: #777;
border-top: .05rem solid #e5e5e5;
margin-top: 20px;
}

0 comments on commit 1a5ca83

Please sign in to comment.