Update references that broke due to reorg

edgedb · Jul 11, 2023 · da6e8dc · da6e8dc
1 parent b241fb4
commit da6e8dc
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 28 deletions.
diff --git a/integration-tests/legacy/package.json b/integration-tests/legacy/package.json
@@ -3,7 +3,7 @@
   "name": "@edgedb/integration-legacy",
   "version": "0.0.0",
   "scripts": {
-    "generate": "../generate/dist/cli.js",
+    "generate": "../../packages/generate/dist/cli.js",
     "build": "echo 'Integration tests, no build output...'",
     "test": "NODE_OPTIONS=\"--experimental-vm-modules\" yarn generate edgeql-js && yarn generate queries --file && yarn generate interfaces && jest --detectOpenHandles --forceExit --passWithNoTests",
     "test:ci": "tsx ./testRunner.ts"

diff --git a/integration-tests/legacy/testRunner.ts b/integration-tests/legacy/testRunner.ts
@@ -1,4 +1,4 @@
-import createClient from "../driver/src/index.node";
+import createClient from "../../packages/driver/src/index.node";
 
 import {
   shutdown,
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../driver/test/testUtil";
+} from "../../packages/driver/test/testUtil";
 
 (async function main() {
   console.log("\nStarting EdgeDB test cluster...");

diff --git a/integration-tests/lts/cardinality.test.ts b/integration-tests/lts/cardinality.test.ts
@@ -1,5 +1,5 @@
 import type { $ } from "edgedb";
-import type { cardutil } from "../generate/src/syntax/cardinality";
+import type { cardutil } from "../../packages/generate/src/syntax/cardinality";
 import { tc } from "./setupTeardown";
 
 describe("cardinality", () => {

diff --git a/integration-tests/lts/collections.test.ts b/integration-tests/lts/collections.test.ts
@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import type { Client } from "edgedb";
-import * as $ from "../generate/src/syntax/reflection";
+import * as $ from "../../packages/generate/src/syntax/reflection";
 import e, { type $infer, objectTypeToTupleType } from "./dbschema/edgeql-js";
 import type { sys } from "./dbschema/interfaces";
 

diff --git a/integration-tests/lts/deno/deno.json b/integration-tests/lts/deno/deno.json
@@ -17,8 +17,8 @@
   "importMap": "./import_map.json",
   "tasks": {
     "play": "deno run --unstable --allow-net --allow-read --allow-env --unsafely-ignore-certificate-errors=localhost test.ts",
-    "edgeql-js": "deno run -A --unstable --unsafely-ignore-certificate-errors=localhost ../../deno/generate.ts edgeql-js --output-dir edgeql-js --target deno",
-    "queries": "deno run -A --unstable --unsafely-ignore-certificate-errors=localhost ../../deno/generate.ts queries --target deno --file queries",
-    "interfaces": "deno run -A --unstable --unsafely-ignore-certificate-errors=localhost ../../deno/generate.ts interfaces --file ifaces"
+    "edgeql-js": "deno run -A --unstable --unsafely-ignore-certificate-errors=localhost ../../../packages/deno/generate.ts edgeql-js --output-dir edgeql-js --target deno",
+    "queries": "deno run -A --unstable --unsafely-ignore-certificate-errors=localhost ../../../packages/deno/generate.ts queries --target deno --file queries",
+    "interfaces": "deno run -A --unstable --unsafely-ignore-certificate-errors=localhost ../../../packages/deno/generate.ts interfaces --file ifaces"
   }
 }
diff --git a/integration-tests/lts/deno/import_map.json b/integration-tests/lts/deno/import_map.json
@@ -1,6 +1,6 @@
 {
   "imports": {
-    "edgedb": "../../deno/mod.ts",
-    "edgedb/": "../../deno/"
+    "edgedb": "../../../packages/deno/mod.ts",
+    "edgedb/": "../../../packages/deno/"
   }
 }
diff --git a/integration-tests/lts/functions.test.ts b/integration-tests/lts/functions.test.ts
@@ -1,8 +1,8 @@
 import assert from "node:assert/strict";
 import superjson from "superjson";
-import * as $ from "../generate/src/syntax/reflection";
+import * as $ from "../../packages/generate/src/syntax/reflection";
 import e from "./dbschema/edgeql-js";
-import type { $expr_Function } from "../generate/src/syntax/funcops";
+import type { $expr_Function } from "../../packages/generate/src/syntax/funcops";
 import { tc } from "./setupTeardown";
 import { number } from "./dbschema/edgeql-js/modules/std";
 

diff --git a/integration-tests/lts/objectTypes.test.ts b/integration-tests/lts/objectTypes.test.ts
@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
-import * as $ from "../generate/src/syntax/reflection";
-import type { PropertyDesc } from "../generate/src/syntax/typesystem";
+import * as $ from "../../packages/generate/src/syntax/reflection";
+import type { PropertyDesc } from "../../packages/generate/src/syntax/typesystem";
 import e from "./dbschema/edgeql-js";
 import type { $str } from "./dbschema/edgeql-js/modules/std";
 import { tc } from "./setupTeardown";

diff --git a/integration-tests/lts/operators.test.ts b/integration-tests/lts/operators.test.ts
@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
 import superjson from "superjson";
 import type { Client } from "edgedb";
 import e from "./dbschema/edgeql-js";
-import * as $ from "../generate/src/syntax/reflection";
+import * as $ from "../../packages/generate/src/syntax/reflection";
 
 import { setupTests, teardownTests } from "./setupTeardown";
 

diff --git a/integration-tests/lts/package.json b/integration-tests/lts/package.json
@@ -3,7 +3,7 @@
   "name": "@edgedb/integration-lts",
   "version": "0.0.0",
   "scripts": {
-    "generate": "../generate/dist/cli.js",
+    "generate": "../../packages/generate/dist/cli.js",
     "build": "echo 'Integration tests, no build output...'",
     "test": "yarn test:ts && yarn test:non_ts",
     "test:ts": "NODE_OPTIONS=\"--experimental-vm-modules\" pwd && yarn generate edgeql-js && yarn generate queries --file && yarn generate interfaces && jest --detectOpenHandles --forceExit",

diff --git a/integration-tests/lts/paths.test.ts b/integration-tests/lts/paths.test.ts
@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import * as $ from "../generate/src/syntax/reflection";
+import * as $ from "../../packages/generate/src/syntax/reflection";
 import e from "./dbschema/edgeql-js/index";
 import { $PathNode } from "./dbschema/edgeql-js/syntax";
 import { tc } from "./setupTeardown";

diff --git a/integration-tests/lts/select.test.ts b/integration-tests/lts/select.test.ts
@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import * as edgedb from "edgedb";
-import * as $ from "../generate/src/syntax/reflection";
+import * as $ from "../../packages/generate/src/syntax/reflection";
 
 import e, { type $infer } from "./dbschema/edgeql-js";
 import { setupTests, teardownTests, tc, type TestData } from "./setupTeardown";

diff --git a/integration-tests/lts/sets.test.ts b/integration-tests/lts/sets.test.ts
@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
 import { $, type Client } from "edgedb";
 import e, { type $infer } from "./dbschema/edgeql-js";
 import { setupTests, teardownTests, tc } from "./setupTeardown";
-import { TypeKind } from "../generate/src/syntax/reflection";
+import { TypeKind } from "../../packages/generate/src/syntax/reflection";
 
 describe("sets", () => {
   let client: Client;

diff --git a/integration-tests/lts/testRunner.ts b/integration-tests/lts/testRunner.ts
@@ -1,4 +1,4 @@
-import createClient from "../driver/src/index.node";
+import createClient from "../../packages/driver/src/index.node";
 
 import {
   shutdown,
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../driver/test/testUtil";
+} from "../../packages/driver/test/testUtil";
 
 (async function main() {
   console.log("\nStarting EdgeDB test cluster...");

diff --git a/integration-tests/lts/with.test.ts b/integration-tests/lts/with.test.ts
@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import type * as $ from "../generate/src/syntax/reflection";
+import type * as $ from "../../packages/generate/src/syntax/reflection";
 import e from "./dbschema/edgeql-js";
 import { tc } from "./setupTeardown";
 

diff --git a/integration-tests/nightly/package.json b/integration-tests/nightly/package.json
@@ -3,7 +3,7 @@
   "name": "@edgedb/integration-nightly",
   "version": "0.0.0",
   "scripts": {
-    "generate": "../generate/dist/cli.js",
+    "generate": "../../packages/generate/dist/cli.js",
     "build": "echo 'Integration tests, no build output...'",
     "test": "NODE_OPTIONS=\"--experimental-vm-modules\" yarn generate edgeql-js && yarn generate queries --file && yarn generate interfaces && jest --detectOpenHandles --forceExit --passWithNoTests",
     "test:ci": "tsx ./testRunner.ts"

diff --git a/integration-tests/nightly/testRunner.ts b/integration-tests/nightly/testRunner.ts
@@ -1,4 +1,4 @@
-import createClient from "../driver/src/index.node";
+import createClient from "../../packages/driver/src/index.node";
 
 import {
   shutdown,
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../driver/test/testUtil";
+} from "../../packages/driver/test/testUtil";
 
 (async function main() {
   console.log("\nStarting EdgeDB test cluster...");

diff --git a/integration-tests/stable/package.json b/integration-tests/stable/package.json
@@ -3,7 +3,7 @@
   "name": "@edgedb/integration-stable",
   "version": "0.0.0",
   "scripts": {
-    "generate": "../generate/dist/cli.js",
+    "generate": "../../packages/generate/dist/cli.js",
     "build": "echo 'Integration tests, no build output...'",
     "test": "NODE_OPTIONS=\"--experimental-vm-modules\" yarn generate edgeql-js && yarn generate queries --file && yarn generate interfaces && jest --detectOpenHandles --forceExit --passWithNoTests",
     "test:ci": "tsx ./testRunner.ts"

diff --git a/integration-tests/stable/testRunner.ts b/integration-tests/stable/testRunner.ts
@@ -1,4 +1,4 @@
-import createClient from "../driver/src/index.node";
+import createClient from "../../packages/driver/src/index.node";
 
 import {
   shutdown,
@@ -9,7 +9,7 @@ import {
   startServer,
   runCommand,
   configToEnv,
-} from "../driver/test/testUtil";
+} from "../../packages/driver/test/testUtil";
 
 (async function main() {
   console.log("\nStarting EdgeDB test cluster...");