From 0f6663e867f6cefd119e206e60ffe59c11177d74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Oddsson?= Date: Wed, 25 Oct 2023 11:04:18 +0200 Subject: [PATCH 1/4] update simple-assert --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- test/index.js | 2 +- test/new-ecmascript-types.js | 2 +- test/temporal-types.js | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc13900..381ab89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "lcov-result-merger": "^1.0.2", "lodash.isequal": "^4.4.0", "mocha": "^9.1.1", - "simple-assert": "^1.0.0" + "simple-assert": "^2.0.0" }, "engines": { "node": ">=6" @@ -1461,12 +1461,12 @@ } }, "node_modules/assertion-error": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz", - "integrity": "sha512-g/gZV+G476cnmtYI+Ko9d5khxSoCSoom/EaNmmCfwpOvBXEJ18qwFrxfP1/CsIqk2no1sAKKwxndV0tP7ROOFQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", "dev": true, "engines": { - "node": "*" + "node": ">=12" } }, "node_modules/astral-regex": { @@ -6403,15 +6403,15 @@ "dev": true }, "node_modules/simple-assert": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/simple-assert/-/simple-assert-1.0.0.tgz", - "integrity": "sha512-cXQgKVkffwCOmwDUJjqDebtnC6hAWfxbA+CYZ2URnSVeplshP6KuF88nV7clkpeKXVFmgv0cSB//0jq///tlDQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-assert/-/simple-assert-2.0.0.tgz", + "integrity": "sha512-LeLYRAJv7RQ3JXnE6rk/L2FMnzswZ65dHJieurBHUCC0xOpiq/hrybGKhcpEMTMTxZJuM4y9LsCQYdKij73PZQ==", "dev": true, "dependencies": { - "assertion-error": "1.0.0" + "assertion-error": "^2.0.0" }, "engines": { - "node": "*" + "node": ">= 14.16" } }, "node_modules/slash": { diff --git a/package.json b/package.json index 7efc8db..8da04b2 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "lcov-result-merger": "^1.0.2", "lodash.isequal": "^4.4.0", "mocha": "^9.1.1", - "simple-assert": "^1.0.0" + "simple-assert": "^2.0.0" }, "engines": { "node": ">=6" diff --git a/test/index.js b/test/index.js index 4dba38c..c6d4c33 100644 --- a/test/index.js +++ b/test/index.js @@ -1,4 +1,4 @@ -import assert from 'simple-assert'; +import { assert } from 'simple-assert'; import eql, { MemoizeMap } from '../index.js'; function describeIf(condition) { diff --git a/test/new-ecmascript-types.js b/test/new-ecmascript-types.js index 32f6e85..190a686 100644 --- a/test/new-ecmascript-types.js +++ b/test/new-ecmascript-types.js @@ -1,5 +1,5 @@ /* eslint-disable no-eval */ -import assert from 'simple-assert'; +import { assert } from 'simple-assert'; import eql from '../index.js'; var emptyFunction = Function.prototype; var symbolExists = typeof Symbol === 'function'; diff --git a/test/temporal-types.js b/test/temporal-types.js index c59ee98..6489945 100644 --- a/test/temporal-types.js +++ b/test/temporal-types.js @@ -1,4 +1,4 @@ -import assert from 'simple-assert'; +import { assert } from 'simple-assert'; import { Temporal } from '@js-temporal/polyfill'; import eql from '../index.js'; From 7e0b56f7711f5741aeba3e69108b55920aae7604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Oddsson?= Date: Wed, 25 Oct 2023 11:07:25 +0200 Subject: [PATCH 2/4] remove type-detect in favor of function --- index.js | 18 +++++++++++++++++- package-lock.json | 11 ----------- package.json | 3 --- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/index.js b/index.js index cc4e9da..642cbc7 100644 --- a/index.js +++ b/index.js @@ -5,7 +5,23 @@ * MIT Licensed */ -import type from 'type-detect'; +function type(obj) { + if (typeof obj === 'undefined') { + return 'undefined'; + } + + if (obj === null) { + return 'null'; + } + + const stringTag = obj[Symbol.toStringTag]; + if (typeof stringTag === 'string') { + return stringTag; + } + const sliceStart = 8; + const sliceEnd = -1; + return Object.prototype.toString.call(obj).slice(sliceStart, sliceEnd); +} function FakeMap() { this._key = 'chai/deep-eql__' + Math.random() + Date.now(); diff --git a/package-lock.json b/package-lock.json index 381ab89..5ca6fec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,6 @@ "name": "deep-eql", "version": "0.0.0-development", "license": "MIT", - "dependencies": { - "type-detect": "^4.0.0" - }, "devDependencies": { "@js-temporal/polyfill": "^0.4.3", "@rollup/plugin-commonjs": "^24.1.0", @@ -6962,14 +6959,6 @@ "node": ">= 0.8.0" } }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "engines": { - "node": ">=4" - } - }, "node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", diff --git a/package.json b/package.json index 8da04b2..745064d 100644 --- a/package.json +++ b/package.json @@ -51,9 +51,6 @@ "ecmaVersion": 2015 } }, - "dependencies": { - "type-detect": "^4.0.0" - }, "devDependencies": { "@js-temporal/polyfill": "^0.4.3", "@rollup/plugin-commonjs": "^24.1.0", From fb6ba09393de6b7db8544f095c18f107fdd363ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Oddsson?= Date: Wed, 25 Oct 2023 11:07:53 +0200 Subject: [PATCH 3/4] remove component.json --- component.json | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 component.json diff --git a/component.json b/component.json deleted file mode 100644 index f97f1a1..0000000 --- a/component.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "deep-eql" - , "repo": "chaijs/deep-eql" - , "version": "0.1.3" - , "description": "Improved deep equality testing for Node.js and the browser." - , "license": "MIT" - , "keywords": [ - ] - , "main": "lib/eql.js" - , "scripts": [ - "lib/eql.js" - ] - , "dependencies": { - "chaijs/type-detect": "0.1.1" - } - , "development": { - "chaijs/simple-assert": "1.0.0" - } -} From cf3eab159d6ec0f90180dd1ab5daee8ed40f01a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Oddsson?= Date: Wed, 25 Oct 2023 11:08:13 +0200 Subject: [PATCH 4/4] simplify web test runner now that there are no commonjs deps --- web-test-runner.config.mjs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/web-test-runner.config.mjs b/web-test-runner.config.mjs index 52283f1..245c498 100644 --- a/web-test-runner.config.mjs +++ b/web-test-runner.config.mjs @@ -1,17 +1,4 @@ -import { fromRollup } from '@web/dev-server-rollup'; -import rollupCommonjs from '@rollup/plugin-commonjs'; - -const commonjs = fromRollup(rollupCommonjs); - export default { - mimeTypes: { - '**/*.cjs': '*.js', - }, nodeResolve: true, - files: [ 'test/*.{js,mjs}' ], - plugins: [ - commonjs({ - include: [ './index.js', './test/*.js', './node_modules/simple-assert/**/*', './node_modules/assertion-error/**/*', './node_modules/type-detect/**/*' ], - }), - ], + files: ["test/*.{js,mjs}"] };