merge

Author: fredrik-lundin

.gitignore

@@ -10,6 +10,7 @@
 
 # IDEs and editors
 /.idea
+*.iml
 .project
 .classpath
 .c9/

.travis.yml

@@ -24,6 +24,20 @@ before_install:
 script:
   - if [ -n "DANGER_GITHUB_API_TOKEN" ]; then echo {} > ./.babelrc && npx danger; fi
   - ng lint
-  - ng test --single-run
-  - ng build -prod
+  - ng test --single-run --code-coverage
+  - ng build --prod
   - ng e2e
+
+before_deploy:
+  - rm -rf ./dist
+  - ng build
+  - yes | rm *.* && rm -rf ./e2e ./node_modules ./src
+  - cp -r ./dist/* ./
+
+deploy:
+  provider: azure_web_apps
+  verbose: true
+  skip_cleanup: true
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

CONTRIBUTING.md

@@ -0,0 +1,173 @@
+# Contributing to RxJS Docs
+
+[Read and abide by the Code of Conduct](CODE_OF_CONDUCT.md)! Even if you don't read it,
+it still applies to you. Ignorance is not an exemption.
+
+Contents
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+- [Submitting a Pull Request (PR)](#submitting-a-pull-request-pr)
+  - [After your pull request is merged](#after-your-pull-request-is-merged)
+- [Commit Message Guidelines](#commit-message-guidelines)
+  - [Commit Message Format](#commit-message-format)
+  - [Revert](#revert)
+  - [Type](#type)
+  - [Scope](#scope)
+  - [Subject](#subject)
+  - [Body](#body)
+  - [Footer](#footer)
+
+  <!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+(This document is a work and progress and is subject to change)
+
+## Building/Testing
+
+The build and test structure is fairly primitive at the moment. There are various npm scripts that can be run:
+
+- start: runs the dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+- test: runs tests with `jasmine`, must have built prior to running.
+- build: build artifacts will be stored in the `dist/` directory
+- build-prod: builds for production using the `--prod` flag
+- commit: runs git commit wizard for passing rxjs-github-bot message validator
+
+## Submitting a Pull Request (PR)
+Before you submit your Pull Request (PR) consider the following guidelines:
+
+* Search [GitHub](https://github.com/ReactiveX/rxjs-docs/pulls) for an open or closed PR
+  that relates to your submission. You don't want to duplicate effort.
+* Make your changes in a new git branch:
+
+     ```shell
+     git checkout -b my-fix-branch master
+     ```
+
+* Create your patch, following [code style guidelines](#coding-style-guidelines), and **including appropriate test cases**.
+* Run the full test suite and ensure that all tests pass.
+* Run the micro and macro performance tests against your feature branch and compare against master
+  to ensure performance wasn't changed for the worse.
+* Commit your changes using a descriptive commit message that follows our
+  [commit message guidelines](#commit-message-guidelines). Adherence to these conventions
+  is necessary because release notes are automatically generated from these messages.
+
+     ```shell
+     git add .
+     npm run commit
+     ```
+  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
+
+* Push your branch to GitHub:
+
+    ```shell
+    git push origin my-fix-branch
+    ```
+
+* In GitHub, send a pull request to `rxjs-docs:master`.
+* If we suggest changes then:
+  * Make the required updates.
+  * Re-run the test suites to ensure tests are still passing.
+  * Re-run performance tests to make sure your changes didn't hurt performance.
+  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
+
+    ```shell
+    git rebase master -i
+    git push -f
+    ```
+
+That's it! Thank you for your contribution!
+
+
+### After your pull request is merged
+
+After your pull request is merged, you can safely delete your branch and pull the changes
+from the main (upstream) repository:
+
+* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
+
+    ```shell
+    git push origin --delete my-fix-branch
+    ```
+
+* Check out the master branch:
+
+    ```shell
+    git checkout master -f
+    ```
+
+* Delete the local branch:
+
+    ```shell
+    git branch -D my-fix-branch
+    ```
+
+* Update your master with the latest upstream version:
+
+    ```shell
+    git pull --ff upstream master
+    ```
+
+
+- [Submitting a Pull Request (PR)](#submitting-a-pull-request-pr)
+## Commit Message Guidelines
+
+We have very precise rules over how our git commit messages can be formatted.  This leads to **more
+readable messages** that are easy to follow when looking through the **project history**. But also,
+we use the git commit messages to **generate the rxjs-docs change log**. Helper script `npm run commit`
+provides command line based wizard to format commit message easily.
+
+### Commit Message Format
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+The **header** is mandatory and the **scope** of the header is optional.
+
+Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier
+to read on GitHub as well as in various git tools.
+
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
+
+### Type
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+  semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug nor adds a feature
+* **perf**: A code change that improves performance
+* **test**: Adding missing tests
+* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+  generation
+
+### Scope
+The scope could be anything specifying place of the commit change. For example
+`Observable`, `Subject`, `switchMap`, etc.
+
+### Subject
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* no dot (.) at the end
+
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
+
+### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to
+reference GitHub issues that this commit **Closes**.
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.

README.md

@@ -1,14 +1,42 @@
+[![Build Status](https://travis-ci.org/ReactiveX/rxjs-docs.svg?branch=master)](https://travis-ci.org/ReactiveX/rxjs-docs)
+
 # rxjs-docs
 The home for new work on the new RxJS docs (RxJS v5 and up)
 
-## Development server
+License is the same as the RxJS project: https://github.com/reactivex/rxjs
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+[Apache 2.0 License](LICENSE.txt)
+- [Code of Conduct](CODE_OF_CONDUCT.md)
+- [Contribution Guidelines](CONTRIBUTING.md)
 
-## Build
+## Important
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+By contributing or commenting on issues in this repository, whether you've read them or not, you're agreeing to the [Contributor Code of Conduct](CODE_OF_CONDUCT.md). Much like traffic laws, ignorance doesn't grant you immunity.
 
-## License
+## Goals
 
-License is the same as the RxJS project: https://github.com/reactivex/rxjs
+- Serve updated docs for RxJs
+- Serve multiple translations for the docs
+- Provide working examples
+
+## Contributing
+
+More detailed information can be found in the [Contribution Guidelines](CONTRIBUTING.md)
+
+## Building/Testing
+
+The build and test structure is fairly primitive at the moment. There are various npm scripts that can be run:
+
+- start: runs the dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+- test: runs tests with `jasmine`, must have built prior to running.
+- build: build artifacts will be stored in the `dist/` directory
+- build-prod: builds for production using the `--prod` flag
+- commit: runs git commit wizard for passing rxjs-github-bot message validator
+
+## Committing
+It is strongly recommended that when creating a commit, you follow this procedure to start the commit wizard. It will aid you on creating valid commit messages.
+
+```shell
+git add .
+npm run commit
+```

dangerfile.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const validateMessage = require('validate-commit-msg');
+const _ = require('lodash');
 
 let errorCount = 0;
 
@@ -38,6 +39,6 @@ const messageConventionValid = danger.git.commits.reduce(function (acc, value) {
 }, true);
 
 if (!messageConventionValid) {
-  warn('commit message does not follows conventional change log (' + ++errorCount + ')');
+  fail('commit message does not follows conventional change log (' + ++errorCount + ')');
   markdown('> (' + errorCount + ') : RxJS uses conventional change log to generate changelog automatically. It seems some of commit messages are not following those, please check [contributing guideline](https://github.com/ReactiveX/rxjs/blob/master/CONTRIBUTING.md#commit-message-format) and update commit messages.');
 }

ngsw-manifest.json

@@ -2,9 +2,14 @@
   "external": {
     "urls": [
       {"url": "https://fonts.googleapis.com/icon?family=Material+Icons"},
-      {"url": "https://fonts.googleapis.com/css?family=Roboto"},
+      {"url": "https://fonts.googleapis.com/css?family=Roboto:300,400,500,600,700"},
       {"url": "https://ajax.googleapis.com/ajax/libs/hammerjs/2.0.8/hammer.min.js"},
-      {"url": "https://cdnjs.cloudflare.com/ajax/libs/web-animations/2.2.5/web-animations.min.js"}
+      {"url": "https://cdnjs.cloudflare.com/ajax/libs/web-animations/2.2.5/web-animations.min.js"},
+      {"url": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.5.0/styles/monokai_sublime.min.css"},
+      {"url": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.5.0/highlight.min.js"},
+      {"url": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.5.0/languages/typescript.min.js"},
+      {"url": "http://reactivex.io/rxjs/img/combineAll.png"},
+      {"url": "http://reactivex.io/rxjs/img/combineLatest.png"}
     ]
   }
 }

package.json

@@ -2,48 +2,68 @@
   "name": "rxjs-docs",
   "version": "0.0.0",
   "license": "MIT",
+  "config": {
+    "commitizen": {
+      "path": "cz-conventional-changelog"
+    }
+  },
+  "lint-staged": {
+    "*.@(ts)": [
+      "prettier --single-quote --parser typescript --write",
+      "tslint --fix",
+      "git add"
+    ]
+  },
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
     "build-prod": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "commit": "git-cz",
+    "precommit": "lint-staged"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "4.4.4",
-    "@angular/cdk": "2.0.0-beta.12",
-    "@angular/common": "4.4.4",
-    "@angular/compiler": "4.4.4",
-    "@angular/core": "4.4.4",
-    "@angular/forms": "4.4.4",
-    "@angular/http": "4.4.4",
-    "@angular/material": "2.0.0-beta.12",
-    "@angular/platform-browser": "4.4.4",
-    "@angular/platform-browser-dynamic": "4.4.4",
-    "@angular/router": "4.4.4",
+    "@angular/animations": "5.0.2",
+    "@angular/cdk": "5.0.0-rc0",
+    "@angular/common": "5.0.2",
+    "@angular/compiler": "5.0.2",
+    "@angular/core": "5.0.2",
+    "@angular/flex-layout": "2.0.0-beta.10",
+    "@angular/forms": "5.0.2",
+    "@angular/http": "5.0.2",
+    "@angular/material": "5.0.0-rc0",
+    "@angular/platform-browser": "5.0.2",
+    "@angular/platform-browser-dynamic": "5.0.2",
+    "@angular/router": "5.0.2",
     "@types/hammerjs": "2.0.35",
     "core-js": "2.4.1",
     "font-awesome": "4.7.0",
     "hammerjs": "2.0.8",
-    "rxjs": "5.4.2",
+    "rxjs": "5.5.2",
+    "ts-loader": "3.1.1",
     "zone.js": "0.8.14"
   },
   "devDependencies": {
-    "@angular/cli": "1.4.5",
-    "@angular/compiler-cli": "4.4.4",
-    "@angular/language-service": "4.4.4",
+    "@angular/cli": "1.5.2",
+    "@angular/compiler-cli": "5.0.2",
+    "@angular/language-service": "5.0.2",
     "@angular/service-worker": "1.0.0-beta.16",
     "@types/jasmine": "2.5.53",
     "@types/jasminewd2": "2.0.2",
     "@types/lodash": "4.14.77",
     "@types/node": "6.0.60",
     "angular2-template-loader": "0.6.2",
     "codelyzer": "3.1.1",
+    "commitizen": "^2.9.6",
+    "cz-conventional-changelog": "^2.0.0",
     "danger": "1.2.0",
+    "doctoc": "^1.3.0",
     "electron": "1.6.11",
+    "husky": "0.14.3",
     "jasmine-core": "2.6.2",
     "jasmine-spec-reporter": "4.1.0",
     "karma": "1.7.0",
@@ -52,12 +72,18 @@
     "karma-coverage-istanbul-reporter": "1.2.1",
     "karma-jasmine": "1.1.0",
     "karma-jasmine-html-reporter": "0.2.2",
+    "lint-staged": "4.3.0",
     "lodash": "4.17.4",
+    "prettier": "1.7.4",
     "protractor": "5.1.2",
     "ts-node": "3.2.0",
     "tslint": "5.3.2",
-    "typescript": "2.3.3",
+    "tslint-config-prettier": "1.6.0",
+    "typescript": "2.4.2",
     "validate-commit-msg": "2.14.0",
     "wallaby-webpack": "*"
+  },
+  "engines": {
+    "npm": ">=2.0.0"
   }
 }