Merge branch 'develop' into removev2SvgAdapter

This commit is contained in:
DD Liu 2021-04-01 18:19:37 -04:00
parent 54bee8fe12
commit 57f9d9badf
4 changed files with 5428 additions and 3805 deletions

View File

@ -13,15 +13,9 @@ env:
cache:
directories:
- "$HOME/.npm"
before_install:
# package-lock.json was introduced in npm@5
- '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9
- npm install -g greenkeeper-lockfile
install:
- if [[ ${TRAVIS_BRANCH:0:11} = greenkeeper ]]; then npm install --production=false; else npm ci --production=false; fi
before_script: greenkeeper-lockfile-update
- npm ci --production=false
script: npm run $NPM_SCRIPT
after_script: greenkeeper-lockfile-upload
jobs:
include:
- env: NPM_SCRIPT=lint

View File

@ -3,7 +3,6 @@
[![Build Status](https://travis-ci.org/LLK/scratch-vm.svg?branch=develop)](https://travis-ci.org/LLK/scratch-vm)
[![Coverage Status](https://coveralls.io/repos/github/LLK/scratch-vm/badge.svg?branch=develop)](https://coveralls.io/github/LLK/scratch-vm?branch=develop)
[![Greenkeeper badge](https://badges.greenkeeper.io/LLK/scratch-vm.svg)](https://greenkeeper.io/)
## Installation
This requires you to have Git and Node.js installed.

9221
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -74,8 +74,9 @@
"scratch-blocks": "latest",
"scratch-l10n": "^3.1.20181129221712",
"scratch-render": "latest",
"scratch-render-fonts": "^1.0.0-prerelease.20210401210003",
"scratch-storage": "^1.1.0",
"scratch-svg-renderer": "^0.2.0-prerelease",
"scratch-svg-renderer": "^0.2.0-prerelease.20210325225314",
"script-loader": "0.7.2",
"stats.js": "^0.17.0",
"tap": "^12.0.1",