Skip to content
This repository has been archived by the owner on Nov 29, 2020. It is now read-only.

Commit

Permalink
Merge pull request #263 from PrudhviRaj5/webpack-loaders-config
Browse files Browse the repository at this point in the history
webpack config changed for url and file loaders
  • Loading branch information
KleoPetroff authored Dec 2, 2017
2 parents 6659bf4 + 6c97944 commit 29a496d
Show file tree
Hide file tree
Showing 10 changed files with 11,402 additions and 36 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

Simple and optimized React boilerplate. It includes:

- [x] React 16.1.1
- [x] React 16.2.0
- [x] ECMAScript 6 and JSX support
- [x] React Router v4
- [x] Component testing using [Enzyme](https://github.com/airbnb/enzyme) and [Jest](https://facebook.github.io/jest)
- [x] Code Coverage
- [x] Latest Webpack (v.3.8.1) and Webpack Dev Server (v.2.9.4) with Scope Hoisting enabled
- [x] Latest Webpack (v.3.9.1) and Webpack Dev Server (v.2.9.5) with Scope Hoisting enabled
- [x] Hot Module Replacement using [react-hot-loader](https://github.com/gaearon/react-hot-loader)
- [x] ES6 linting with continuous linting on file change
- [x] SASS support
Expand Down
Binary file added app/assets/images/react_logo_512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion app/components/App.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
import React from 'react';
import img from '../assets/images/react_logo_512x512.png';

const App = () => {
return (
<h2 id="heading">Hello ReactJS</h2>
<div>
<h2 id="heading">Hello ReactJS</h2>
<img
className="image"
style={{ margin: '0.5em' }}
height="40"
width="40"
src={img}
alt="React Logo"
/>
</div>
);
};

Expand Down
7 changes: 7 additions & 0 deletions config/jest/assetsTransformer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const path = require('path');

module.exports = {
process(src, filename, config, options) {
return 'module.exports = ' + JSON.stringify(path.basename(filename)) + ';';
},
};
2 changes: 1 addition & 1 deletion shim.js → config/jest/shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

global.requestAnimationFrame = function(callback) {
setTimeout(callback, 0);
};
};
Loading

0 comments on commit 29a496d

Please sign in to comment.