From c4622088a09fedf981cca68012337145a6b73dd1 Mon Sep 17 00:00:00 2001 From: rschamp Date: Mon, 21 Mar 2022 16:07:33 -0400 Subject: [PATCH] Bump scratch-gui --- package-lock.json | 113 ++++++++++++++++++++++++++++++---------------- package.json | 4 +- 2 files changed, 75 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index b29453c3d..99c835626 100644 --- a/package-lock.json +++ b/package-lock.json @@ -228,9 +228,9 @@ "dev": true }, "@babel/core": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz", - "integrity": "sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ==", + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.7.tgz", + "integrity": "sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", @@ -238,8 +238,8 @@ "@babel/generator": "^7.17.7", "@babel/helper-compilation-targets": "^7.17.7", "@babel/helper-module-transforms": "^7.17.7", - "@babel/helpers": "^7.17.8", - "@babel/parser": "^7.17.8", + "@babel/helpers": "^7.17.7", + "@babel/parser": "^7.17.7", "@babel/template": "^7.16.7", "@babel/traverse": "^7.17.3", "@babel/types": "^7.17.0", @@ -262,15 +262,15 @@ } }, "@babel/parser": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz", - "integrity": "sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ==", + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.7.tgz", + "integrity": "sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA==", "dev": true }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { "ms": "2.1.2" @@ -283,9 +283,18 @@ "dev": true }, "json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "semver": { @@ -447,9 +456,9 @@ "dev": true }, "@babel/helpers": { - "version": "7.17.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz", - "integrity": "sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw==", + "version": "7.17.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.7.tgz", + "integrity": "sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w==", "dev": true, "requires": { "@babel/template": "^7.16.7", @@ -1261,9 +1270,9 @@ "dev": true }, "@types/babel__core": { - "version": "7.1.19", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz", - "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==", + "version": "7.1.18", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz", + "integrity": "sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==", "dev": true, "requires": { "@babel/parser": "^7.1.0", @@ -4116,6 +4125,18 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, + "cat-blocks": { + "version": "npm:scratch-blocks@0.1.0-prerelease.20220318143026", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220318143026.tgz", + "integrity": "sha512-eYJYzjYt3fmF5a243eBIgQfNj+c3ApHFE8jkm1KV/tEiFanJ8XlLZay9LmbnhYhK0618+s0uEQrpJ9WC6xnX/Q==", + "dev": true, + "requires": { + "exports-loader": "0.6.3", + "google-closure-library": "20190301.0.0", + "imports-loader": "0.6.5", + "scratch-l10n": "3.14.20220317031619" + } + }, "cdt2d": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cdt2d/-/cdt2d-1.0.0.tgz", @@ -19383,27 +19404,28 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20220323044431", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220323044431.tgz", - "integrity": "sha512-7+1tSHTns2UrvG0bY1u0YbM3cuRx57yXjuCdbxepLLgsOsHVDYLT+gjxsExvGtidrGo3T2LtO72Ccwhq6X3U0w==", + "version": "0.1.0-prerelease.20220317055410", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20220317055410.tgz", + "integrity": "sha512-ybvN7xZwAcZYwup9G8x42rs1RCrLSZx92OIYGD1nkkx+ZKnbgzOHNwgYd/YFhShHFVVU+gIgpjFBjHghK66nMw==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20220323031542" + "scratch-l10n": "3.14.20220317031619" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20220323131121", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220323131121.tgz", - "integrity": "sha512-560WEW6LpvJzyhNr5h1aQdDcTxPPzZlQ8gfwczi+/BSIwGUCRrJ0KbeQyPeVW66ZblvSQP0228Hw+XhkpT5e1Q==", + "version": "0.1.0-prerelease.20220321200350", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20220321200350.tgz", + "integrity": "sha512-GRUhJ2fGoxVpoBltggX2lS9u5nKBhEIIxOiLmfPhWzSjmZxzJi2zYg51XC319ns9DJxu7YiSKVgc7FDMQP4lMA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", "autoprefixer": "^9.0.1", "base64-loader": "1.0.0", "bowser": "1.9.4", + "cat-blocks": "npm:scratch-blocks@0.1.0-prerelease.20220318143026", "classnames": "2.2.6", "computed-style-to-inline-style": "3.0.0", "copy-webpack-plugin": "6.4.1", @@ -19448,14 +19470,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20220323044431", - "scratch-l10n": "3.14.20220323031542", - "scratch-paint": "0.2.0-prerelease.20220323045250", + "scratch-blocks": "0.1.0-prerelease.20220317055410", + "scratch-l10n": "3.14.20220318031632", + "scratch-paint": "0.2.0-prerelease.20220317102020", "scratch-render": "0.1.0-prerelease.20211028200436", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20220322143111", + "scratch-vm": "github:LLK/scratch-vm#hotfix/totally-normal-2022", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -19692,6 +19714,18 @@ "symbol-observable": "^1.0.3" } }, + "scratch-l10n": { + "version": "3.14.20220318031632", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220318031632.tgz", + "integrity": "sha512-Lcv9tiRuzY8P1IxrwzAM8mC6Ig22coBZog3ChKZTjzU2ZvTc+Xvd21BCR+9vZu1d7XT7eHTAyV9PfRC8mErZAg==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + }, "scratch-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -19752,9 +19786,9 @@ } }, "scratch-l10n": { - "version": "3.14.20220323031542", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220323031542.tgz", - "integrity": "sha512-cAMcHITpLrHUUC5W6Y2rNeVxjK7CNUCv27RllBVhop5EGOHv2N7c9J5N8tbLo5o1vFMlsKkkJEI+3OcBv+Edkg==", + "version": "3.14.20220317031619", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20220317031619.tgz", + "integrity": "sha512-tDKXRFxKFob9htBeOu+873mujoePXc4sGQulWDdMVCM8cYz63geCWziX5fCwp2pu3pJKQLEth0ftd2eoXkT1RA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", @@ -19764,9 +19798,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20220323045250", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220323045250.tgz", - "integrity": "sha512-7tV6PS5sHbuhR826VacIDc4R3F+wojPTzDoJodGOwWp18/34bN3azLSYNj9f8Eat6HXdjuV4JSgGy5Lrx7E7dQ==", + "version": "0.2.0-prerelease.20220317102020", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20220317102020.tgz", + "integrity": "sha512-cUOwzB2T2rRajby8cPG7thqrgxgoK3gnvgo/YvnKOjsDyNesxCyCM9JeKZPNsSgoeeORP4jB0CQSqTK0nyN6Vg==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -19994,9 +20028,8 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20220322143111", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20220322143111.tgz", - "integrity": "sha512-Tw8MNGGxI6QByp4DQS2TnNr5M/v30ZNYLWAlDBtBiPzvbXyq6WXlyxa8CoRq8jpbbIthMVmzJGIzmo5AVwH1QA==", + "version": "github:LLK/scratch-vm#0d9af3d8e835f603238c88c541a7e8a84581e68b", + "from": "github:LLK/scratch-vm#hotfix/totally-normal-2022", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 89f937140..5cdd5f30e 100644 --- a/package.json +++ b/package.json @@ -134,8 +134,8 @@ "regenerator-runtime": "0.13.9", "sass": "1.49.7", "sass-loader": "10.2.1", - "scratch-gui": "0.1.0-prerelease.20220323131121", - "scratch-l10n": "3.14.20220323031542", + "scratch-gui": "0.1.0-prerelease.20220321200350", + "scratch-l10n": "3.14.20220317031619", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3",