Refactored folder structure to add internals (#970)

forclan · May 3, 2017 · 72e85e2 · 72e85e2
1 parent 2b37c30
commit 72e85e2
Show file tree

Hide file tree

Showing 33 changed files with 17 additions and 99 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -16,10 +16,10 @@
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
 esproposal.export_star_as=enable
-module.name_mapper.extension='css' -> '<PROJECT_ROOT>/flow/CSSModule.js.flow'
-module.name_mapper.extension='styl' -> '<PROJECT_ROOT>/flow/CSSModule.js.flow'
-module.name_mapper.extension='scss' -> '<PROJECT_ROOT>/flow/CSSModule.js.flow'
-module.name_mapper.extension='png' -> '<PROJECT_ROOT>/flow/WebpackAsset.js.flow'
-module.name_mapper.extension='jpg' -> '<PROJECT_ROOT>/flow/WebpackAsset.js.flow'
+module.name_mapper.extension='css' -> '<PROJECT_ROOT>/internals/flow/CSSModule.js.flow'
+module.name_mapper.extension='styl' -> '<PROJECT_ROOT>/internals/flow/CSSModule.js.flow'
+module.name_mapper.extension='scss' -> '<PROJECT_ROOT>/internals/flow/CSSModule.js.flow'
+module.name_mapper.extension='png' -> '<PROJECT_ROOT>/internals/flow/WebpackAsset.js.flow'
+module.name_mapper.extension='jpg' -> '<PROJECT_ROOT>/internals/flow/WebpackAsset.js.flow'
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe
 suppress_comment=\\(.\\|\n\\)*\\$FlowIssue
diff --git a/README.md b/README.md
@@ -12,14 +12,14 @@
 [![OpenCollective](https://opencollective.com/electron-react-boilerplate/backers/badge.svg)](#backers)
 [![OpenCollective](https://opencollective.com/electron-react-boilerplate/sponsors/badge.svg)](#sponsors)
 
-[![React](/img/react-padded-90.png)](https://facebook.github.io/react/)
-[![Webpack](/img/webpack-padded-90.png)](https://webpack.github.io/)
-[![Redux](/img/redux-padded-90.png)](http://redux.js.org/)
-[![React Router](/img/react-router-padded-90.png)](https://github.com/ReactTraining/react-router)
-[![Flow](/img/flow-padded-90.png)](https://flowtype.org/)
-[![ESLint](/img/eslint-padded-90.png)](http://eslint.org/)
-[![Jest](/img/jest-padded-90.png)](https://facebook.github.io/jest/)
-[![Yarn](/img/yarn-padded-90.png)](https://yarnpkg.com/)
+[![React](/internals/img/react-padded-90.png)](https://facebook.github.io/react/)
+[![Webpack](/internals/img/webpack-padded-90.png)](https://webpack.github.io/)
+[![Redux](/internals/img/redux-padded-90.png)](http://redux.js.org/)
+[![React Router](/internals/img/react-router-padded-90.png)](https://github.com/ReactTraining/react-router)
+[![Flow](/internals/img/flow-padded-90.png)](https://flowtype.org/)
+[![ESLint](/internals/img/eslint-padded-90.png)](http://eslint.org/)
+[![Jest](/internals/img/jest-padded-90.png)](https://facebook.github.io/jest/)
+[![Yarn](/internals/img/yarn-padded-90.png)](https://yarnpkg.com/)
 
 [Electron](http://electron.atom.io/) application boilerplate based on [React](https://facebook.github.io/react/), [Redux](https://github.com/reactjs/redux), [React Router](https://github.com/reactjs/react-router), [Webpack](http://webpack.github.io/docs/), [React Transform HMR](https://github.com/gaearon/react-transform-hmr) for rapid application development
 
@@ -45,8 +45,6 @@ And then install dependencies.
 $ cd your-project-name && npm install
 ```
 
-:bulb: *In order to remove boilerplate sample code, simply run `npm run cleanup`. After this is run, the initial sample boilerplate code will be removed in order for a clean project for starting custom dev*
-
 ## Run
 
 Start the app in the `dev` environment. This starts the renderer process in [**hot-module-replacement**](https://webpack.js.org/guides/hmr-react/) mode and starts a server sends hot updates to the renderer process:

diff --git a/flow/CSSModule.js.flow → internals/flow/CSSModule.js.flow b/flow/CSSModule.js.flow → internals/flow/CSSModule.js.flow
diff --git a/img/eslint-padded-90.png → internals/img/eslint-padded-90.png b/img/eslint-padded-90.png → internals/img/eslint-padded-90.png
diff --git a/img/eslint-padded.png → internals/img/eslint-padded.png b/img/eslint-padded.png → internals/img/eslint-padded.png
diff --git a/img/eslint.png → internals/img/eslint.png b/img/eslint.png → internals/img/eslint.png
diff --git a/img/flow-padded-90.png → internals/img/flow-padded-90.png b/img/flow-padded-90.png → internals/img/flow-padded-90.png
diff --git a/img/flow-padded.png → internals/img/flow-padded.png b/img/flow-padded.png → internals/img/flow-padded.png
diff --git a/img/flow.png → internals/img/flow.png b/img/flow.png → internals/img/flow.png
diff --git a/img/jest-padded-90.png → internals/img/jest-padded-90.png b/img/jest-padded-90.png → internals/img/jest-padded-90.png
diff --git a/img/jest-padded.png → internals/img/jest-padded.png b/img/jest-padded.png → internals/img/jest-padded.png
diff --git a/img/jest.png → internals/img/jest.png b/img/jest.png → internals/img/jest.png
diff --git a/img/js-padded.png → internals/img/js-padded.png b/img/js-padded.png → internals/img/js-padded.png
diff --git a/img/js.png → internals/img/js.png b/img/js.png → internals/img/js.png
diff --git a/img/npm.png → internals/img/npm.png b/img/npm.png → internals/img/npm.png
diff --git a/img/react-padded-90.png → internals/img/react-padded-90.png b/img/react-padded-90.png → internals/img/react-padded-90.png
diff --git a/img/react-padded.png → internals/img/react-padded.png b/img/react-padded.png → internals/img/react-padded.png
diff --git a/img/react-router-padded-90.png → internals/img/react-router-padded-90.png b/img/react-router-padded-90.png → internals/img/react-router-padded-90.png
diff --git a/img/react-router-padded.png → internals/img/react-router-padded.png b/img/react-router-padded.png → internals/img/react-router-padded.png
diff --git a/img/react-router.png → internals/img/react-router.png b/img/react-router.png → internals/img/react-router.png
diff --git a/img/react.png → internals/img/react.png b/img/react.png → internals/img/react.png
diff --git a/img/redux-padded-90.png → internals/img/redux-padded-90.png b/img/redux-padded-90.png → internals/img/redux-padded-90.png
diff --git a/img/redux-padded.png → internals/img/redux-padded.png b/img/redux-padded.png → internals/img/redux-padded.png
diff --git a/img/redux.png → internals/img/redux.png b/img/redux.png → internals/img/redux.png
diff --git a/img/webpack-padded-90.png → internals/img/webpack-padded-90.png b/img/webpack-padded-90.png → internals/img/webpack-padded-90.png
diff --git a/img/webpack-padded.png → internals/img/webpack-padded.png b/img/webpack-padded.png → internals/img/webpack-padded.png
diff --git a/img/webpack.png → internals/img/webpack.png b/img/webpack.png → internals/img/webpack.png
diff --git a/img/yarn-padded-90.png → internals/img/yarn-padded-90.png b/img/yarn-padded-90.png → internals/img/yarn-padded-90.png
diff --git a/img/yarn-padded.png → internals/img/yarn-padded.png b/img/yarn-padded.png → internals/img/yarn-padded.png
diff --git a/img/yarn.png → internals/img/yarn.png b/img/yarn.png → internals/img/yarn.png
diff --git a/mocks/fileMock.js → internals/mocks/fileMock.js b/mocks/fileMock.js → internals/mocks/fileMock.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "electron-react-boilerplate",
   "productName": "ElectronReact",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Electron application boilerplate based on React, React Router, Webpack, React Hot Loader for rapid application development",
   "scripts": {
     "test": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./test/runTests.js",
@@ -27,8 +27,7 @@
     "package": "npm run build && build --publish never",
     "package-win": "npm run build && build --win --x64",
     "package-linux": "npm run build && build --linux",
-    "package-all": "npm run build && build -mwl",
-    "cleanup": "mop -v"
+    "package-all": "npm run build && build -mwl"
   },
   "browserslist": "electron 1.4",
   "build": {
@@ -99,7 +98,7 @@
   "homepage": "https://github.com/chentsulin/electron-react-boilerplate#readme",
   "jest": {
     "moduleNameMapper": {
-      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/mocks/fileMock.js",
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
       "\\.(css|less|sass|scss)$": "identity-obj-proxy"
     },
     "moduleFileExtensions": [
@@ -133,7 +132,6 @@
     "babel-preset-stage-0": "^6.24.1",
     "babel-register": "^6.24.1",
     "babili-webpack-plugin": "^0.0.11",
-    "boiler-room-custodian": "^0.6.2",
     "chalk": "^1.1.3",
     "concurrently": "^3.4.0",
     "cross-env": "^4.0.0",
@@ -158,6 +156,7 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-react": "^6.10.3",
     "express": "^4.15.2",
+    "extract-text-webpack-plugin": "^2.1.0",
     "fbjs-scripts": "^0.7.1",
     "file-loader": "^0.11.1",
     "flow-bin": "^0.45.0",
@@ -187,7 +186,6 @@
   },
   "dependencies": {
     "electron-debug": "^1.1.0",
-    "extract-text-webpack-plugin": "^2.1.0",
     "font-awesome": "^4.7.0",
     "history": "^4.6.1",
     "react": "^15.5.4",

diff --git a/setup.js b/setup.js