scratchfoundation
diff --git a/‎.circleci/config.yml
Lines changed: 12 additions & 11 deletions b/‎.circleci/config.yml
Lines changed: 12 additions & 11 deletions
diff --git a/‎.gitattributes
Lines changed: 1 addition & 0 deletions b/‎.gitattributes
Lines changed: 1 addition & 0 deletions
diff --git a/‎.travis.yml
Lines changed: 0 additions & 68 deletions b/‎.travis.yml
Lines changed: 0 additions & 68 deletions
diff --git a/‎README.md
Lines changed: 9 additions & 12 deletions b/‎README.md
Lines changed: 9 additions & 12 deletions
@@ -4,40 +4,40 @@ aliases:
     save_cache:
       paths:
         - .git
-      key: v1-git-{{ .Revision }}
+      key: v3-git-{{ .Revision }}
   - &restore_git_cache
     restore_cache:
       keys:
-        - v1-git-{{ .Revision }}
-        - v1-git-
+        - v3-git-{{ .Revision }}
+        - v3-git-
   - &save_build_cache
     save_cache:
       paths:
         - build
-      key: v1-build-{{ .Revision }}
+      key: v3-build-{{ .Revision }}
   - &restore_build_cache
     restore_cache:
       keys:
-        - v1-build-{{ .Revision }}
+        - v3-build-{{ .Revision }}
   - &save_dist_cache
     save_cache:
       paths:
         - dist
-      key: v1-dist-{{ .Revision }}
+      key: v3-dist-{{ .Revision }}
   - &restore_dist_cache
     restore_cache:
       keys:
-        - v1-dist-{{ .Revision }}
+        - v3-dist-{{ .Revision }}
   - &save_npm_cache
     save_cache:
       paths:
         - node_modules
-      key: v1-npm-{{ checksum "package-lock.json" }}
+      key: v3-npm-{{ checksum "package-lock.json" }}
   - &restore_npm_cache
     restore_cache:
       keys:
-        - v1-npm-{{ checksum "package-lock.json" }}
-        - v1-npm-
+        - v3-npm-{{ checksum "package-lock.json" }}
+        - v3-npm-
   - &defaults
     docker:
       - image: circleci/node:10-browsers
@@ -50,7 +50,7 @@ jobs:
       - *restore_git_cache
       - checkout
       - *restore_npm_cache
-      - run: npm install
+      - run: npm ci
       - *save_git_cache
       - *save_npm_cache
   lint:
@@ -230,4 +230,5 @@ workflows:
             branches:
               ignore:
                 - /^dependabot/.*/
+                - /^renovate/.*/
                 - /^pull/.*/ # don't deploy to  gh pages on PRs.
@@ -20,6 +20,7 @@
 *.js text eol=lf
 *.js.map text eol=lf
 *.json text eol=lf
+*.json5 text eol=lf
 *.jsx text eol=lf
 *.md text eol=lf
 *.vert text eol=lf
 
@@ -1,9 +1,6 @@
 # scratch-gui
 #### Scratch GUI is a set of React components that comprise the interface for creating and running Scratch 3.0 projects
 
-[![Build Status](https://travis-ci.com/LLK/scratch-gui.svg?token=Yfq2ryN1BwaxDME69Lnc&branch=master)](https://travis-ci.com/LLK/scratch-gui)
-[![Greenkeeper badge](https://badges.greenkeeper.io/LLK/scratch-gui.svg)](https://greenkeeper.io/)
-
 ## Installation
 This requires you to have Git and Node.js installed.
 
@@ -51,7 +48,7 @@ Here's how to link your local `scratch-gui` code to another project's `node_modu
 2. From the top level of each repository (such as `scratch-www`) that depends on `scratch-gui`:
     1. Make sure you have run `npm install`
     2. Run `npm link scratch-gui`
-    3. Build or run the repositoriy
+    3. Build or run the repository
 
 #### Using `npm run watch`
 
@@ -60,7 +57,7 @@ Instead of `BUILD_MODE=dist npm run build`, you can use `BUILD_MODE=dist npm run
 #### Oh no! It didn't work!
 
 If you can't get linking to work right, try:
-* Follow the recipe above step by step and don't change the order. It is especially important to run `npm install` _before_ `npm link`, because installing after the linking will reset the linking.
+* Follow the recipe above step by step and don't change the order. It is especially important to run `npm install` _before_ `npm link` as installing after the linking will reset the linking.
 * Make sure the repositories are siblings on your machine's file tree, like `.../.../MY_SCRATCH_DEV_DIRECTORY/scratch-gui/` and `.../.../MY_SCRATCH_DEV_DIRECTORY/scratch-www/`.
 * Consistent node.js version: If you have multiple Terminal tabs or windows open for the different Scratch repositories, make sure to use the same node version in all of them.
 * If nothing else works, unlink the repositories by running `npm unlink` in both, and start over.
@@ -74,7 +71,7 @@ See [jest cli docs](https://facebook.github.io/jest/docs/en/cli.html#content) fo
 
 ### Running tests
 
-*NOTE: If you're a windows user, please run these scripts in Windows `cmd.exe`  instead of Git Bash/MINGW64.*
+*NOTE: If you're a Windows user, please run these scripts in Windows `cmd.exe`  instead of Git Bash/MINGW64.*
 
 Before running any tests, make sure you have run `npm install` from this (scratch-gui) repository's top level.
 
@@ -105,7 +102,7 @@ $(npm bin)/jest --runInBand test/unit/components/button.test.jsx
 
 #### Running integration tests
 
-Integration tests use a headless browser to manipulate the actual html and javascript that the repo
+Integration tests use a headless browser to manipulate the actual HTML and javascript that the repo
 produces. You will not see this activity (though you can hear it when sounds are played!).
 
 Note that integration tests require you to first create a build that can be loaded in a browser:
@@ -136,7 +133,7 @@ USE_HEADLESS=no $(npm bin)/jest --runInBand test/integration/backpack.test.js
 
 ### Ignoring optional dependencies
 
-When running `npm install`, you can get warnings about optionsl dependencies:
+When running `npm install`, you can get warnings about optional dependencies:
 
 ```
 npm WARN optional Skipping failed optional dependency /chokidar/fsevents:
@@ -153,7 +150,7 @@ Further reading: [Stack Overflow](https://stackoverflow.com/questions/36725181/n
 
 ### Resolving dependencies
 
-When installing for the first time, you can get warnings which need to be resolved:
+When installing for the first time, you can get warnings that need to be resolved:
 
 ```
 npm WARN [email protected] requires a peer of babel-eslint@^8.0.1 but none was installed.
@@ -168,7 +165,7 @@ You can check which versions are available:
 npm view react-intl-redux@0.* version
 ```
 
-You will neet do install the required version:
+You will need to install the required version:
 
 ```
 npm install  --no-optional --save-dev react-intl-redux@^0.7
@@ -234,7 +231,7 @@ These are names for the action which causes a state change. Some examples are:
 
 ### How transitions relate to loading states
 
-As this diagram of the project state machine shows, various transition actions can move us from one loading state to another:
+Like this diagram of the project state machine shows, various transition actions can move us from one loading state to another:
 
 ![Project state diagram](docs/project_state_diagram.svg)
 
@@ -244,7 +241,7 @@ _Note: for clarity, the diagram above excludes states and transitions relating t
 
 Here's an example of how states transition.
 
-Suppose a user clicks on a project, and the page starts to load with url https://scratch.mit.edu/projects/123456 .
+Suppose a user clicks on a project, and the page starts to load with URL https://scratch.mit.edu/projects/123456 .
 
 Here's what will happen in the project state machine: