Skip to content

Commit 1d69482

Browse files
authored
Merge pull request #43 from Danger-Noodle/export
merge branch export to master
2 parents 3dc99a9 + 2ed6653 commit 1d69482

File tree

7 files changed

+24
-12
lines changed

7 files changed

+24
-12
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -483,4 +483,7 @@ ASALocalRun/
483483
React-Proto.dmg
484484
installers/
485485

486+
# yarn primary pkg mgr. npm lock file
487+
package-lock.json
488+
486489
# End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn

README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
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.
88

9-
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).
9+
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).
10+
11+
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).
12+
1013
* 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.
1114

1215
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/
4851

4952
[Erik Guntner](https://www.linkedin.com/in/erik-guntner-9aa324b9/) [@erikguntner](https://github.com/erikguntner)
5053

54+
[Adrian Sun](https://www.linkedin.com/in/adrian-sun/) [@adriansun1](https://github.com/adriansun1)
55+
56+
[Darryl Amour](https://www.linkedin.com/in/darryl-amour/) [@darryl-amour](https://github.com/darryl-amour)
57+
58+
[Frank Ma](https://www.linkedin.com/in/frankma2/) [@frankyma](https://github.com/frankyma)
59+
5160
## Running Your Own Version
5261

5362
- **Fork** and **Clone** Repository.

electron-builder.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ directories:
22
output: dist
33
buildResources: build
44
appId: com.eevee.react-proto
5-
copyright: Copyright © 2018
5+
copyright: Copyright © 2019
66
linux:
77
target:
88
- AppImage
@@ -29,4 +29,4 @@ dmg:
2929
'y': 150
3030
type: link
3131
path: /Applications
32-
electronVersion: 2.0.7
32+
electronVersion: 3.1.0

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const spinner = new Spinner('running app... %s');
88
spinner.setSpinnerString('|/-\\');
99

1010
program
11-
.version('1.0.0', '-v, --version, -V')
11+
.version('2.0.0 Beta', '-v, --version, -V')
1212
.description('An application for prototyping React application.');
1313

1414
program

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-proto",
3-
"version": "1.0.0",
3+
"version": "2.0.0",
44
"description": "An application for prototyping React components.",
55
"main": "main.js",
66
"homepage": "https://cs-eevee.github.io/react-proto/",
@@ -69,7 +69,7 @@
6969
"Brian Taylor <brianwtaylor@protonmail.com> (https://www.linkedin.com/in/brianwtaylor/)",
7070
"Erik Guntner <erikguntner@gmail.com> (https://www.linkedin.com/in/erik-guntner-9aa324b9/)",
7171
"Frank Ma <yurenfrankma@gmail.com> (https://www.linkedin.com/in/frankma2/)",
72-
"Darryl Amour <darryl.amour@gmail.com> (https://www.linkedin.com/in/darryl-amour-79455222)",
72+
"Darryl Amour <darryl.amour@gmail.com> (https://www.linkedin.com/in/darryl-amour)",
7373
"Adrian Sun <adriansun2@gmail.com> (https://www.linkedin.com/in/adrian-sun-b8b2a3124/)"
7474
],
7575
"license": "MIT",
@@ -96,7 +96,6 @@
9696
"classnames": "^2.2.6",
9797
"cli-spinner": "^0.2.8",
9898
"commander": "^2.17.1",
99-
"electron": "4.0.0",
10099
"enzyme": "^3.8.0",
101100
"enzyme-adapter-react-16": "^1.7.1",
102101
"enzyme-to-json": "^3.3.5",
@@ -128,6 +127,7 @@
128127
"copy-webpack-plugin": "^4.5.2",
129128
"cross-env": "^5.2.0",
130129
"css-loader": "^0.28.11",
130+
"electron": "^3.1.0",
131131
"electron-builder": "^20.28.1",
132132
"electron-devtools-installer": "^2.2.4",
133133
"electron-installer-dmg": "^2.0.0",

src/actions/components.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export const createApplication = ({
240240
dispatch({
241241
type: CREATE_APPLICATION_SUCCESS,
242242
});
243-
dispatch(exportFiles({ path: `${path}/${appName}`, components }));
243+
dispatch(exportFiles({ path: `${path}/${appName}`, components, compProps }));
244244
})
245245
.catch(err => dispatch({
246246
type: CREATE_APPLICATION_ERROR,

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -3273,10 +3273,10 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47, electron-to-chromium@
32733273
version "1.3.58"
32743274
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188"
32753275

3276-
electron@4.0.0:
3277-
version "4.0.0"
3278-
resolved "https://registry.yarnpkg.com/electron/-/electron-4.0.0.tgz#6ccb40cc8bf2d49954dcea73b97ae7ad12ee04b3"
3279-
integrity sha512-3XPG/3IXlvnT1oe1K6zEushoD0SKbP8xwdrL10EWGe6k2iOV4hSHqJ8vWnR8yZ7VbSXmBRfomEFDNAo/q/cwKw==
3276+
electron@^3.1.0:
3277+
version "3.1.0"
3278+
resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.0.tgz#5e36ba4c24926c7cf80eccf6f8361b3cad409f17"
3279+
integrity sha512-FnHH3T7aQGAjw5h8//9BNLZBByP/gnEGP3sQH5if7HVe6Znz5KcsRbIdxLYVH9DXJFoJ2SArP+UiAAYQIdVQJQ==
32803280
dependencies:
32813281
"@types/node" "^8.0.24"
32823282
electron-download "^4.1.0"

0 commit comments

Comments
 (0)