cleanup

prisma · Jul 15, 2019 · 1fd0a76 · 1fd0a76
1 parent 91c2237
commit 1fd0a76
Show file tree

Hide file tree

Showing 81 changed files with 32 additions and 31 deletions.
diff --git a/.buildkite/docker-compose.yml b/.buildkite/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   app:
     image: node:10
     volumes:
-      - ../:/app
+      - ../cli:/app
     working_dir: /app
     command: /app/scripts/test.sh
     environment:

diff --git a/ARCHITECTURE.md → cli/ARCHITECTURE.md b/ARCHITECTURE.md → cli/ARCHITECTURE.md
diff --git a/cli/.gitignore → cli/cli/.gitignore b/cli/.gitignore → cli/cli/.gitignore
diff --git a/cli/README.md → cli/cli/README.md b/cli/README.md → cli/cli/README.md
diff --git a/cli/cli/package.json b/cli/cli/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@prisma/cli",
+  "version": "0.0.25",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "repository": "git@github.com:prisma/prisma.git",
+  "author": "Tim Suchanek <suchanek@prisma.io>",
+  "license": "Apache-2.0",
+  "private": false,
+  "dependencies": {
+    "arg": "^4.1.0",
+    "chalk": "^2.4.2",
+    "strip-indent": "^3.0.0"
+  },
+  "scripts": {
+    "build": "tsc -d",
+    "prepublishOnly": "yarn build"
+  },
+  "files": [
+    "dist"
+  ],
+  "devDependencies": {
+    "@types/node": "^12.0.10",
+    "typescript": "^3.5.1"
+  }
+}
diff --git a/cli/src/Env.ts → cli/cli/src/Env.ts b/cli/src/Env.ts → cli/cli/src/Env.ts
diff --git a/cli/src/Help.ts → cli/cli/src/Help.ts b/cli/src/Help.ts → cli/cli/src/Help.ts
diff --git a/cli/src/getCwd.ts → cli/cli/src/getCwd.ts b/cli/src/getCwd.ts → cli/cli/src/getCwd.ts
diff --git a/cli/src/index.ts → cli/cli/src/index.ts b/cli/src/index.ts → cli/cli/src/index.ts
diff --git a/cli/src/types.ts → cli/cli/src/types.ts b/cli/src/types.ts → cli/cli/src/types.ts
diff --git a/cli/src/utils.ts → cli/cli/src/utils.ts b/cli/src/utils.ts → cli/cli/src/utils.ts
diff --git a/cli/tsconfig.json → cli/cli/tsconfig.json b/cli/tsconfig.json → cli/cli/tsconfig.json
diff --git a/cli/yarn.lock → cli/cli/yarn.lock b/cli/yarn.lock → cli/cli/yarn.lock
diff --git a/introspection/.gitignore → cli/introspection/.gitignore b/introspection/.gitignore → cli/introspection/.gitignore
diff --git a/introspection/.prettierrc.yml → cli/introspection/.prettierrc.yml b/introspection/.prettierrc.yml → cli/introspection/.prettierrc.yml
diff --git a/introspection/jest.config.js → cli/introspection/jest.config.js b/introspection/jest.config.js → cli/introspection/jest.config.js
diff --git a/introspection/package.json → cli/introspection/package.json b/introspection/package.json → cli/introspection/package.json
diff --git a/...apshots__/convertCredentials.test.ts.snap → ...apshots__/convertCredentials.test.ts.snap b/...apshots__/convertCredentials.test.ts.snap → ...apshots__/convertCredentials.test.ts.snap
diff --git a/.../src/__tests__/convertCredentials.test.ts → .../src/__tests__/convertCredentials.test.ts b/.../src/__tests__/convertCredentials.test.ts → .../src/__tests__/convertCredentials.test.ts
diff --git a/introspection/src/bin.ts → cli/introspection/src/bin.ts b/introspection/src/bin.ts → cli/introspection/src/bin.ts
diff --git a/introspection/src/colors.ts → cli/introspection/src/colors.ts b/introspection/src/colors.ts → cli/introspection/src/colors.ts
diff --git a/introspection/src/commands/Init.ts → cli/introspection/src/commands/Init.ts b/introspection/src/commands/Init.ts → cli/introspection/src/commands/Init.ts
diff --git a/introspection/src/commands/Introspect.ts → cli/introspection/src/commands/Introspect.ts b/introspection/src/commands/Introspect.ts → cli/introspection/src/commands/Introspect.ts
diff --git a/introspection/src/convertCredentials.ts → cli/introspection/src/convertCredentials.ts b/introspection/src/convertCredentials.ts → cli/introspection/src/convertCredentials.ts
diff --git a/introspection/src/index.ts → cli/introspection/src/index.ts b/introspection/src/index.ts → cli/introspection/src/index.ts
diff --git a/introspection/src/introspect/util.ts → cli/introspection/src/introspect/util.ts b/introspection/src/introspect/util.ts → cli/introspection/src/introspect/util.ts
diff --git a/introspection/src/loader.ts → cli/introspection/src/loader.ts b/introspection/src/loader.ts → cli/introspection/src/loader.ts
diff --git a/introspection/src/prompt-lib/BoxPrompt.tsx → ...ntrospection/src/prompt-lib/BoxPrompt.tsx b/introspection/src/prompt-lib/BoxPrompt.tsx → ...ntrospection/src/prompt-lib/BoxPrompt.tsx
diff --git a/introspection/src/prompt-lib/Checkbox.tsx → ...introspection/src/prompt-lib/Checkbox.tsx b/introspection/src/prompt-lib/Checkbox.tsx → ...introspection/src/prompt-lib/Checkbox.tsx
diff --git a/introspection/src/prompt-lib/Divider.tsx → cli/introspection/src/prompt-lib/Divider.tsx b/introspection/src/prompt-lib/Divider.tsx → cli/introspection/src/prompt-lib/Divider.tsx
diff --git a/...ospection/src/prompt-lib/InkTextInput.tsx → ...ospection/src/prompt-lib/InkTextInput.tsx b/...ospection/src/prompt-lib/InkTextInput.tsx → ...ospection/src/prompt-lib/InkTextInput.tsx
diff --git a/introspection/src/prompt-lib/RadioButton.tsx → ...rospection/src/prompt-lib/RadioButton.tsx b/introspection/src/prompt-lib/RadioButton.tsx → ...rospection/src/prompt-lib/RadioButton.tsx
diff --git a/introspection/src/prompt-lib/SelectItem.tsx → ...trospection/src/prompt-lib/SelectItem.tsx b/introspection/src/prompt-lib/SelectItem.tsx → ...trospection/src/prompt-lib/SelectItem.tsx
diff --git a/introspection/src/prompt-lib/Spinner.tsx → cli/introspection/src/prompt-lib/Spinner.tsx b/introspection/src/prompt-lib/Spinner.tsx → cli/introspection/src/prompt-lib/Spinner.tsx
diff --git a/introspection/src/prompt-lib/TextInput.tsx → ...ntrospection/src/prompt-lib/TextInput.tsx b/introspection/src/prompt-lib/TextInput.tsx → ...ntrospection/src/prompt-lib/TextInput.tsx
diff --git a/introspection/src/prompt-lib/helpers.ts → cli/introspection/src/prompt-lib/helpers.ts b/introspection/src/prompt-lib/helpers.ts → cli/introspection/src/prompt-lib/helpers.ts
diff --git a/introspection/src/prompt-lib/types.ts → cli/introspection/src/prompt-lib/types.ts b/introspection/src/prompt-lib/types.ts → cli/introspection/src/prompt-lib/types.ts
diff --git a/introspection/src/prompt-lib/useStdin.ts → cli/introspection/src/prompt-lib/useStdin.ts b/introspection/src/prompt-lib/useStdin.ts → cli/introspection/src/prompt-lib/useStdin.ts
diff --git a/...spection/src/prompt/InteractivePrompt.tsx → ...spection/src/prompt/InteractivePrompt.tsx b/...spection/src/prompt/InteractivePrompt.tsx → ...spection/src/prompt/InteractivePrompt.tsx
diff --git a/introspection/src/prompt/index.tsx → cli/introspection/src/prompt/index.tsx b/introspection/src/prompt/index.tsx → cli/introspection/src/prompt/index.tsx
diff --git a/introspection/src/prompt/prompts-elements.ts → ...rospection/src/prompt/prompts-elements.ts b/introspection/src/prompt/prompts-elements.ts → ...rospection/src/prompt/prompts-elements.ts
diff --git a/introspection/src/prompt/reducer.ts → cli/introspection/src/prompt/reducer.ts b/introspection/src/prompt/reducer.ts → cli/introspection/src/prompt/reducer.ts
diff --git a/introspection/src/prompt/steps-definition.ts → ...rospection/src/prompt/steps-definition.ts b/introspection/src/prompt/steps-definition.ts → ...rospection/src/prompt/steps-definition.ts
diff --git a/...c/prompt/steps/1-select-database-type.tsx → ...c/prompt/steps/1-select-database-type.tsx b/...c/prompt/steps/1-select-database-type.tsx → ...c/prompt/steps/1-select-database-type.tsx
diff --git a/.../src/prompt/steps/2-input-credentials.tsx → .../src/prompt/steps/2-input-credentials.tsx b/.../src/prompt/steps/2-input-credentials.tsx → .../src/prompt/steps/2-input-credentials.tsx
diff --git a/...prompt/steps/3-select-database-schema.tsx → ...prompt/steps/3-select-database-schema.tsx b/...prompt/steps/3-select-database-schema.tsx → ...prompt/steps/3-select-database-schema.tsx
diff --git a/...ection/src/prompt/steps/4-select-tool.tsx → ...ection/src/prompt/steps/4-select-tool.tsx b/...ection/src/prompt/steps/4-select-tool.tsx → ...ection/src/prompt/steps/4-select-tool.tsx
diff --git a/...on/src/prompt/steps/5-select-language.tsx → ...on/src/prompt/steps/5-select-language.tsx b/...on/src/prompt/steps/5-select-language.tsx → ...on/src/prompt/steps/5-select-language.tsx
diff --git a/...on/src/prompt/steps/6-select-template.tsx → ...on/src/prompt/steps/6-select-template.tsx b/...on/src/prompt/steps/6-select-template.tsx → ...on/src/prompt/steps/6-select-template.tsx
diff --git a/introspection/src/prompt/steps/index.ts → cli/introspection/src/prompt/steps/index.ts b/introspection/src/prompt/steps/index.ts → cli/introspection/src/prompt/steps/index.ts
diff --git a/introspection/src/templates.ts → cli/introspection/src/templates.ts b/introspection/src/templates.ts → cli/introspection/src/templates.ts
diff --git a/introspection/src/types.ts → cli/introspection/src/types.ts b/introspection/src/types.ts → cli/introspection/src/types.ts
diff --git a/introspection/tsconfig.json → cli/introspection/tsconfig.json b/introspection/tsconfig.json → cli/introspection/tsconfig.json
diff --git a/introspection/yarn.lock → cli/introspection/yarn.lock b/introspection/yarn.lock → cli/introspection/yarn.lock
diff --git a/cli/package.json b/cli/package.json
@@ -1,26 +1,7 @@
 {
-  "name": "@prisma/cli",
-  "version": "0.0.25",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "repository": "git@github.com:prisma/prisma.git",
-  "author": "Tim Suchanek <suchanek@prisma.io>",
-  "license": "Apache-2.0",
-  "private": false,
-  "dependencies": {
-    "arg": "^4.1.0",
-    "chalk": "^2.4.2",
-    "strip-indent": "^3.0.0"
-  },
-  "scripts": {
-    "build": "tsc -d",
-    "prepublishOnly": "yarn build"
-  },
-  "files": [
-    "dist"
-  ],
-  "devDependencies": {
-    "@types/node": "^12.0.10",
-    "typescript": "^3.5.1"
-  }
+  "workspaces": [
+    "cli",
+    "introspection",
+    "prisma2"
+  ]
 }
diff --git a/prisma2/.gitignore → cli/prisma2/.gitignore b/prisma2/.gitignore → cli/prisma2/.gitignore
diff --git a/prisma2/.npmignore → cli/prisma2/.npmignore b/prisma2/.npmignore → cli/prisma2/.npmignore
diff --git a/prisma2/.prettierrc.yml → cli/prisma2/.prettierrc.yml b/prisma2/.prettierrc.yml → cli/prisma2/.prettierrc.yml
diff --git a/prisma2/README.md → cli/prisma2/README.md b/prisma2/README.md → cli/prisma2/README.md
diff --git a/prisma2/package.json → cli/prisma2/package.json b/prisma2/package.json → cli/prisma2/package.json
diff --git a/prisma2/scripts/bump-version.js → cli/prisma2/scripts/bump-version.js b/prisma2/scripts/bump-version.js → cli/prisma2/scripts/bump-version.js
diff --git a/prisma2/scripts/copy-runtime.sh → cli/prisma2/scripts/copy-runtime.sh b/prisma2/scripts/copy-runtime.sh → cli/prisma2/scripts/copy-runtime.sh
diff --git a/prisma2/scripts/download.js → cli/prisma2/scripts/download.js b/prisma2/scripts/download.js → cli/prisma2/scripts/download.js
diff --git a/prisma2/scripts/updateTag.js → cli/prisma2/scripts/updateTag.js b/prisma2/scripts/updateTag.js → cli/prisma2/scripts/updateTag.js
diff --git a/prisma2/src/CLI.ts → cli/prisma2/src/CLI.ts b/prisma2/src/CLI.ts → cli/prisma2/src/CLI.ts
diff --git a/prisma2/src/Generate.ts → cli/prisma2/src/Generate.ts b/prisma2/src/Generate.ts → cli/prisma2/src/Generate.ts
diff --git a/prisma2/src/Version.ts → cli/prisma2/src/Version.ts b/prisma2/src/Version.ts → cli/prisma2/src/Version.ts
diff --git a/prisma2/src/__tests__/integrate.test.ts → cli/prisma2/src/__tests__/integrate.test.ts b/prisma2/src/__tests__/integrate.test.ts → cli/prisma2/src/__tests__/integrate.test.ts
diff --git a/prisma2/src/bin.ts → cli/prisma2/src/bin.ts b/prisma2/src/bin.ts → cli/prisma2/src/bin.ts
diff --git a/prisma2/src/capture-worker.js → cli/prisma2/src/capture-worker.js b/prisma2/src/capture-worker.js → cli/prisma2/src/capture-worker.js
diff --git a/prisma2/src/capture.ts → cli/prisma2/src/capture.ts b/prisma2/src/capture.ts → cli/prisma2/src/capture.ts
diff --git a/prisma2/src/generators.ts → cli/prisma2/src/generators.ts b/prisma2/src/generators.ts → cli/prisma2/src/generators.ts
diff --git a/prisma2/src/getConfig.ts → cli/prisma2/src/getConfig.ts b/prisma2/src/getConfig.ts → cli/prisma2/src/getConfig.ts
diff --git a/prisma2/src/test-generatorWorker.ts → cli/prisma2/src/test-generatorWorker.ts b/prisma2/src/test-generatorWorker.ts → cli/prisma2/src/test-generatorWorker.ts
diff --git a/prisma2/src/utils/formatms.ts → cli/prisma2/src/utils/formatms.ts b/prisma2/src/utils/formatms.ts → cli/prisma2/src/utils/formatms.ts
diff --git a/prisma2/tsconfig.json → cli/prisma2/tsconfig.json b/prisma2/tsconfig.json → cli/prisma2/tsconfig.json
diff --git a/prisma2/yarn.lock → cli/prisma2/yarn.lock b/prisma2/yarn.lock → cli/prisma2/yarn.lock
diff --git a/scripts/entry.sh → cli/scripts/entry.sh b/scripts/entry.sh → cli/scripts/entry.sh
diff --git a/scripts/test.sh → cli/scripts/test.sh b/scripts/test.sh → cli/scripts/test.sh
diff --git a/introspection/README.md b/introspection/README.md
diff --git a/package.json b/package.json