From 24ddb8aa9c8c36fd6caf78d4d17ff96cec9a4c3c Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Fri, 16 Oct 2020 11:21:45 -0700 Subject: [PATCH] bump scratch-gui for v3.17.1 --- package-lock.json | 180 ++++++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 158 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ad2634..27387c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,12 +17,13 @@ "dev": true }, "@babel/cli": { - "version": "7.11.6", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.11.6.tgz", - "integrity": "sha512-+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.12.1.tgz", + "integrity": "sha512-eRJREyrfAJ2r42Iaxe8h3v6yyj1wu9OyosaUHW6UImjGf9ahGL9nsFNh7OCopvtcPL8WnEo7tp78wrZaZ6vG9g==", "dev": true, "requires": { - "chokidar": "^2.1.8", + "@nicolo-ribaudo/chokidar-2": "^2.1.8", + "chokidar": "^3.4.0", "commander": "^4.0.1", "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", @@ -33,12 +34,111 @@ "source-map": "^0.5.0" }, "dependencies": { + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "optional": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "dev": true, + "optional": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "optional": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "dev": true, + "optional": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "dev": true, + "optional": true + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "optional": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "optional": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "optional": true + }, "lodash": { "version": "4.17.20", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, + "readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "dev": true, + "optional": true, + "requires": { + "picomatch": "^2.2.1" + } + }, "slash": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", @@ -50,6 +150,16 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "optional": true, + "requires": { + "is-number": "^7.0.0" + } } } }, @@ -1149,6 +1259,16 @@ "integrity": "sha512-p7gcmazKROteL4IECCp03Qrs790fZ8tbemUAjQu0+K0AaAlK49rI1SIFFq3LzDUAqXIshV95JJhRe/yXxkal5g==", "dev": true }, + "@nicolo-ribaudo/chokidar-2": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8.tgz", + "integrity": "sha512-FohwULwAebCUKi/akMFyGi7jfc7JXTeMHzKxuP3umRd9mK/2Y7/SMBSI2jX+YLopPXi+PF9l307NmpfxTdCegA==", + "dev": true, + "optional": true, + "requires": { + "chokidar": "2.1.8" + } + }, "@scratch/paper": { "version": "0.11.20200728195508", "resolved": "https://registry.npmjs.org/@scratch/paper/-/paper-0.11.20200728195508.tgz", @@ -1993,9 +2113,9 @@ }, "dependencies": { "caniuse-lite": { - "version": "1.0.30001146", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001146.tgz", - "integrity": "sha512-VAy5RHDfTJhpxnDdp2n40GPPLp3KqNrXz1QqFv4J64HvArKs8nuNMOWkB3ICOaBTU/Aj4rYAo/ytdQDDFF/Pug==", + "version": "1.0.30001148", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz", + "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==", "dev": true } } @@ -4232,6 +4352,12 @@ "domelementtype": "^2.0.1" } }, + "dompurify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.1.1.tgz", + "integrity": "sha512-NijiNVkS/OL8mdQL1hUbCD6uty/cgFpmNiuFxrmJ5YPH2cXrPKIewoixoji56rbZ6XBPmtM8GA8/sf9unlSuwg==", + "dev": true + }, "domutils": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz", @@ -9610,6 +9736,13 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true, + "optional": true + }, "pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", @@ -11074,8 +11207,8 @@ } }, "scratch-gui": { - "version": "github:LLK/scratch-gui#324b6e6be9506cacc1daf9643c876019e496fce8", - "from": "github:LLK/scratch-gui#scratch-desktop-v3.17.0", + "version": "github:LLK/scratch-gui#f80ba7f62758cef094775384af4f690fb0627442", + "from": "github:LLK/scratch-gui#scratch-desktop-v3.17.1", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -11129,10 +11262,10 @@ "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20201007031713", "scratch-l10n": "3.10.20201007030856", - "scratch-paint": "0.2.0-prerelease.20201009222733", - "scratch-render": "0.1.0-prerelease.20201009225155", + "scratch-paint": "0.2.0-prerelease.20201015135759", + "scratch-render": "0.1.0-prerelease.20201015135824", "scratch-storage": "1.3.3", - "scratch-svg-renderer": "0.2.0-prerelease.20201009211507", + "scratch-svg-renderer": "0.2.0-prerelease.20201015135047", "scratch-vm": "0.2.0-prerelease.20200924195620", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", @@ -11371,9 +11504,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20201009222733", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20201009222733.tgz", - "integrity": "sha512-OaDdl68MjgzQJAZZM+sS8We6hOaArOvwAcshFJB2kXmKCC/27n9pdPRrtqrIMivxAEiE36zQR2BYKtXM790gVw==", + "version": "0.2.0-prerelease.20201015135759", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20201015135759.tgz", + "integrity": "sha512-ygyOyqswV4ViSFNQ2bXCs0wTzRAuHn5SYH4xlqo7kGWWMqg9lpCFhIIB59n6evJwNvCHj/0yMq/TGs7V+AE/sg==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -11384,7 +11517,7 @@ "minilog": "3.1.0", "parse-color": "1.0.0", "prop-types": "^15.5.10", - "scratch-svg-renderer": "0.2.0-prerelease.20201009211507" + "scratch-svg-renderer": "0.2.0-prerelease.20201015135047" }, "dependencies": { "classnames": { @@ -11486,9 +11619,9 @@ } }, "scratch-render": { - "version": "0.1.0-prerelease.20201009225155", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20201009225155.tgz", - "integrity": "sha512-ISPBcXh/ZDB4xh45a2LWzNpmdj4nbJff2Py4dDiNxQTak66fcchoyAh83b1VLdbkCxF1FO4qhFvLn9ILu4j8IQ==", + "version": "0.1.0-prerelease.20201015135824", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20201015135824.tgz", + "integrity": "sha512-qTQ2iofbvYJEuQd3Gm50en63qx6pAjPJDfdS7I5dfctbPW6cDtdSJlT009f140YavW6N3Q3Qw0tCcUxVgz+U/w==", "dev": true, "requires": { "grapheme-breaker": "0.3.2", @@ -11498,7 +11631,7 @@ "minilog": "3.1.0", "raw-loader": "^0.5.1", "scratch-storage": "^1.0.0", - "scratch-svg-renderer": "0.2.0-prerelease.20201009211507", + "scratch-svg-renderer": "0.2.0-prerelease.20201015135047", "twgl.js": "4.4.0" } }, @@ -11546,13 +11679,14 @@ } }, "scratch-svg-renderer": { - "version": "0.2.0-prerelease.20201009211507", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20201009211507.tgz", - "integrity": "sha512-ht3kPlA5/HPe+b+8vGQGe84HuqP0bImq0SuWpMMCAQVUSXe5OBgUjrDD0mc3QLGcXXRbnyUdFKI+xeRGHGxThw==", + "version": "0.2.0-prerelease.20201015135047", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20201015135047.tgz", + "integrity": "sha512-PHosBo/qa64oQ4SVJtNe9yTZmZnIdaekGqWaBsI65Et/ur98vTkzZxlcaxVdTQm+I9xVh27rt/yQ+XErmdixlA==", "dev": true, "requires": { "base64-js": "1.2.1", "base64-loader": "1.0.0", + "dompurify": "2.1.1", "minilog": "3.1.0", "scratch-render-fonts": "1.0.0-prerelease.20200507182347", "transformation-matrix": "1.15.0" diff --git a/package.json b/package.json index 3d67f98..99d6b7c 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "react-redux": "5.0.7", "redux": "3.7.2", "rimraf": "^3.0.2", - "scratch-gui": "github:LLK/scratch-gui#scratch-desktop-v3.17.0", + "scratch-gui": "github:LLK/scratch-gui#scratch-desktop-v3.17.1", "uuid": "^8.0.0", "webpack": "^4.43.0" },