This is an automated email from the ASF dual-hosted git repository. gerben pushed a commit to branch dom-tests in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit a07e7912470f60fe1c16bc08248d42a771438f7a Author: Gerben <[email protected]> AuthorDate: Fri May 22 17:31:30 2020 +0200 Remove dom-node-iterator polyfill --- @types/dom-node-iterator/index.d.ts | 4 ---- packages/dom/package.json | 1 - packages/dom/src/text-quote/describe.ts | 7 +++---- packages/dom/src/text-quote/match.ts | 3 +-- yarn.lock | 5 ----- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/@types/dom-node-iterator/index.d.ts b/@types/dom-node-iterator/index.d.ts deleted file mode 100644 index 0e10887..0000000 --- a/@types/dom-node-iterator/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module 'dom-node-iterator' { - let createNodeIterator: Document['createNodeIterator']; - export default createNodeIterator; -} diff --git a/packages/dom/package.json b/packages/dom/package.json index fb1aede..4f0baed 100644 --- a/packages/dom/package.json +++ b/packages/dom/package.json @@ -15,7 +15,6 @@ "@babel/runtime-corejs3": "^7.8.7", "cartesian": "^1.0.1", "core-js": "^3.6.4", - "dom-node-iterator": "^3.5.3", "dom-seek": "^5.1.0" }, "engines": { diff --git a/packages/dom/src/text-quote/describe.ts b/packages/dom/src/text-quote/describe.ts index ef7eb53..57a587c 100644 --- a/packages/dom/src/text-quote/describe.ts +++ b/packages/dom/src/text-quote/describe.ts @@ -18,7 +18,6 @@ * under the License. */ -import createNodeIterator from 'dom-node-iterator'; import seek from 'dom-seek'; import { TextQuoteSelector } from '../../../selector/src'; @@ -32,7 +31,7 @@ function firstTextNodeInRange(range: Range): Text { if (isTextNode(startContainer)) return startContainer; const root = range.commonAncestorContainer; - const iter = createNodeIterator(root, NodeFilter.SHOW_TEXT); + const iter = document.createNodeIterator(root, NodeFilter.SHOW_TEXT); return iter.nextNode() as Text; } @@ -62,7 +61,7 @@ async function calculateContextForDisambiguation( const matcher = createTextQuoteSelectorMatcher(selector); - const iter = createNodeIterator(root, NodeFilter.SHOW_TEXT); + const iter = document.createNodeIterator(root, NodeFilter.SHOW_TEXT); const startNode = firstTextNodeInRange(range); const startIndex = @@ -74,7 +73,7 @@ async function calculateContextForDisambiguation( const affixLengthPairs: Array<[number, number]> = []; for await (const match of matcher(scopeAsRange)) { - const matchIter = createNodeIterator(root, NodeFilter.SHOW_TEXT); + const matchIter = document.createNodeIterator(root, NodeFilter.SHOW_TEXT); const matchStartNode = firstTextNodeInRange(match); const matchStartIndex = diff --git a/packages/dom/src/text-quote/match.ts b/packages/dom/src/text-quote/match.ts index 4118fd0..d5ded88 100644 --- a/packages/dom/src/text-quote/match.ts +++ b/packages/dom/src/text-quote/match.ts @@ -18,7 +18,6 @@ * under the License. */ -import createNodeIterator from 'dom-node-iterator'; import seek from 'dom-seek'; import { TextQuoteSelector } from '../../../selector/src'; @@ -37,7 +36,7 @@ export function createTextQuoteSelectorMatcher(selector: TextQuoteSelector): Dom const suffix = selector.suffix || ''; const pattern = prefix + exact + suffix; - const iter = createNodeIterator(root, NodeFilter.SHOW_TEXT); + const iter = document.createNodeIterator(root, NodeFilter.SHOW_TEXT); let fromIndex = 0; let referenceNodeIndex = 0; diff --git a/yarn.lock b/yarn.lock index c20b2b2..c7cf27a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3949,11 +3949,6 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-node-iterator@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/dom-node-iterator/-/dom-node-iterator-3.5.3.tgz#32b68aa440962f1734487029f544a3db704637b7"; - integrity sha1-MraKpECWLxc0SHAp9USj23BGN7c= - dom-seek@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/dom-seek/-/dom-seek-5.1.1.tgz#4e35bee763b6ba082f372345823ec9665d1fbf26";
