Skip to content

Commit d26ea5c

Browse files
authored
Merge pull request #90 from davelopez/cleanup_schemas_references
Removes unused schema path references
2 parents efe34f3 + bab904f commit d26ea5c

6 files changed

Lines changed: 6 additions & 24 deletions

File tree

server/gx-workflow-ls-format2/tsconfig.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
"resolveJsonModule": true,
1111
"esModuleInterop": true,
1212
"sourceMap": true,
13-
"strict": true,
14-
"paths": {
15-
"@schemas/*": ["../../workflow-languages/schemas/*"]
16-
}
13+
"strict": true
1714
}
1815
}

server/gx-workflow-ls-format2/tsup.config.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import { defineConfig } from "tsup";
2-
import path from "path";
31
import { readFileSync } from "fs";
2+
import { defineConfig } from "tsup";
43
import { parse } from "yaml";
54

6-
const schemasDir = path.resolve(__dirname, "../../workflow-languages/schemas");
7-
85
const yamlPlugin = {
96
name: "yaml",
107
setup(build: { onLoad: (opts: object, cb: (args: { path: string }) => object) => void }) {
@@ -23,7 +20,6 @@ const baseEsbuildOptions = (options: {
2320
mainFields?: string[];
2421
conditions?: string[];
2522
}): void => {
26-
options.alias = { "@schemas": schemasDir };
2723
// Prefer ESM ("module") so bundled packages like vscode-json-languageservice use their
2824
// static-import ESM build instead of the UMD build (dynamic require() calls esbuild can't resolve).
2925
options.mainFields = ["module", "main"];
@@ -35,7 +31,6 @@ const browserEsbuildOptions = (options: {
3531
mainFields?: string[];
3632
conditions?: string[];
3733
}): void => {
38-
options.alias = { "@schemas": schemasDir };
3934
options.mainFields = ["module", "main"];
4035
// "browser" first so @galaxy-tool-util/core's universal (browser-safe) entry is selected.
4136
options.conditions = ["browser", "import", "default"];

server/packages/server-common/tsconfig.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
"composite": true,
1515
"declaration": true,
1616
"baseUrl": ".",
17-
"rootDir": "../../../",
18-
"paths": {
19-
"@schemas/*": ["../../../workflow-languages/schemas/*"]
20-
}
17+
"rootDir": "../../../"
2118
},
2219
"include": ["src/**/*", "../../../shared/**/*", "../../../workflow-languages/**/*"]
2320
}

server/tsconfig.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
"sourceMap": true,
1212
"strict": true,
1313
"composite": true,
14-
"baseUrl": ".",
15-
"paths": {
16-
"@schemas/*": ["../workflow-languages/schemas/*"]
17-
}
14+
"baseUrl": "."
1815
},
1916
"references": [
2017
{

server/vitest.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import path from "path";
21
import yaml from "@modyfi/vite-plugin-yaml";
2+
import path from "path";
33
import swc from "unplugin-swc";
44
import { defineConfig } from "vitest/config";
55

@@ -25,7 +25,6 @@ export default defineConfig({
2525
],
2626
resolve: {
2727
alias: {
28-
"@schemas": path.resolve(__dirname, "../workflow-languages/schemas"),
2928
"@gxwf/server-common/src": path.resolve(__dirname, "packages/server-common/src"),
3029
"@gxwf/server-common/tests": path.resolve(__dirname, "packages/server-common/tests"),
3130
"@gxwf/workflow-tests-language-service/src": path.resolve(

tsconfig.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
"esModuleInterop": true,
1111
"sourceMap": true,
1212
"strict": true,
13-
"composite": true,
14-
"paths": {
15-
"@schemas/*": ["./workflow-languages/schemas/*"]
16-
}
13+
"composite": true
1714
},
1815
"exclude": []
1916
}

0 commit comments

Comments
 (0)