From 5e254c1d0d7c647aa1f239736a3424976a89b1d4 Mon Sep 17 00:00:00 2001 From: Eric Sanchez Date: Tue, 8 Dec 2020 17:03:02 -0800 Subject: [PATCH] ci: return to original md5 vendor --- package-lock.json | 5 ----- package.json | 1 - test/test-buildSrcSet.cjs | 17 ++++++++--------- test/test-buildSrcSet.js | 16 ++++++++-------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5d008dce..f13c6d18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1373,11 +1373,6 @@ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=" }, - "crypto-js": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz", - "integrity": "sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg==" - }, "debug": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", diff --git a/package.json b/package.json index 5e6065ea..8c2b1e1f 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "browser": "dist/imgix-core-js.umd.js", "type": "module", "dependencies": { - "crypto-js": "^4.0.0", "js-base64": "~2.6.0", "md5": "^2.2.1" }, diff --git a/test/test-buildSrcSet.cjs b/test/test-buildSrcSet.cjs index 2317ecf6..85ac39b8 100644 --- a/test/test-buildSrcSet.cjs +++ b/test/test-buildSrcSet.cjs @@ -2,9 +2,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; } -var crypto = _interopDefault(require('crypto-js')); -var assert = _interopDefault(require('assert')); var md5 = _interopDefault(require('md5')); +var assert = _interopDefault(require('assert')); var jsBase64 = require('js-base64'); function _classCallCheck(instance, Constructor) { @@ -396,7 +395,7 @@ describe('SrcSet Builder:', function describeSuite() { param = param.slice(0, param.indexOf('s=') - 1); var generated_signature = src.slice(src.indexOf('s=') + 2, src.length); var signatureBase = 'MYT0KEN' + path + param; - var expected_signature = crypto.MD5(signatureBase).toString(); + var expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); }); @@ -433,7 +432,7 @@ describe('SrcSet Builder:', function describeSuite() { param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); var generated_signature = src.slice(src.indexOf('s=') + 2, src.length); var signatureBase = 'MYT0KEN' + path + param; - var expected_signature = crypto.MD5(signatureBase).toString(); + var expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); }); @@ -569,7 +568,7 @@ describe('SrcSet Builder:', function describeSuite() { param = param.slice(0, param.indexOf('s=') - 1); var generated_signature = src.slice(src.indexOf('s=') + 2, src.length); var signatureBase = 'MYT0KEN' + path + param; - var expected_signature = crypto.MD5(signatureBase).toString(); + var expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); }); @@ -607,7 +606,7 @@ describe('SrcSet Builder:', function describeSuite() { param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); var generated_signature = src.slice(src.indexOf('s=') + 2, src.length); var signatureBase = 'MYT0KEN' + path + param; - var expected_signature = crypto.MD5(signatureBase).toString(); + var expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); }); @@ -754,7 +753,7 @@ describe('SrcSet Builder:', function describeSuite() { param = param.slice(0, param.indexOf('s=') - 1); var generated_signature = src.slice(src.indexOf('s=') + 2, src.length); var signatureBase = 'MYT0KEN' + path + param; - var expected_signature = crypto.MD5(signatureBase).toString(); + var expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); }); @@ -792,7 +791,7 @@ describe('SrcSet Builder:', function describeSuite() { param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); var generated_signature = src.slice(src.indexOf('s=') + 2, src.length); var signatureBase = 'MYT0KEN' + path + param; - var expected_signature = crypto.MD5(signatureBase).toString(); + var expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); }); @@ -892,7 +891,7 @@ describe('SrcSet Builder:', function describeSuite() { var param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); var generated_signature = src.slice(src.indexOf('s=') + 2, src.length); var signatureBase = 'MYT0KEN' + path + param; - var expected_signature = crypto.MD5(signatureBase).toString(); + var expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); }); diff --git a/test/test-buildSrcSet.js b/test/test-buildSrcSet.js index 01e82bdb..6688c7bd 100644 --- a/test/test-buildSrcSet.js +++ b/test/test-buildSrcSet.js @@ -1,4 +1,4 @@ -import crypto from 'crypto-js'; +import md5 from 'md5'; import assert from 'assert'; import ImgixClient from '../src/main.js'; @@ -96,7 +96,7 @@ describe('SrcSet Builder:', function describeSuite() { param = param.slice(0, param.indexOf('s=') - 1); let generated_signature = src.slice(src.indexOf('s=') + 2, src.length); let signatureBase = 'MYT0KEN' + path + param; - let expected_signature = crypto.MD5(signatureBase).toString(); + let expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); @@ -141,7 +141,7 @@ describe('SrcSet Builder:', function describeSuite() { param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); let generated_signature = src.slice(src.indexOf('s=') + 2, src.length); let signatureBase = 'MYT0KEN' + path + param; - let expected_signature = crypto.MD5(signatureBase).toString(); + let expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); @@ -282,7 +282,7 @@ describe('SrcSet Builder:', function describeSuite() { param = param.slice(0, param.indexOf('s=') - 1); let generated_signature = src.slice(src.indexOf('s=') + 2, src.length); let signatureBase = 'MYT0KEN' + path + param; - let expected_signature = crypto.MD5(signatureBase).toString(); + let expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); @@ -327,7 +327,7 @@ describe('SrcSet Builder:', function describeSuite() { param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); let generated_signature = src.slice(src.indexOf('s=') + 2, src.length); let signatureBase = 'MYT0KEN' + path + param; - let expected_signature = crypto.MD5(signatureBase).toString(); + let expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); @@ -477,7 +477,7 @@ describe('SrcSet Builder:', function describeSuite() { param = param.slice(0, param.indexOf('s=') - 1); let generated_signature = src.slice(src.indexOf('s=') + 2, src.length); let signatureBase = 'MYT0KEN' + path + param; - let expected_signature = crypto.MD5(signatureBase).toString(); + let expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); @@ -522,7 +522,7 @@ describe('SrcSet Builder:', function describeSuite() { param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); let generated_signature = src.slice(src.indexOf('s=') + 2, src.length); let signatureBase = 'MYT0KEN' + path + param; - let expected_signature = crypto.MD5(signatureBase).toString(); + let expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); }); @@ -611,7 +611,7 @@ describe('SrcSet Builder:', function describeSuite() { let param = src.slice(src.indexOf('?'), src.indexOf('s=') - 1); let generated_signature = src.slice(src.indexOf('s=') + 2, src.length); let signatureBase = 'MYT0KEN' + path + param; - let expected_signature = crypto.MD5(signatureBase).toString(); + let expected_signature = md5(signatureBase).toString(); assert.strictEqual(expected_signature, generated_signature); });