diff --git a/package-lock.json b/package-lock.json index 51cd9fddce2..467eaf24d06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "BSD-3-Clause", "dependencies": { "@turbowarp/json": "^0.1.2", + "@turbowarp/nanolog": "^0.1.0", "@vernier/godirect": "1.5.0", "arraybuffer-loader": "^1.0.6", "atob": "2.1.2", @@ -21,7 +22,6 @@ "htmlparser2": "3.10.0", "immutable": "3.8.2", "jszip": "^3.1.5", - "minilog": "3.1.0", "scratch-parser": "github:TurboWarp/scratch-parser#master", "scratch-sb1-converter": "0.2.7", "scratch-translate-extension-languages": "0.0.20191118205314", @@ -2133,6 +2133,11 @@ "resolved": "https://registry.npmjs.org/@turbowarp/json/-/json-0.1.2.tgz", "integrity": "sha512-9nWywp+0SH7ROVzQPQQO9gMWBikahsqyMWp1Ku8VV0q+q6bnx6dS0aNPTjqTtF2GHAY55hcREsqKzaoUdWBSwg==" }, + "node_modules/@turbowarp/nanolog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@turbowarp/nanolog/-/nanolog-0.1.0.tgz", + "integrity": "sha512-1NB/kWFOrdNd2wpY55CTGDqkua+syn1wMjYhJ8w565YzeRa9WflR2jnxKSi3oYzOK9Rk0R6JG7HVxvp2E3vJlg==" + }, "node_modules/@turbowarp/scratch-svg-renderer": { "version": "1.0.0-202312300007-62fe825", "resolved": "https://registry.npmjs.org/@turbowarp/scratch-svg-renderer/-/scratch-svg-renderer-1.0.0-202312300007-62fe825.tgz", diff --git a/package.json b/package.json index 52c40027871..15829fb6fae 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ }, "dependencies": { "@turbowarp/json": "^0.1.2", + "@turbowarp/nanolog": "^0.1.0", "@vernier/godirect": "1.5.0", "arraybuffer-loader": "^1.0.6", "atob": "2.1.2", @@ -46,7 +47,6 @@ "htmlparser2": "3.10.0", "immutable": "3.8.2", "jszip": "^3.1.5", - "minilog": "3.1.0", "scratch-parser": "github:TurboWarp/scratch-parser#master", "scratch-sb1-converter": "0.2.7", "scratch-translate-extension-languages": "0.0.20191118205314", diff --git a/src/util/log.js b/src/util/log.js index cdc04520e0c..1175b77d506 100644 --- a/src/util/log.js +++ b/src/util/log.js @@ -1,4 +1,4 @@ -const minilog = require('minilog'); -minilog.enable(); +const nanolog = require('@turbowarp/nanolog'); +nanolog.enable(); -module.exports = minilog('vm'); +module.exports = nanolog('vm'); diff --git a/test/fixtures/dispatch-test-worker-shim.js b/test/fixtures/dispatch-test-worker-shim.js index d0ef30ba417..4fee07fdd66 100644 --- a/test/fixtures/dispatch-test-worker-shim.js +++ b/test/fixtures/dispatch-test-worker-shim.js @@ -5,7 +5,7 @@ const path = require('path'); const oldRequire = Module.prototype.require; Module.prototype.require = function (target) { - if (target.indexOf('/') === -1) { + if (target.indexOf('/') === -1 || target.startsWith('@')) { // we really do just want to forward the arguments here // eslint-disable-next-line prefer-rest-params return oldRequire.apply(this, arguments); diff --git a/test/integration/execute.js b/test/integration/execute.js index c42e4314441..2c758ecce39 100644 --- a/test/integration/execute.js +++ b/test/integration/execute.js @@ -3,7 +3,6 @@ const path = require('path'); const test = require('tap').test; -const log = require('../../src/util/log'); const makeTestStorage = require('../fixtures/make-test-storage'); const readFileToBuffer = require('../fixtures/readProjectFile').readFileToBuffer; const VirtualMachine = require('../../src/index'); @@ -65,10 +64,6 @@ fs.readdirSync(executeDir) .filter(uri => fileFilter.test(uri)) .forEach(uri => { const run = (t, enableCompiler) => { - // Disable logging during this test. - log.suggest.deny('vm', 'error'); - t.tearDown(() => log.suggest.clear()); - const vm = new VirtualMachine(); // Map string messages to tap reporting methods. This will be used diff --git a/webpack.config.js b/webpack.config.js index 5ce82345479..52166ca10c7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -71,7 +71,6 @@ module.exports = [ 'htmlparser2': true, 'immutable': true, 'jszip': true, - 'minilog': true, 'scratch-parser': true, 'socket.io-client': true, 'text-encoding': true