Skip to content

Commit

Permalink
Remove whisker submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
@FeldiPat
FeldiPat committed Sep 12, 2023
1 parent 3718855 commit dd8935e
Show file tree
Hide file tree
Showing 8 changed files with 533 additions and 110 deletions.
508 changes: 419 additions & 89 deletions package-lock.json
View file

Large diffs are not rendered by default.

19 changes: 11 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"js-base64": "2.4.9",
"keymirror": "0.1.1",
"lodash.bindall": "4.4.0",
"lodash.clonedeep": "^4.5.0",
"lodash.debounce": "4.0.8",
"lodash.defaults": "^4.2.0",
"lodash.defaultsdeep": "4.6.1",
"lodash.isequal": "^4.5.0",
"lodash.omit": "4.5.0",
"lodash.throttle": "4.0.1",
"lodash.clonedeep": "^4.5.0",
"lodash.defaults": "^4.2.0",
"lodash.isequal": "^4.5.0",
"minilog": "3.1.0",
"omggif": "1.0.9",
"papaparse": "5.3.0",
Expand All @@ -60,9 +60,9 @@
"prop-types": "^15.5.10",
"query-string": "^5.1.1",
"raw-loader": "^0.5.1",
"react": "16.8.0",
"react": "^16.0.0",
"react-contextmenu": "2.9.4",
"react-dom": "16.8.0",
"react-dom": "^16.0.0",
"react-draggable": "3.0.5",
"react-ga": "2.5.3",
"react-intl": "2.9.0",
Expand All @@ -71,9 +71,9 @@
"react-redux": "5.0.7",
"react-responsive": "4.1.0",
"react-style-proptype": "3.2.2",
"react-transition-group": "^4.4.5",
"react-tabs": "2.3.0",
"react-tooltip": "3.8.0",
"react-transition-group": "^4.4.5",
"react-virtualized": "9.20.1",
"redux": "3.7.2",
"redux-throttle": "0.1.1",
Expand All @@ -95,8 +95,9 @@
"text-encoding": "0.7.0",
"to-style": "1.3.3",
"wav-encoder": "1.3.0",
"whisker-main": "file:../whisker-main",
"xhr": "2.5.0"
"whisker-main": "git+https://gitlab+deploy-token-13:[email protected]/se2/whisker/whisker-main.git#NuzzleBug",
"xhr": "2.5.0",
"ntc": "^0.0.1"
},
"peerDependencies": {
"react": "^16.0.0",
Expand Down Expand Up @@ -133,6 +134,8 @@
"redux-mock-store": "1.5.3",
"rimraf": "2.7.1",
"selenium-webdriver": "3.6.0",
"ts-loader": "~8.2.0",
"typescript": "^5.2.2",
"uglifyjs-webpack-plugin": "1.3.0",
"viz.js": "1.8.0",
"web-audio-test-api": "0.5.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/controls/controls.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import {defineMessages, injectIntl, intlShape} from 'react-intl';
import VM from 'scratch-vm';
import Test from 'whisker-main/whisker-main/dist/src/test-runner/test';
import Test from 'whisker-main/whisker-main/src/test-runner/test';

import GreenFlag from '../green-flag/green-flag.jsx';
import RunTest from '../run-test/run-test.jsx';
Expand Down
2 changes: 1 addition & 1 deletion src/components/run-test/run-test.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classNames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import Test from 'whisker-main/whisker-main/dist/src/test-runner/test';
import Test from 'whisker-main/whisker-main/src/test-runner/test';

import runTestIcon from './icon--run-test.png';
import styles from './run-test.css';
Expand Down
6 changes: 3 additions & 3 deletions src/containers/controls.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import {TracingState} from '../components/toggle-tracing/toggle-tracing.jsx';
import {viewCards} from '../reducers/interrogative-debugging/version-1/ir-cards.js';
import {setTestRunningState} from '../reducers/vm-status.js';

import Test from 'whisker-main/whisker-main/dist/src/test-runner/test';
import TestRunner from 'whisker-main/whisker-main/dist/src/test-runner/test-runner';
import {ModelTester} from 'whisker-main/whisker-main/dist/src/whisker/model/ModelTester';
import Test from 'whisker-main/whisker-main/src/test-runner/test';
import TestRunner from 'whisker-main/whisker-main/src/test-runner/test-runner';
import {ModelTester} from 'whisker-main/whisker-main/src/whisker/model/ModelTester.ts';
import {actionExecuted, openHelpMenu, repositionHelpMenuWindow} from '../reducers/help-menu';

class Controls extends React.Component {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/vm-manager-hoc.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
setIsWhiskerProjectLoading
} from '../reducers/vm-status';

import TestRunner from 'whisker-main/whisker-main/dist/src/test-runner/test-runner';
import TestRunner from 'whisker-main/whisker-main/src/test-runner/test-runner';
/*
* Higher Order Component to manage events emitted by the VM
* @param {React.Component} WrappedComponent component to manage VM events for
Expand Down Expand Up @@ -143,7 +143,7 @@ const vmManagerHOC = function (WrappedComponent) {
delete componentProps.onReceivedWhiskerTest;
delete componentProps.onWhiskerProjectLoading;
delete componentProps.onWhiskerProjectLoaded;

return (
<WrappedComponent
isLoading={isLoadingWithIdProp}
Expand Down
8 changes: 7 additions & 1 deletion webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ const base = {
chunkFilename: 'chunks/[name].js'
},
resolve: {
symlinks: false
symlinks: false,
extensions: ['.ts', '.tsx', '.js']
},
module: {
rules: [{
Expand All @@ -54,6 +55,11 @@ const base = {
presets: ['@babel/preset-env', '@babel/preset-react']
}
},
{
test: /\.tsx?$/,
loader: 'ts-loader',
exclude: path.resolve(__dirname, 'node_modules/whisker-main/whisker-main/test')
},
{
test: /\.css$/,
use: [{
Expand Down
94 changes: 89 additions & 5 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1491,6 +1491,13 @@
dependencies:
"color-convert" "^1.9.0"

"ansi-styles@^4.1.0":
"integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
"resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
"version" "4.3.0"
dependencies:
"color-convert" "^2.0.1"

"anymatch@^2.0.0":
"integrity" "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="
"resolved" "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"
Expand Down Expand Up @@ -2583,6 +2590,14 @@
"escape-string-regexp" "^1.0.5"
"supports-color" "^5.3.0"

"chalk@^4.1.0":
"integrity" "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
"resolved" "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
"version" "4.1.2"
dependencies:
"ansi-styles" "^4.1.0"
"supports-color" "^7.1.0"

"chardet@^0.7.0":
"integrity" "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
"resolved" "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
Expand Down Expand Up @@ -2782,11 +2797,23 @@
dependencies:
"color-name" "1.1.3"

"color-convert@^2.0.1":
"integrity" "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
"resolved" "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
"version" "2.0.1"
dependencies:
"color-name" "~1.1.4"

"color-convert@~0.5.0":
"integrity" "sha512-RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling=="
"resolved" "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz"
"version" "0.5.3"

"color-name@~1.1.4":
"integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
"resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
"version" "1.1.4"

"[email protected]":
"integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
"resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
Expand Down Expand Up @@ -3687,6 +3714,15 @@
dependencies:
"once" "^1.4.0"

"enhanced-resolve@^4.0.0":
"integrity" "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="
"resolved" "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"
"version" "4.5.0"
dependencies:
"graceful-fs" "^4.1.2"
"memory-fs" "^0.5.0"
"tapable" "^1.0.0"

"enhanced-resolve@^4.1.1":
"integrity" "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="
"resolved" "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"
Expand Down Expand Up @@ -5101,6 +5137,11 @@
"resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
"version" "3.0.0"

"has-flag@^4.0.0":
"integrity" "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
"resolved" "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
"version" "4.0.0"

"has-property-descriptors@^1.0.0":
"integrity" "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="
"resolved" "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
Expand Down Expand Up @@ -7133,6 +7174,14 @@
"snapdragon" "^0.8.1"
"to-regex" "^3.0.2"

"micromatch@^4.0.0":
"integrity" "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="
"resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
"version" "4.0.5"
dependencies:
"braces" "^3.0.2"
"picomatch" "^2.3.1"

"micromatch@^4.0.4":
"integrity" "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="
"resolved" "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
Expand Down Expand Up @@ -7590,6 +7639,11 @@
dependencies:
"path-key" "^2.0.0"

"ntc@^0.0.1":
"integrity" "sha512-IkUONdTCmmFQBNfoxIMpSh9tidccodI3AxZ3v65AOJjHGHggtu758p/0d0pBngUNiYWhPXKQVwMOnQE9FTEJHg=="
"resolved" "https://registry.npmjs.org/ntc/-/ntc-0.0.1.tgz"
"version" "0.0.1"

"nth-check@^2.0.1":
"integrity" "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="
"resolved" "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"
Expand Down Expand Up @@ -8653,7 +8707,7 @@
"classnames" "^2.2.5"
"object-assign" "^4.1.0"

"react-dom@^0.14.0 || ^15.0.0 || ^16", "react-dom@^0.14.0 || ^15.0.0 || ^16.0.0", "react-dom@^15.3.0 || ^16.0.0-alpha", "react-dom@^16", "react-dom@^16.0.0-0", "react-dom@>=0.14", "react-dom@>=16.6.0", "react-dom@16.8.0":
"react-dom@^0.14.0 || ^15.0.0 || ^16", "react-dom@^0.14.0 || ^15.0.0 || ^16.0.0", "react-dom@^15.3.0 || ^16.0.0-alpha", "react-dom@^16", "react-dom@^16.0.0", "react-dom@^16.0.0-0", "react-dom@>=0.14", "react-dom@>=16.6.0":
"integrity" "sha512-dBzoAGYZpW9Yggp+CzBPC7q1HmWSeRc93DWrwbskmG1eHJWznZB/p0l/Sm+69leIGUS91AXPB/qB3WcPnKx8Sw=="
"resolved" "https://registry.npmjs.org/react-dom/-/react-dom-16.8.0.tgz"
"version" "16.8.0"
Expand Down Expand Up @@ -8803,7 +8857,7 @@
"prop-types" "^15.6.0"
"react-lifecycles-compat" "^3.0.4"

"react@^0.14 || ^15.0.0 || ^16.0.0-alpha", "react@^0.14.0 || ^15.0.0 || ^16", "react@^0.14.0 || ^15.0.0 || ^16.0.0", "react@^0.14.0 || ^15.0.0-0 || ^16.0.0-0", "react@^0.14.9 || ^15.0.0 || ^16.0.0", "react@^0.14.9 || ^15.3.0 || ^16.0.0", "react@^15.3.0 || ^16.0.0-alpha", "react@^15.6.2 || ^16.0", "react@^16", "react@^16.0.0", "react@^16.0.0-0", "react@>=0.14", "react@>=16.6.0", "[email protected] || 0.14.x || ^15.0.0-0 || ^16.0.0-0", "[email protected]":
"react@^0.14 || ^15.0.0 || ^16.0.0-alpha", "react@^0.14.0 || ^15.0.0 || ^16", "react@^0.14.0 || ^15.0.0 || ^16.0.0", "react@^0.14.0 || ^15.0.0-0 || ^16.0.0-0", "react@^0.14.9 || ^15.0.0 || ^16.0.0", "react@^0.14.9 || ^15.3.0 || ^16.0.0", "react@^15.3.0 || ^16.0.0-alpha", "react@^15.6.2 || ^16.0", "react@^16", "react@^16.0.0", "react@^16.0.0-0", "react@>=0.14", "react@>=16.6.0", "[email protected] || 0.14.x || ^15.0.0-0 || ^16.0.0-0":
"integrity" "sha512-g+nikW2D48kqgWSPwNo0NH9tIGG3DsQFlrtrQ1kj6W77z5ahyIHG0w8kPpz4Sdj6gyLnz0lEd/xsjOoGge2MYQ=="
"resolved" "https://registry.npmjs.org/react/-/react-16.8.0.tgz"
"version" "16.8.0"
Expand Down Expand Up @@ -9609,6 +9663,13 @@
"resolved" "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
"version" "6.3.0"

"semver@^7.3.4":
"integrity" "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="
"resolved" "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
"version" "7.5.4"
dependencies:
"lru-cache" "^6.0.0"

"semver@^7.3.5":
"integrity" "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="
"resolved" "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
Expand Down Expand Up @@ -10319,6 +10380,13 @@
dependencies:
"has-flag" "^3.0.0"

"supports-color@^7.1.0":
"integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
"resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
"version" "7.2.0"
dependencies:
"has-flag" "^4.0.0"

"[email protected]":
"integrity" "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ=="
"resolved" "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"
Expand Down Expand Up @@ -10577,6 +10645,17 @@
"resolved" "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
"version" "1.0.1"

"ts-loader@~8.2.0":
"integrity" "sha512-ebXBFrNyMSmbWgjnb3WBloUBK+VSx1xckaXsMXxlZRDqce/OPdYBVN5efB0W3V0defq0Gcy4YuzvPGqRgjj85A=="
"resolved" "https://registry.npmjs.org/ts-loader/-/ts-loader-8.2.0.tgz"
"version" "8.2.0"
dependencies:
"chalk" "^4.1.0"
"enhanced-resolve" "^4.0.0"
"loader-utils" "^2.0.0"
"micromatch" "^4.0.0"
"semver" "^7.3.4"

"tsconfig-paths@^3.9.0":
"integrity" "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="
"resolved" "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"
Expand Down Expand Up @@ -10634,6 +10713,11 @@
"resolved" "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
"version" "0.0.6"

"typescript@*", "typescript@^5.2.2":
"integrity" "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="
"resolved" "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz"
"version" "5.2.2"

"ua-parser-js@^0.7.30":
"integrity" "sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw=="
"resolved" "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz"
Expand Down Expand Up @@ -11052,7 +11136,7 @@
"source-list-map" "^2.0.0"
"source-map" "~0.6.1"

"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@>=1.11.0", "webpack@>=2", "[email protected]", "[email protected]":
"webpack@*", "webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@>=1.11.0", "webpack@>=2", "[email protected]", "[email protected]":
"integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="
"resolved" "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz"
"version" "4.46.0"
Expand Down Expand Up @@ -11138,8 +11222,8 @@
dependencies:
"isexe" "^2.0.0"

"whisker-main@file:../whisker-main":
"resolved" "file:../whisker-main"
"whisker-main@git+https://gitlab+deploy-token-13:[email protected]/se2/whisker/whisker-main.git#master":
"resolved" "git+https://gitlab+deploy-token-13:[email protected]/se2/whisker/whisker-main.git#50edcefe647e2a0147c05b1dbe6cf6416b146c9d"
"version" "0.8.0"

"word-wrap@~1.2.3":
Expand Down

0 comments on commit dd8935e

Please sign in to comment.