This is an automated email from the ASF dual-hosted git repository. randall pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 230c0d22394afa023f2a0fa9be7d04392e9853ba Author: Randall Leeds <[email protected]> AuthorDate: Wed Jul 22 22:26:41 2020 -0700 Use names for inter-package references --- packages/dom/package.json | 3 +++ packages/dom/src/css.ts | 2 +- packages/dom/src/range/match.ts | 3 ++- packages/dom/src/text-quote/describe.ts | 2 +- packages/dom/src/text-quote/match.ts | 2 +- packages/dom/src/types.ts | 2 +- packages/dom/test/text-quote/describe-cases.ts | 5 +++-- packages/dom/test/text-quote/match-cases.ts | 5 +++-- packages/dom/test/text-quote/match.test.ts | 3 ++- tsconfig.json | 4 ++++ 10 files changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/dom/package.json b/packages/dom/package.json index 4f0baed..c64f7ce 100644 --- a/packages/dom/package.json +++ b/packages/dom/package.json @@ -17,6 +17,9 @@ "core-js": "^3.6.4", "dom-seek": "^5.1.0" }, + "devDependencies": { + "@annotator/selector": "^0.1.0" + }, "engines": { "node": ">=10.0.0" }, diff --git a/packages/dom/src/css.ts b/packages/dom/src/css.ts index 004158c..124dd01 100644 --- a/packages/dom/src/css.ts +++ b/packages/dom/src/css.ts @@ -18,7 +18,7 @@ * under the License. */ -import { CssSelector, Matcher } from "../../selector/src"; +import { CssSelector, Matcher } from '@annotator/selector'; export function createCssSelectorMatcher(selector: CssSelector): Matcher<Document, Element> { return async function* matchAll(scope: Document) { diff --git a/packages/dom/src/range/match.ts b/packages/dom/src/range/match.ts index e540d5c..2e30af9 100644 --- a/packages/dom/src/range/match.ts +++ b/packages/dom/src/range/match.ts @@ -18,9 +18,10 @@ * under the License. */ +import { RangeSelector, Selector } from '@annotator/selector'; + import { ownerDocument } from '../scope'; import { product } from './cartesian'; -import { RangeSelector, Selector } from '../../../selector/src/types'; import { DomMatcher, DomScope } from '../types'; export function makeCreateRangeSelectorMatcher( diff --git a/packages/dom/src/text-quote/describe.ts b/packages/dom/src/text-quote/describe.ts index 15749c9..eebd86d 100644 --- a/packages/dom/src/text-quote/describe.ts +++ b/packages/dom/src/text-quote/describe.ts @@ -19,8 +19,8 @@ */ import seek from 'dom-seek'; +import { TextQuoteSelector } from '@annotator/selector'; -import { TextQuoteSelector } from '../../../selector/src'; import { DomScope } from '../types'; import { ownerDocument, rangeFromScope } from '../scope'; diff --git a/packages/dom/src/text-quote/match.ts b/packages/dom/src/text-quote/match.ts index 18b077e..04bb8a6 100644 --- a/packages/dom/src/text-quote/match.ts +++ b/packages/dom/src/text-quote/match.ts @@ -18,9 +18,9 @@ * under the License. */ +import { TextQuoteSelector } from '@annotator/selector'; import seek from 'dom-seek'; -import { TextQuoteSelector } from '../../../selector/src'; import { DomScope, DomMatcher } from '../types'; import { ownerDocument, rangeFromScope } from '../scope'; diff --git a/packages/dom/src/types.ts b/packages/dom/src/types.ts index 040aa56..bc9636e 100644 --- a/packages/dom/src/types.ts +++ b/packages/dom/src/types.ts @@ -18,7 +18,7 @@ * under the License. */ -import { Matcher } from '../../selector/src'; +import { Matcher } from '@annotator/selector'; export type DomScope = Node | Range diff --git a/packages/dom/test/text-quote/describe-cases.ts b/packages/dom/test/text-quote/describe-cases.ts index 129804d..8010b46 100644 --- a/packages/dom/test/text-quote/describe-cases.ts +++ b/packages/dom/test/text-quote/describe-cases.ts @@ -18,8 +18,9 @@ * under the License. */ -import { TextQuoteSelector } from "../../../selector/src"; -import { RangeInfo } from "./utils"; +import { TextQuoteSelector } from '@annotator/selector'; + +import { RangeInfo } from './utils'; const testCases: { [name: string]: { diff --git a/packages/dom/test/text-quote/match-cases.ts b/packages/dom/test/text-quote/match-cases.ts index 1748d1d..9ea434b 100644 --- a/packages/dom/test/text-quote/match-cases.ts +++ b/packages/dom/test/text-quote/match-cases.ts @@ -18,8 +18,9 @@ * under the License. */ -import { TextQuoteSelector } from "../../../selector/src"; -import { RangeInfo } from "./utils"; +import { TextQuoteSelector } from '@annotator/selector'; + +import { RangeInfo } from './utils'; const testCases: { [name: string]: { diff --git a/packages/dom/test/text-quote/match.test.ts b/packages/dom/test/text-quote/match.test.ts index 3148a3f..4df937a 100644 --- a/packages/dom/test/text-quote/match.test.ts +++ b/packages/dom/test/text-quote/match.test.ts @@ -19,8 +19,9 @@ */ import { assert } from 'chai'; +import { TextQuoteSelector } from '@annotator/selector'; + import { createTextQuoteSelectorMatcher } from '../../src/text-quote/match'; -import { TextQuoteSelector } from '../../../selector/src/types'; import { DomScope } from '../../src/types'; import testCases from './match-cases'; import { evaluateXPath, RangeInfo } from './utils'; diff --git a/tsconfig.json b/tsconfig.json index 49400f2..e217eda 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "baseUrl": ".", "strict": true, "noEmit": true, "target": "ES2017", @@ -9,6 +10,9 @@ "DOM.Iterable" ], "moduleResolution": "Node", + "paths": { + "@annotator/*": ["packages/*/src"] + }, "typeRoots": [ "./@types" ]
