mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2025-06-29 15:50:22 -04:00
Merge branch 'develop' into removev2SvgAdapter
This commit is contained in:
parent
54bee8fe12
commit
57f9d9badf
4 changed files with 5428 additions and 3805 deletions
|
@ -13,15 +13,9 @@ env:
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- "$HOME/.npm"
|
- "$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:
|
install:
|
||||||
- if [[ ${TRAVIS_BRANCH:0:11} = greenkeeper ]]; then npm install --production=false; else npm ci --production=false; fi
|
- npm ci --production=false
|
||||||
before_script: greenkeeper-lockfile-update
|
|
||||||
script: npm run $NPM_SCRIPT
|
script: npm run $NPM_SCRIPT
|
||||||
after_script: greenkeeper-lockfile-upload
|
|
||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
- env: NPM_SCRIPT=lint
|
- env: NPM_SCRIPT=lint
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
[](https://travis-ci.org/LLK/scratch-vm)
|
[](https://travis-ci.org/LLK/scratch-vm)
|
||||||
[](https://coveralls.io/github/LLK/scratch-vm?branch=develop)
|
[](https://coveralls.io/github/LLK/scratch-vm?branch=develop)
|
||||||
[](https://greenkeeper.io/)
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
This requires you to have Git and Node.js installed.
|
This requires you to have Git and Node.js installed.
|
||||||
|
|
9221
package-lock.json
generated
9221
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -74,8 +74,9 @@
|
||||||
"scratch-blocks": "latest",
|
"scratch-blocks": "latest",
|
||||||
"scratch-l10n": "^3.1.20181129221712",
|
"scratch-l10n": "^3.1.20181129221712",
|
||||||
"scratch-render": "latest",
|
"scratch-render": "latest",
|
||||||
|
"scratch-render-fonts": "^1.0.0-prerelease.20210401210003",
|
||||||
"scratch-storage": "^1.1.0",
|
"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",
|
"script-loader": "0.7.2",
|
||||||
"stats.js": "^0.17.0",
|
"stats.js": "^0.17.0",
|
||||||
"tap": "^12.0.1",
|
"tap": "^12.0.1",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue