Merge branch 'release/v0.32.0'

.babelrc

@@ -1,30 +1,142 @@
 {
-  "presets": ["flow", "es2015", "stage-0", "react"],
-  "plugins": [
-    "transform-object-rest-spread",
-    "babel-plugin-styled-components",
-    [
-      "module-resolver",
-      {
-        "root": ["./app"],
-        "alias": {
-          "@components": "./app/js/components",
-          "@common": "./app/js/common",
-          "@styled": "./app/js/components/styled",
-          "@utils": "./app/js/utils",
-          "@blockstack/ui": "./app/js/components/ui",
-          "@ui/components": "./app/js/components/ui/components",
-          "@ui/containers": "./app/js/components/ui/containers",
-          "@ui/common": "./app/js/components/ui/common"
-        }
-      }
-    ]
-  ],
   "env": {
     "test": {
-      "plugins": ["rewire"],
-      "sourceMaps": "both",
-      "ignore": ["node_modules"]
+      "presets": [
+        "flow",
+        "react",
+        "es2015",
+        "stage-0"
+      ],
+      "plugins": [
+        "rewire",
+        [
+          "module-resolver",
+          {
+            "root": [
+              "./app"
+            ],
+            "alias": {
+              "@components": "./app/js/components",
+              "@common": "./app/js/common",
+              "@styled": "./app/js/components/styled",
+              "@utils": "./app/js/utils",
+              "@blockstack/ui": "./app/js/components/ui",
+              "@ui/components": "./app/js/components/ui/components",
+              "@ui/containers": "./app/js/components/ui/containers",
+              "@ui/common": "./app/js/components/ui/common",
+              "log4js": "./app/js/logger.js",
+              "@images": "./app/images"
+            }
+          }
+        ]
+      ]
+    },
+    "development": {
+      "presets": [
+        "babel-preset-flow",
+        [
+          "babel-preset-stage-0"
+        ],
+        "babel-preset-react",
+        [
+          "babel-preset-env",
+          {
+            "modules": false,
+            "useBuiltIns": "usage",
+            "targets": {
+              "browsers": [
+                "Chrome >= 60",
+                "Safari >= 10.1",
+                "iOS >= 10.3",
+                "Firefox >= 54",
+                "Edge >= 15"
+              ]
+            }
+          }
+        ]
+      ],
+      "plugins": [
+        "react-hot-loader/babel",
+        "react-loadable/babel",
+        "babel-plugin-transform-class-properties",
+        "babel-plugin-transform-async-to-generator",
+        "babel-plugin-transform-react-jsx",
+        "babel-plugin-styled-components",
+        "lodash",
+        [
+          "module-resolver",
+          {
+            "root": [
+              "./app"
+            ],
+            "alias": {
+              "@components": "./app/js/components",
+              "@common": "./app/js/common",
+              "@styled": "./app/js/components/styled",
+              "@utils": "./app/js/utils",
+              "@blockstack/ui": "./app/js/components/ui",
+              "@ui/components": "./app/js/components/ui/components",
+              "@ui/containers": "./app/js/components/ui/containers",
+              "@ui/common": "./app/js/components/ui/common",
+              "log4js": "./app/js/logger.js",
+              "@images": "./app/images"
+            }
+          }
+        ]
+      ]
+    },
+    "production": {
+      "presets": [
+        "babel-preset-flow",
+        [
+          "babel-preset-stage-0"
+        ],
+        "babel-preset-react",
+        [
+          "babel-preset-env",
+          {
+            "modules": false,
+            "useBuiltIns": "usage",
+            "targets": {
+              "browsers": [
+                "Chrome >= 60",
+                "Safari >= 10.1",
+                "iOS >= 10.3",
+                "Firefox >= 54",
+                "Edge >= 15"
+              ]
+            }
+          }
+        ]
+      ],
+      "plugins": [
+        "react-loadable/babel",
+        "babel-plugin-transform-class-properties",
+        "babel-plugin-transform-async-to-generator",
+        "babel-plugin-transform-react-jsx",
+        "babel-plugin-styled-components",
+        "lodash",
+        [
+          "module-resolver",
+          {
+            "root": [
+              "./app"
+            ],
+            "alias": {
+              "@components": "./app/js/components",
+              "@common": "./app/js/common",
+              "@styled": "./app/js/components/styled",
+              "@utils": "./app/js/utils",
+              "@blockstack/ui": "./app/js/components/ui",
+              "@ui/components": "./app/js/components/ui/components",
+              "@ui/containers": "./app/js/components/ui/containers",
+              "@ui/common": "./app/js/components/ui/common",
+              "log4js": "./app/js/logger.js",
+              "@images": "./app/images"
+            }
+          }
+        ]
+      ]
     }
   }
 }

.eslintrc

@@ -46,11 +46,23 @@
     "react": {
       "createClass": "createReactClass", // Regex for Component Factory to use, default to "createReactClass"
       "pragma": "React", // Pragma to use, default to "React"
-      "version": "15.0", // React version, default to the latest React stable release
+      "version": "16.4", // React version, default to the latest React stable release
       "flowVersion": "0.53" // Flow version
     },
     "import/resolver": {
-      "babel-module": {}
+      "babel-module": {
+        "alias": {
+          "@components": "./app/js/components",
+          "@common": "./app/js/common",
+          "@styled": "./app/js/components/styled",
+          "@utils": "./app/js/utils",
+          "@blockstack/ui": "./app/js/components/ui",
+          "@ui/components": "./app/js/components/ui/components",
+          "@ui/containers": "./app/js/components/ui/containers",
+          "@ui/common": "./app/js/components/ui/common",
+          "log4js": "./app/js/logger.js"
+        }
+      }
     },
     "propWrapperFunctions": ["forbidExtraProps"] // The names of any functions used to wrap the propTypes object, such as `forbidExtraProps`. If this isn't set, any propTypes wrapped in a function will be skipped.
   }

.flowconfig

@@ -27,3 +27,4 @@ module.name_mapper='^@styled' ->'<PROJECT_ROOT>/app/js/styled'
 module.name_mapper='^@utils' ->'<PROJECT_ROOT>/app/js/utils'
 
 [lints]
+deprecated-call-syntax=off

.gitignore

@@ -24,6 +24,7 @@ bower_components
 
 # Build files
 build
+dist
 __coverage__
 .nyc_output
 
@@ -34,3 +35,4 @@ unused
 tmp
 .idea
 .swp
+yarn.lock

.nvmrc

@@ -0,0 +1 @@
+8.11.3

Dockerfile

@@ -26,10 +26,10 @@ COPY . .
 RUN npm install
 
 # Build production assets
-RUN /src/blockstack-browser/node_modules/.bin/gulp prod
+RUN npm run build
 
 # Setup script to run browser
 RUN echo '#!/bin/bash' >> /src/blockstack-browser/blockstack-browser
-RUN echo 'node /src/blockstack-browser/native/blockstackProxy.js 8888 /src/blockstack-browser/build 0.0.0.0' >> /src/blockstack-browser/blockstack-browser
+RUN echo 'node /src/blockstack-browser/native/blockstackProxy.js 8888 /src/blockstack-browser/dist 0.0.0.0' >> /src/blockstack-browser/blockstack-browser
 RUN chmod +x /src/blockstack-browser/blockstack-browser
 RUN ln /src/blockstack-browser/blockstack-browser /usr/bin/blockstack-browser

README.md

@@ -93,6 +93,12 @@ reload the page.  For example, if your `auth=` query looks like
 1. Run `npm run web`
 
 
+## Building for Linux (dpkg)
+
+1. Install [`fpm`](http://fpm.readthedocs.io/en/latest/)
+1. Run `./native/linux/make_deb.sh`
+1. A `.deb` package will be placed in `./native/linux/dist/`
+
 ## Contributing
 
 We do project-wide sprints every two weeks and we're always looking for more help.
@@ -150,23 +156,20 @@ This app uses the latest versions of the following libraries:
 - [ReactJS](https://github.com/facebook/react)
 - [React Router](https://github.com/rackt/react-router)
 - [RefluxJS](https://github.com/spoike/refluxjs)
-- [Gulp](http://gulpjs.com/)
-- [Browserify](http://browserify.org/)
 - [Redux](https://github.com/reactjs/redux)
 - [Babel](https://github.com/babel/babel)
+- [Webpack](https://github.com/webpack/webpack)
 
-Along with many Gulp libraries (these can be seen in either `package.json`, or at the top of each task in `/gulp/tasks/`).
+And a few other smaller modules (these can be found in `package.json`).
 
 ## Maintainer
 
 This repository is maintained by [yukan.id](https://explorer.blockstack.org/name/yukan.id).
 
 ## Testing
 
-1. If you haven't already, follow steps 1 & 2 above
-2. If you haven't already run `npm run dev` or `npm run build` at least once, run `npm run build`
-3. Run all tests in the `test/` directory with the `npm run test` command
-  * A single file can be run by specifing an `-f` flag: `npm run test <PATH_TO_TEST_FILE>`
+Run all tests in the `test/` directory with the `npm run test` command. A single
+file can be run by specifing an `-f` flag: `npm run test <PATH_TO_TEST_FILE>`.
 
 *Note: When running tests, code coverage will be automatically calculated and output to an HTML file using the [Istanbul](https://istanbul.js.org/) library. These files can be seen in the generated `__coverage__/` directory.*