Merge pull request #760 from developit/merge

Merge next back into master

Author: ForsakenHarmony

.babelrc

@@ -0,0 +1,2 @@
+**/node_modules
+**/tests/output

.eslintignore

@@ -0,0 +1,43 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "prettier"
+  ],
+  "parser": "babel-eslint",
+  "env": {
+    "browser": true,
+    "node": true,
+    "es6": true
+  },
+  "plugins": [
+    "babel",
+    "react",
+    "prettier"
+  ],
+  "settings": {
+    "react": {
+      "pragma": "h",
+      "version": "preact"
+    }
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "rules": {
+    "no-console": 1,
+    "no-empty": 0,
+    "semi": 2,
+    "keyword-spacing": 2,
+    "react/no-string-refs": 2,
+    "react/no-find-dom-node": 2,
+    "react/no-is-mounted": 2,
+    "react/jsx-no-comment-textnodes": 2,
+    "react/jsx-curly-spacing": 2,
+    "react/jsx-no-undef": 2,
+    "react/jsx-uses-react": 2,
+    "react/jsx-uses-vars": 2
+  }
+}

.eslintrc

@@ -6,7 +6,6 @@
 
 **Did you add tests for your changes?**
 
-
 **Summary**
 
 <!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!-- Please don't delete this template -->
 <!-- Before creating an issue please make sure you are using the latest version of preact-cli. -->
 
-**Do you want to request a *feature* or report a *bug*?**
+**Do you want to request a _feature_ or report a _bug_?**
 
 **What is the current behaviour?**
 
@@ -14,6 +14,7 @@
 **If this is a feature request, what is motivation or use case for changing the behaviour?**
 
 **Please mention other relevant information.**
+
 - Node version
 - npm version
 - Operating system

.github/issue_template.md

@@ -1,11 +1,11 @@
-/node_modules
-/lib
-/examples/*/build
-/tests/output
 .DS_Store
-npm-debug.log
-key.pem
-cert.pem
+node_modules
 lighthouse.*/
-tmp-*.json
 package-lock.json
+**/tests/output
+tmp-*.json
+*.log
+*.pem
+
+.idea/
+.vscode

.gitignore

@@ -0,0 +1,3 @@
+**/node_modules
+**/tests/output
+**/package.json

.prettierignore

@@ -0,0 +1,8 @@
+{
+	"trailingComma": "es5",
+	"tabWidth": 2,
+	"semi": true,
+	"useTabs": true,
+	"singleQuote": true,
+	"endOfLine": "lf"
+}

.prettierrc.json

@@ -7,12 +7,15 @@ addons:
 
 language: node_js
 node_js:
-  - 6
   - 8
 
+git:
+  depth: 1
+
 branches:
   only:
     - master
+    - next
 
 cache:
   yarn: true
@@ -21,10 +24,8 @@ cache:
     - node_modules
 
 before_script:
-- export LIGHTHOUSE_CHROMIUM_PATH=`which google-chrome-stable`
-# - if [ "$TRAVIS_BRANCH" = "master" ]; then export SKIP_INSTALL=true; export WITH_LOG=true; fi
-- if [ "$TRAVIS_BRANCH" = "master" ]; then export WITH_LOG=true; fi
+  - export WITH_LOG=true
+  - export LIGHTHOUSE_CHROMIUM_PATH=`which google-chrome-stable`
 
 script:
-- npm run lint
-- npm run test -- --verbose
+  - yarn test

.travis.yml

@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 Examples of behavior that contributes to creating a positive environment include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities