Merge pull request #43 from Danger-Noodle/export

merge branch export to master

Author: frankyma

.gitignore

@@ -483,4 +483,7 @@ ASALocalRun/
 React-Proto.dmg
 installers/
 
+# yarn primary pkg mgr. npm lock file
+package-lock.json
+
 # End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn

README.md

@@ -6,7 +6,10 @@
 
 React-Proto allows the user to visualize/setup their application architecture upfront and eject this architecture as application files either into a previous project or a new create-react-app project or a starter template from any repository.
 
-Download for [MacOS](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto-1.0.0.dmg), [Windows](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto.Web.Setup.1.0.0.exe), [Linux](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/react-proto_1.0.0_amd64.deb).
+Download for v1.0.0 [MacOS](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto-1.0.0.dmg), [Windows](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/React-Proto.Web.Setup.1.0.0.exe), [Linux](https://github.com/React-Proto/react-proto/releases/download/v1.0.0/react-proto_1.0.0_amd64.deb).
+
+Download for v2.0.0-beta [MacOS](https://github.com/React-Proto/react-proto/releases/download/v2.0.0-beta/React-Proto-2.0.0.dmg), [Windows](https://github.com/React-Proto/react-proto/releases/download/v2.0.0-beta/react-proto-2.0.0-x86_64.AppImage), [Linux](https://github.com/React-Proto/react-proto/releases/download/v2.0.0-beta/react-proto_2.0.0_amd64.deb).
+
 * Mac users only: for now you might need to go to your security settings to allow the app run on your system as we do not have an Apple license yet.
 
 If you find any issues, [file issue](https://github.com/React-Proto/react-proto/issues)
@@ -48,6 +51,12 @@ If you find any issues, [file issue](https://github.com/React-Proto/react-proto/
 
 [Erik Guntner](https://www.linkedin.com/in/erik-guntner-9aa324b9/) [@erikguntner](https://github.com/erikguntner)
 
+[Adrian Sun](https://www.linkedin.com/in/adrian-sun/) [@adriansun1](https://github.com/adriansun1)
+
+[Darryl Amour](https://www.linkedin.com/in/darryl-amour/) [@darryl-amour](https://github.com/darryl-amour)
+
+[Frank Ma](https://www.linkedin.com/in/frankma2/) [@frankyma](https://github.com/frankyma)
+
 ## Running Your Own Version
 
 - **Fork** and **Clone** Repository.

electron-builder.yml

@@ -2,7 +2,7 @@ directories:
   output: dist
   buildResources: build
 appId: com.eevee.react-proto
-copyright: Copyright © 2018
+copyright: Copyright © 2019
 linux:
   target:
     - AppImage
@@ -29,4 +29,4 @@ dmg:
       'y': 150
       type: link
       path: /Applications
-electronVersion: 2.0.7
+electronVersion: 3.1.0

index.js

@@ -8,7 +8,7 @@ const spinner = new Spinner('running app... %s');
 spinner.setSpinnerString('|/-\\');
 
 program
-  .version('1.0.0', '-v, --version, -V')
+  .version('2.0.0 Beta', '-v, --version, -V')
   .description('An application for prototyping React application.');
 
 program

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-proto",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "An application for prototyping React components.",
   "main": "main.js",
   "homepage": "https://cs-eevee.github.io/react-proto/",
@@ -69,7 +69,7 @@
     "Brian Taylor <[email protected]> (https://www.linkedin.com/in/brianwtaylor/)",
     "Erik Guntner <[email protected]> (https://www.linkedin.com/in/erik-guntner-9aa324b9/)",
     "Frank Ma <[email protected]> (https://www.linkedin.com/in/frankma2/)",
-    "Darryl Amour <[email protected]> (https://www.linkedin.com/in/darryl-amour-79455222)",
+    "Darryl Amour <[email protected]> (https://www.linkedin.com/in/darryl-amour)",
     "Adrian Sun <[email protected]> (https://www.linkedin.com/in/adrian-sun-b8b2a3124/)"
   ],
   "license": "MIT",
@@ -96,7 +96,6 @@
     "classnames": "^2.2.6",
     "cli-spinner": "^0.2.8",
     "commander": "^2.17.1",
-    "electron": "4.0.0",
     "enzyme": "^3.8.0",
     "enzyme-adapter-react-16": "^1.7.1",
     "enzyme-to-json": "^3.3.5",
@@ -128,6 +127,7 @@
     "copy-webpack-plugin": "^4.5.2",
     "cross-env": "^5.2.0",
     "css-loader": "^0.28.11",
+    "electron": "^3.1.0",
     "electron-builder": "^20.28.1",
     "electron-devtools-installer": "^2.2.4",
     "electron-installer-dmg": "^2.0.0",

src/actions/components.js

@@ -240,7 +240,7 @@ export const createApplication = ({
         dispatch({
           type: CREATE_APPLICATION_SUCCESS,
         });
-        dispatch(exportFiles({ path: `${path}/${appName}`, components }));
+        dispatch(exportFiles({ path: `${path}/${appName}`, components, compProps }));
       })
       .catch(err => dispatch({
         type: CREATE_APPLICATION_ERROR,

yarn.lock

@@ -3273,10 +3273,10 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47, electron-to-chromium@
   version "1.3.58"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188"
 
-electron@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.0.tgz#6ccb40cc8bf2d49954dcea73b97ae7ad12ee04b3"
-  integrity sha512-3XPG/3IXlvnT1oe1K6zEushoD0SKbP8xwdrL10EWGe6k2iOV4hSHqJ8vWnR8yZ7VbSXmBRfomEFDNAo/q/cwKw==
+electron@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.0.tgz#5e36ba4c24926c7cf80eccf6f8361b3cad409f17"
+  integrity sha512-FnHH3T7aQGAjw5h8//9BNLZBByP/gnEGP3sQH5if7HVe6Znz5KcsRbIdxLYVH9DXJFoJ2SArP+UiAAYQIdVQJQ==
   dependencies:
     "@types/node" "^8.0.24"
     electron-download "^4.1.0"