Merge branch 'dev' into private-docker-registry

Author: zodern

.eslintrc.yml

@@ -1,5 +1,7 @@
 ---
 parser: babel-eslint
+extends:
+  - es/2015/server
 plugins:
 - babel
 - markdown
@@ -8,6 +10,7 @@ env:
   node: true
   mocha: true
 parserOptions:
+  sourceType: 'module'
   ecmaVersion: 2017
   ecmaFeatures:
     accessor-pairs: 2
@@ -43,7 +46,7 @@ rules:
   - 2
   - never
   arrow-spacing: 2
-  block-scoped-var: 0
+  block-scoped-var: 2
   brace-style:
   - 2
   - 1tbs
@@ -52,7 +55,7 @@ rules:
   camelcase:
   - 2
   - properties: always
-  comma-dangle: 2
+  comma-dangle: [2, 'never']
   comma-spacing: 0
   comma-style:
   - 2
@@ -66,18 +69,18 @@ rules:
   curly:
   - 2
   - all
-  default-case: 0
+  default-case: 2
   dot-location:
   - 2
   - property
-  dot-notation: 0
+  dot-notation: 2
   eol-last: 2
   eqeqeq: 2
   func-names: 0
   func-style: 0
   global-require: 2
   generator-star-spacing:
-  - 0
+  - 2
   - before: true
     after: false
   guard-for-in: 2
@@ -102,7 +105,8 @@ rules:
   max-depth: 0
   max-len:
   - 2
-  - ignoreStrings: true
+  - ignoreTemplateLiterals: true
+    ignoreStrings: true
   max-nested-callbacks: 0
   max-params: 0
   max-statements: 0
@@ -132,13 +136,13 @@ rules:
   no-empty: 2
   no-empty-pattern: 2
   no-empty-character-class: 2
-  no-eq-null: 0
+  no-eq-null: 2
   no-eval: 2
   no-ex-assign: 2
   no-extend-native: 2
   no-extra-bind: 2
   no-extra-boolean-cast: 2
-  no-extra-parens: 0
+  no-extra-parens: [ 2, 'all', { nestedBinaryExpressions: false }]
   no-extra-semi: 2
   no-fallthrough: 2
   no-floating-decimal: 2
@@ -154,7 +158,7 @@ rules:
   no-irregular-whitespace: 2
   no-iterator: 2
   no-label-var: 2
-  no-labels: 0
+  no-labels: 2
   no-lone-blocks: 2
   no-lonely-if: 2
   no-loop-func: 2
@@ -212,7 +216,7 @@ rules:
     args: after-used
   no-use-before-define: 0
   no-useless-call: 2
-  no-var: 0
+  no-var: 2
   no-void: 2
   no-warning-comments: 0
   no-with: 2
@@ -231,10 +235,10 @@ rules:
   operator-linebreak:
   - 2
   - after
-  padded-blocks: 0
-  prefer-const: 0
+  padded-blocks: [2, 'never']
+  prefer-const: 2
   prefer-reflect: 0
-  prefer-spread: 0
+  prefer-spread: 2
   quote-props:
   - 2
   - as-needed
@@ -284,3 +288,7 @@ rules:
   - 2
   - never
   - exceptRange: true
+  newline-per-chained-call: 0
+  class-methods-use-this: 0
+  no-empty-function: 0
+  sort-imports: [2, { memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'], ignoreCase: true  }]

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 language: node_js
 node_js:
   - "4"
-  - "6"
+  - "8"
 
 env:
   - TEST_PLUGIN='default'

CHANGELOG.md

@@ -1,3 +1,50 @@
+## Next
+
+
+**Status**
+The `mup status` command gives an overview of what is running on the servers and shows any problems plugins detected.
+
+**Reverse Proxy**
+- The reverse proxy is no longer an "experimental feature"
+- Support for customizing the generated server and location blocks of the nginx config
+- Add `mup proxy nginx-config` command to view the generated config
+- Fix checking deployment when using the reverse proxy.
+- Fix deploying when `app.env.PORT` is set to a value other than 80
+- Fix setting up proxy when non-root user
+
+**Mongo**
+- Oplog is automatically enabled. To use, set `app.env.MONGO_OPLOG_URL` to `mongodb://mongodb/local`  (@edemaine)
+
+**Depreciations**
+
+`meteor.ssl` and `meteor.nginx` is depreciated. It uses a different implementation for custom certificates and lets encrypt, each with different features and restrictions. Also, the custom certificate implementation has security problems. The reverse proxy should be used instead. It doesn't have the security problems, uses the same implementation for custom certificates and lets encrypt, and has many additional features. Learn how to use the [reverse proxy in the docs](http://meteor-up.com/docs#reverse-proxy).
+
+`proxy.shared.clientUploadLimit` is depreciated. Use `proxy.clientUploadLimit` instead, which allows each app to have a different clientUploadLimit.
+
+**Other Changes**
+- `mup init` will create a `.deploy` folder when run in the same folder as a Meteor app
+- When mup can find a meteor app near to where `mup init` is run, the default config's `app.path` will be the path to that app
+- When a deploy fails, the last 200 instead of 100 lines of the app's logs are shown
+- More of the logs are shown when a command fails
+- When copying a file fails with the error `No such file`, it will tell the user to run `mup setup` to fix it
+- `reconfig` hooks will now run during `mup deploy`
+- `--show` is no longer needed to show the config when `mup validate --scrub` is run
+- Add section to readme about Meteor compatibility
+- Initial work has been done to support Docker Swarm
+- When there is only one server, `mup ssh` will not require the name of a server
+- Fix retry logic for the copy file task
+- Fix running Prepare Bundle when image already has a `/built_app` folder
+- Fix alignment of list of servers when running `mup ssh` without specifying a server
+- Fix plugins preparing the config multiple times
+- Fix loading locally installed plugins
+- `npm install` will still succeed even if Open Collectives's post install hook fails
+
+**Plugins**
+- list.executeScript supports server specific variables
+- Using the `post.status` hook, plugins can show their status
+- Plugins can add a `solution` property to errors. Mup will show the solution in yellow before exiting
+- Plugins can add a depreciation warning while validating a config with `utils.addDepreciation`
+
 ## 1.3.7 - Nov 28, 2017
 
 - Fix permission denied error sometimes encountered during Prepare Bundle

README.md

@@ -46,6 +46,11 @@ npm install -g mup
 - [Getting Started](http://meteor-up.com/getting-started.html)
 - [Docs](http://meteor-up.com/docs.html)
 
+## Meteor compatibility
+
+Mup supports Meteor 1.2 and newer.
+To use Meteor 1.4 and newer, you will need to change the docker image. A list of docker images is available [here](http://meteor-up.com/docs#meteor-support).
+
 ### Support
 
 First, look at the [troubleshooting](http://meteor-up.com/docs.html#troubleshooting) and [common problems](http://http://meteor-up.com/docs.html#common-problems) sections of the docs. You can also search the [github issues](https://github.com/zodern/meteor-up/issues).

docs/css/docs.css

@@ -109,6 +109,25 @@ code {
   color: #9e9e9e;
 }
 
+table {
+  font-size: 14px;
+  border: 3px solid #3b4863;
+}
+
+table thead {
+  background-color: #3b4863;
+}
+
+table th {
+  padding: 15px 5px;
+}
+
+table td {
+  padding: 15px;
+  color: #fff;
+  border-bottom: solid 1px rgb(59, 72, 99) !important;
+}
+
 @media (max-width: 600px) {
   .docs-nav {
     position: fixed;