fixes

zenstackhq · Dec 14, 2023 · 9dcce60 · 9dcce60
1 parent 33dcefd
commit 9dcce60
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 11 deletions.
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -26,7 +26,6 @@
     "author": "",
     "license": "MIT",
     "dependencies": {
-        "@zenstackhq/openapi": "workspace:*",
         "@zenstackhq/runtime": "workspace:*",
         "change-case": "^4.1.2",
         "lower-case-first": "^2.0.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/tests/frameworks/nextjs/generation.test.ts b/tests/integration/tests/frameworks/nextjs/generation.test.ts
@@ -14,6 +14,16 @@ describe('SWR Hooks Generation Tests', () => {
         process.chdir(origDir);
     });
 
+    // deps
+    const ver = require('../../../../../package.json').version;
+    const depPkgs = [
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-language-' + ver + '.tgz')}`,
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-sdk-' + ver + '.tgz')}`,
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-runtime-' + ver + '.tgz')}`,
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-swr-' + ver + '.tgz')}`,
+    ];
+    const deps = depPkgs.join(' ');
+
     it('sqlite', async () => {
         const testDir = path.join(__dirname, './test-run/sqlite');
         if (fs.existsSync(testDir)) {
@@ -25,6 +35,7 @@ describe('SWR Hooks Generation Tests', () => {
         process.chdir(testDir);
         const nodePath = path.join(testDir, 'node_modules');
         run('npm install');
+        run('npm install ' + deps);
         run('npx zenstack generate --schema ./sqlite.zmodel', { NODE_PATH: nodePath });
         run('npm run build', { NODE_PATH: nodePath });
     });
@@ -40,6 +51,7 @@ describe('SWR Hooks Generation Tests', () => {
         process.chdir(testDir);
         const nodePath = path.join(testDir, 'node_modules');
         run('npm install');
+        run('npm install ' + deps);
         run('npx zenstack generate --schema ./postgres.zmodel', { NODE_PATH: nodePath });
         run('npm run build', { NODE_PATH: nodePath });
     });

diff --git a/tests/integration/tests/frameworks/nextjs/test-project/package.json b/tests/integration/tests/frameworks/nextjs/test-project/package.json
@@ -13,8 +13,6 @@
     "@types/node": "18.11.18",
     "@types/react": "18.0.27",
     "@types/react-dom": "18.0.10",
-    "@zenstackhq/runtime": "../../../../../../../packages/runtime/dist",
-    "@zenstackhq/swr": "../../../../../../../packages/plugins/swr/dist",
     "next": "13.1.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",

diff --git a/tests/integration/tests/frameworks/trpc/generation.test.ts b/tests/integration/tests/frameworks/trpc/generation.test.ts
@@ -14,6 +14,16 @@ describe('tRPC Routers Generation Tests', () => {
         process.chdir(origDir);
     });
 
+    // deps
+    const ver = require('../../../../../package.json').version;
+    const depPkgs = [
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-language-' + ver + '.tgz')}`,
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-sdk-' + ver + '.tgz')}`,
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-runtime-' + ver + '.tgz')}`,
+        `${path.join(__dirname, '../../../../../.build/zenstackhq-trpc-' + ver + '.tgz')}`,
+    ];
+    const deps = depPkgs.join(' ');
+
     it('basic', async () => {
         const testDir = path.join(__dirname, './test-run/basic');
         if (fs.existsSync(testDir)) {
@@ -24,6 +34,7 @@ describe('tRPC Routers Generation Tests', () => {
 
         process.chdir(testDir);
         run('npm install');
+        run('npm install ' + deps);
         run('npx zenstack generate --no-dependency-check --schema ./todo.zmodel', { NODE_PATH: 'node_modules' });
         run('npm run build', { NODE_PATH: 'node_modules' });
     });

diff --git a/tests/integration/tests/frameworks/trpc/test-project/package.json b/tests/integration/tests/frameworks/trpc/test-project/package.json
@@ -23,12 +23,9 @@
     "react-dom": "18.2.0",
     "superjson": "^1.12.2",
     "typescript": "4.9.4",
-    "zod": "^3.22.4",
-    "@zenstackhq/runtime": "../../../../../../../packages/runtime/dist"
+    "zod": "^3.22.4"
   },
   "devDependencies": {
-    "prisma": "^4.8.0",
-    "zenstack": "../../../../../../../packages/schema/dist",
-    "@zenstackhq/trpc": "../../../../../../../packages/plugins/trpc/dist"
+    "prisma": "^4.8.0"
   }
 }