-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(deps): after installing deps, replace Blockly v11 with v12 RC
- Loading branch information
Showing
4 changed files
with
33 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
# Temporary until Blockly v12 release | ||
/blockly-rc/ | ||
|
||
# OSX | ||
.DS_Store | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#!/usr/bin/env bash | ||
# vim: set tw=118 ts=2 sw=2 expandtab | ||
|
||
# This script is intended to be run from the root of the scratch-blocks repo. | ||
# This will check out the Blockly v12 Release Candidate branch, | ||
# build it, and link it into node_modules/ | ||
|
||
# TODO: Remove this script once Blockly v12 is available from https://www.npmjs.com/package/blockly | ||
|
||
# WARNING: This uses `npm link`, which causes system-wide changes! | ||
|
||
set -e -x | ||
|
||
if [ ! -d "blockly-rc" ]; then | ||
git clone --branch rc/v12.0.0 git@github.com:google/blockly.git blockly-rc | ||
else | ||
git -C blockly-rc checkout rc/v12.0.0 | ||
git -C blockly-rc pull | ||
fi | ||
npm -C blockly-rc ci | ||
npm -C blockly-rc run package | ||
|
||
# --legacy-peer-deps can be removed once the Blockly plugins used by scratch-blocks support Blockly v12 | ||
# --prefer-offline speeds this up by roughly 2x on my computer (!!) | ||
# --prefer-offline should be OK since we're probably running immediately after a non-offline `npm i` or `npm ci` | ||
npm link --prefer-offline --legacy-peer-deps blockly-rc/dist/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,7 @@ | ||
{ | ||
"exclude": [ | ||
"./blockly-rc/" | ||
], | ||
"compilerOptions": { | ||
"outDir": "./dist/", | ||
"noImplicitAny": true, | ||
|