cleanup

cli/ink-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/ink-components",
-  "version": "0.0.14",
+  "version": "0.0.17",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "git@github.com:prisma/prisma2.git",

cli/introspection/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/introspection",
-  "version": "0.0.115",
+  "version": "0.0.117",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
@@ -9,8 +9,8 @@
   "devDependencies": {
     "@prisma/cli": "workspace:0.1.29",
     "@prisma/generator-helper": "workspace:0.0.22",
-    "@prisma/lift": "workspace:0.3.100",
-    "@prisma/sdk": "workspace:0.0.40",
+    "@prisma/lift": "workspace:0.3.102",
+    "@prisma/sdk": "workspace:0.0.42",
     "@types/debug": "4.1.5",
     "@types/dotenv": "^8.2.0",
     "@types/figures": "^3.0.1",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@prisma/fetch-engine": "workspace:0.3.11",
-    "@prisma/ink-components": "workspace:0.0.14",
+    "@prisma/ink-components": "workspace:0.0.16",
     "chalk": "^3.0.0",
     "execa": "3.3.0",
     "figures": "^3.1.0",

cli/prisma2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma2",
-  "version": "2.0.0-alpha.318",
+  "version": "2.0.0-alpha.325",
   "main": "build/index.js",
   "repository": "git@github.com:prisma/prisma2-cli.git",
   "author": "Tim Suchanek <suchanek@prisma.io>",
@@ -21,10 +21,11 @@
     "@prisma/cli": "workspace:0.1.29",
     "@prisma/fetch-engine": "workspace:0.3.11",
     "@prisma/generator-helper": "workspace:0.0.22",
-    "@prisma/introspection": "workspace:0.0.114",
-    "@prisma/lift": "workspace:0.3.99",
-    "@prisma/photon": "workspace:2.0.0-alpha.320",
-    "@prisma/sdk": "workspace:0.0.39",
+    "@prisma/introspection": "workspace:0.0.117",
+    "@prisma/lift": "workspace:0.3.102",
+    "@prisma/photon": "workspace:2.0.0-alpha.323",
+    "@prisma/sdk": "workspace:0.0.42",
+    "@prisma/studio": "^0.147.0",
     "@prisma/studio-transports": "^0.146.0",
     "@sentry/node": "^5.9.0",
     "@types/debug": "^4.1.5",
@@ -36,6 +37,7 @@
     "mz": "2.7.0",
     "open": "^7.0.0",
     "pkg-up": "3.1.0",
+    "prisma-datamodel": "1.36.0-test.2",
     "prisma-db-introspection": "1.36.0-test.2",
     "prisma-test-utils": "^0.2.5",
     "resolve-pkg": "^2.0.0",
@@ -58,8 +60,5 @@
     "ncc:download": "ncc build scripts/download.js -o download-build",
     "build": "pnpm run tsc && pnpm run ncc:download && rm -rf build && pnpm run ncc && sed -i.bak 's/env ts-node/env node/g' 'build/index.js' && rm -f build/index.js.bak && scripts/copy-runtime.sh",
     "prepublishOnly": "pnpm run download && pnpm run ncc:download && pnpm run install && pnpm run test && pnpm run build"
-  },
-  "resolutions": {
-    "prisma-datamodel": "1.36.0-alpha.8"
   }
 }

cli/prisma2/scripts/copy-runtime.sh

@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 
+set -ex
+
 mkdir -p runtime
 mkdir -p nexus_prisma_ncc_build
 mkdir -p prisma-test-utils_ncc
 mkdir -p build/photon-generator
 
 
-cp -R "$(./scripts/resolve.js @prisma/photon)/runtime"/* build/runtime
-cp -R "$(./scripts/resolve.js @prisma/photon)/generator-build"/* build/photon-generator
+# cp -R "$(./scripts/resolve.js @prisma/photon)/runtime"/* build/runtime
+# cp -R "$(./scripts/resolve.js @prisma/photon)/generator-build"/* build/photon-generator
 
 
 rm -rf runtime/prisma

cli/prisma2/scripts/resolve.js

@@ -1,4 +1,13 @@
 #!/usr/bin/env node
 
+const path = require('path')
 const resolvePkg = require('resolve-pkg')
-console.log(resolvePkg(process.argv[2], { cwd: __dirname }))
+
+function resolve(pkg) {
+  const resolvedPath = resolvePkg(pkg, { cwd: __dirname })
+  if (resolvedPath) {
+    return resolvedPath
+  }
+}
+
+console.log(resolve(process.argv[2]))

cli/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/sdk",
-  "version": "0.0.40",
+  "version": "0.0.42",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "git@github.com:prisma/prisma2.git",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@apexearth/copy": "^1.4.4",
-    "@prisma/engine-core": "workspace:2.0.10",
+    "@prisma/engine-core": "workspace:2.0.11",
     "@prisma/fetch-engine": "workspace:0.3.11",
     "@prisma/generator-helper": "workspace:0.0.22",
     "@prisma/get-platform": "workspace:0.1.9",

pnpm-debug.log

@@ -0,0 +1,17 @@
+{
+  "0 debug pnpm:scope": {
+    "selected": 1,
+    "workspacePrefix": "/Users/tim/code/p2"
+  },
+  "1 error pnpm": {
+    "message": {
+      "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND"
+    },
+    "err": {
+      "name": "Error",
+      "message": "No package.json (or package.yaml, or package.json5) was found in \"/Users/tim/code/p2/prisma2\".",
+      "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND",
+      "stack": "Error: No package.json (or package.yaml, or package.json5) was found in \"/Users/tim/code/p2/prisma2\".\n    at Object.readImporterManifest [as default] (/usr/local/lib/node_modules/pnpm/lib/node_modules/@pnpm/read-importer-manifest/lib/index.js:20:11)\n    at async Object.readImporterManifest [as default] (/usr/local/lib/node_modules/pnpm/lib/readImporterManifest.js:6:59)\n    at async fakeRegularManifest (/usr/local/lib/node_modules/pnpm/lib/cmd/publish.js:72:59)\n    at async Object.default_1 [as publish] (/usr/local/lib/node_modules/pnpm/lib/cmd/publish.js:21:5)"
+    }
+  }
+}