diff --git a/nx.json b/nx.json index 14421ab0..944fa1a2 100644 --- a/nx.json +++ b/nx.json @@ -3,7 +3,7 @@ "default": { "runner": "@nrwl/nx-cloud", "options": { - "cacheableOperations": ["compile", "lint", "test"], + "cacheableOperations": ["build:quick", "compile", "lint", "test"], "accessToken": "", "canTrackAnalytics": false, "showUsageWarnings": true @@ -16,14 +16,11 @@ }, "targetDefaults": { "build:quick": { - "dependsOn": ["compile"], + "dependsOn": ["^compile"], "outputs": ["{projectRoot}/lib"] }, "dev": { - "dependsOn": ["compile"], - "outputs": ["{projectRoot}/lib"] - }, - "compile": { + "dependsOn": ["^compile"], "outputs": ["{projectRoot}/lib"] }, "test": { diff --git a/packages/language-server/api.d.ts b/packages/language-server/api.d.ts index 881647d7..2b3c9eb8 100644 --- a/packages/language-server/api.d.ts +++ b/packages/language-server/api.d.ts @@ -25,10 +25,10 @@ export type ServerInitializationOptions = { logLevel?: LogLevel; }; -export type FetchResponse = { - ok: boolean; - status: number; - json: () => Promise; -}; +// export type FetchResponse = { +// ok: boolean; +// status: number; +// json: () => Promise; +// }; -export type Fetcher = (url: string) => Promise; +// export type Fetcher = (url: string) => Promise; diff --git a/test-packages/test-utils/api.d.ts b/test-packages/test-utils/api.d.ts index 583bcc63..6bb8851f 100644 --- a/test-packages/test-utils/api.d.ts +++ b/test-packages/test-utils/api.d.ts @@ -19,7 +19,9 @@ import { } from "@ui5-language-assistant/semantic-model-types"; import { XMLAttribute, XMLElement } from "@xml-tools/ast"; import { UI5XMLViewCompletion } from "@ui5-language-assistant/xml-views-completion"; -import { FetchResponse } from "@ui5-language-assistant/language-server"; +import { + FetchResponse +} from "@ui5-language-assistant/logic-utils"; import { DEFAULT_UI5_VERSION } from "@ui5-language-assistant/constant"; // easily build (partial) data structures for tests with mandatory "name" field diff --git a/test-packages/test-utils/package.json b/test-packages/test-utils/package.json index 61c142a9..271cffa0 100644 --- a/test-packages/test-utils/package.json +++ b/test-packages/test-utils/package.json @@ -13,11 +13,6 @@ "license": "Apache-2.0", "typings": "./api.d.ts", "dependencies": { - "@ui5-language-assistant/constant": "workspace:*", - "@ui5-language-assistant/language-server": "workspace:*", - "@ui5-language-assistant/semantic-model-types": "4.0.11", - "@ui5-language-assistant/test-utils": "workspace:*", - "@ui5-language-assistant/xml-views-completion": "workspace:*", "@xml-tools/ast": "5.0.0", "chai": "4.2.0", "deep-equal-in-any-order": "1.0.28", diff --git a/test-packages/test-utils/src/utils/semantic-model-provider.ts b/test-packages/test-utils/src/utils/semantic-model-provider.ts index fa79cf9e..a36ff299 100644 --- a/test-packages/test-utils/src/utils/semantic-model-provider.ts +++ b/test-packages/test-utils/src/utils/semantic-model-provider.ts @@ -2,7 +2,9 @@ import { readdirSync } from "fs"; import { readJsonSync, readJson, existsSync } from "fs-extra"; import { resolve, dirname } from "path"; import { filter, reduce, has, forEach, get } from "lodash"; -import { FetchResponse } from "@ui5-language-assistant/language-server"; +import { + FetchResponse +} from "@ui5-language-assistant/logic-utils"; import { UI5Framework, UI5SemanticModel,