Merge pull request #5 from KevinPy/develop

2.3.0

.eslintrc

@@ -3,9 +3,11 @@
     "node": true,
     "browser": true
   },
-  "ecmaFeatures": {
-    "jsx": true,
-    "modules": true
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true,
+      "modules": true
+    }
   },
   "plugins": [
     "react"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "iceberg-bp",
   "description": "Front-End Starter for your Web Projects with React, Webpack, Babel and SASS",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "author": "Kevin Py",
   "license": "MIT",
   "repository": {
@@ -12,41 +12,52 @@
     "url": "https://github.com/KevinPy/Iceberg/issues"
   },
   "dependencies": {
+    "node-sass": "^4.5.2",
+    "normalize.css": "^7.0.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "react-router-dom": "^4.1.1"
+  },
+  "devDependencies": {
     "babel-core": "^6.24.1",
     "babel-eslint": "^8.0.1",
+    "babel-jest": "^21.2.0",
     "babel-loader": "^7.0.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",
+    "enzyme": "^3.1.0",
+    "enzyme-adapter-react-16": "^1.0.2",
     "eslint": "^4.9.0",
     "eslint-loader": "^1.7.1",
     "eslint-plugin-react": "^7.4.0",
     "extract-text-webpack-plugin": "^3.0.1",
     "file-loader": "^1.1.5",
     "html-webpack-plugin": "^2.28.0",
-    "node-sass": "^4.5.2",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0",
-    "react-router-dom": "^4.1.1",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^21.2.1",
+    "react-addons-test-utils": "^15.6.2",
+    "react-test-renderer": "^16.0.0",
     "resolve-url-loader": "^2.0.2",
     "sass-loader": "^6.0.3",
     "style-loader": "^0.19.0",
+    "webpack": "^3.8.1",
     "webpack-dev-server": "^2.4.2"
   },
-  "devDependencies": {
-    "babel-jest": "^21.2.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "enzyme": "^3.1.0",
-    "enzyme-adapter-react-16": "^1.0.2",
-    "jest": "^21.2.1",
-    "react-addons-test-utils": "^15.6.2",
-    "react-test-renderer": "^16.0.0",
-    "webpack": "^3.8.1"
-  },
   "scripts": {
     "build": "webpack -p",
     "start": "webpack-dev-server",
     "test": "jest --setupTestFrameworkScriptFile=raf/polyfill"
+  },
+  "jest": {
+    "moduleNameMapper": {
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/src/app/js/fileTransform.js",
+      "\\.(css|scss)$": "identity-obj-proxy"
+    },
+    "testPathIgnorePatterns": [
+      "<rootDir>/node_modules/"
+    ]
   }
 }

readme.md

@@ -14,28 +14,15 @@ Iceberg is built with React + Babel + Webpack + SASS. It's a solution for start
 ***
 #### Installation
 ```
-$ git clone git@github.com:KevinPy/Iceberg.git
+$ git clone https://github.com/KevinPy/Iceberg.git
 $ cd Iceberg
 $ npm install
 ```
 #### Scripts
 `npm start` : Launch `webpack-dev-server` with Hot Module Replacement - http://localhost:8080<br />
 `npm run build` : Compile **/src** folder and create **/dist** folder<br />
 `npm run test` : Launch tests<br />
-#### Structure
-```
-/src
-    |- /assets
-        |- /images
-        |- /styles
-            |- /main.scss
-    |- /js
-        |- components
-            |- App.jsx
-            |- NotFound.jsx
-    |- index.html
-    |- index.js
-```
+
 #### TODO
 [x] Tests<br />
 [x] ESLint<br />

src/js/components/App.jsx → src/app/components/App/App.jsx

@@ -1,9 +1,12 @@
 import React, { Component } from 'react';
+import './App.scss';
 
 export default class App extends Component {
   render() {
     return (
-      <h1>It's Works !</h1>
+      <div className="App">
+        <h1>Welcome to Iceberg !</h1>
+      </div>
     );
   }
 }

src/app/components/App/App.scss

@@ -0,0 +1,3 @@
+.App {
+
+}

__tests__/components/App.test.js → src/app/components/App/App.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import App from '../../src/js/components/App';
+import App from './App';
 import { shallow, configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 
@@ -10,6 +10,6 @@ test('Get h1 content', () => {
     <App/>
   );
   const expected = wrapper.find('h1').text();
-  const result = 'It\'s Works !';
+  const result = 'Welcome to Iceberg !';
   expect(expected).toBe(result);
 });

src/js/components/NotFound.jsx → src/app/components/NotFound/NotFound.jsx

@@ -1,9 +1,12 @@
 import React, { Component } from 'react';
+import './NotFound.scss';
 
 export default class NotFound extends Component {
   render() {
     return (
-      <h1>Page not found !</h1>
+      <div className="NotFound">
+        <h1>Page not found !</h1>
+      </div>
     );
   }
 }

src/app/components/NotFound/NotFound.scss

@@ -0,0 +1,3 @@
+.NotFound {
+
+}

__tests__/components/NotFound.test.js → src/app/components/NotFound/NotFound.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import NotFound from '../../src/js/components/NotFound';
+import NotFound from './NotFound';
 import { shallow, configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 

src/assets/js/fileTransformer.js

@@ -0,0 +1,7 @@
+const path = require('path');
+
+module.exports = {
+  process(src, filename, config, options) {
+    return 'module.exports = ' + JSON.stringify(path.basename(filename)) + ';';
+  },
+};