Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,32 @@
},
"dependencies": {
"arraybuffer-loader": "^1.0.3",
"base64-js": "1.2.1",
"js-md5": "0.6.1",
"base64-js": "1.3.0",
"js-md5": "0.7.3",
"minilog": "3.1.0",
"nets": "3.2.0",
"text-encoding": "0.6.4"
"text-encoding": "0.7.0"
},
"devDependencies": {
"@commitlint/cli": "6.1.0",
"@commitlint/config-conventional": "6.1.0",
"@commitlint/travis-cli": "6.1.0",
"babel-core": "6.22.1",
"babel-eslint": "7.1.1",
"babel-loader": "^7.1.4",
"babel-polyfill": "6.22.0",
"babel-preset-env": "^1.6.1",
"@babel/core": "^7.1.2",
"@babel/polyfill": "7.0.0",
"@babel/preset-env": "^7.1.0",
"@commitlint/cli": "7.2.1",
"@commitlint/config-conventional": "7.1.2",
"@commitlint/travis-cli": "7.2.1",
"babel-eslint": "10.0.1",
"babel-loader": "^8.0.4",
"cz-conventional-changelog": "^2.0.0",
"eslint": "3.14.1",
"eslint-config-scratch": "3.1.0",
"eslint-plugin-react": "6.9.0",
"file-loader": "1.1.11",
"husky": "0.14.3",
"eslint": "5.7.0",
"eslint-config-scratch": "5.0.0",
"eslint-plugin-react": "7.11.1",
"file-loader": "2.0.0",
"husky": "1.1.2",
"json": "^9.0.4",
"semantic-release": "^6.3.2",
"tap": "8.0.1",
"semantic-release": "^15.10.5",
"tap": "12.0.1",
"travis-after-all": "^1.4.4",
"uglifyjs-webpack-plugin": "^1.2.5",
"uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.8.0",
"webpack-cli": "^3.1.1"
},
Expand Down
6 changes: 3 additions & 3 deletions test/integration/download-known-assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const test = require('tap').test;

const ScratchStorage = require('../../dist/node/scratch-storage');

var storage;
let storage;
test('constructor', t => {
storage = new ScratchStorage();
t.type(storage, ScratchStorage);
Expand Down Expand Up @@ -96,10 +96,10 @@ test('load', t => {
t.strictEqual(md5(asset.data), assetInfo.md5);
}
};
for (var i = 0; i < testAssets.length; ++i) {
for (let i = 0; i < testAssets.length; ++i) {
const assetInfo = testAssets[i];

var promise = storage.load(assetInfo.type, assetInfo.id, assetInfo.ext);
let promise = storage.load(assetInfo.type, assetInfo.id, assetInfo.ext);
t.type(promise, 'Promise');

promise = promise.then(asset => checkAsset(assetInfo, asset));
Expand Down
6 changes: 3 additions & 3 deletions test/unit/load-default-assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const test = require('tap').test;

const ScratchStorage = require('../../dist/node/scratch-storage');

var storage;
let storage;
test('constructor', t => {
storage = new ScratchStorage();
t.type(storage, ScratchStorage);
Expand All @@ -14,7 +14,7 @@ const defaultAssetTypes = [storage.AssetType.ImageBitmap, storage.AssetType.Imag
const defaultIds = {};

test('getDefaultAssetId', t => {
for (var i = 0; i < defaultAssetTypes.length; ++i) {
for (let i = 0; i < defaultAssetTypes.length; ++i) {
const assetType = defaultAssetTypes[i];
const id = storage.getDefaultAssetId(assetType);
t.type(id, 'string');
Expand All @@ -32,7 +32,7 @@ test('load', t => {
t.ok(asset.data.length);
t.strictEqual(md5(asset.data), id);
};
for (var i = 0; i < defaultAssetTypes.length; ++i) {
for (let i = 0; i < defaultAssetTypes.length; ++i) {
const assetType = defaultAssetTypes[i];
const id = defaultIds[assetType.name];

Expand Down
4 changes: 3 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ const base = {
test: /\.js$/,
loader: 'babel-loader',
options: {
presets: [['env', {targets: {browsers: ['last 3 versions', 'Safari >= 8', 'iOS >= 8']}}]]
presets: [
['@babel/preset-env', {targets: {browsers: ['last 3 versions', 'Safari >= 8', 'iOS >= 8']}}]
]
}
}
]
Expand Down