fix(deps): update dependency chalk to v4 (#2622)

Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Joël <joel.galeran@gmail.com>
prisma · Jul 14, 2020 · e9cfafb · e9cfafb
1 parent 4f0e12c
commit e9cfafb
Show file tree

Hide file tree

Showing 17 changed files with 99 additions and 394 deletions.
diff --git a/src/packages/cli/__snapshots__/integrate.postgresql.test.ts.js b/src/packages/cli/__snapshots__/integrate.postgresql.test.ts.js
diff --git a/src/packages/cli/src/__tests__/integrate.postgresql.test.ts b/src/packages/cli/src/__tests__/integrate.postgresql.test.ts
@@ -25,6 +25,8 @@ const latestDevPromise = getLatestTag()
 
 before((done) => {
   db.connect((err) => done(err))
+  db.query('drop schema public cascade;')
+  db.query('create schema public;')
 })
 
 beforeEach(async () => {

diff --git a/src/packages/client/src/__tests__/runtime-tests/__snapshots__/runtime.test.ts.snap b/src/packages/client/src/__tests__/runtime-tests/__snapshots__/runtime.test.ts.snap
@@ -4,6 +4,8 @@ exports[`runtime aggregations: aggregations example should succeed 1`] = `"succe
 
 exports[`runtime blog: blog example should succeed 1`] = `"success"`;
 
+exports[`runtime blog-dot-env: blog-dot-env example should succeed 1`] = `"success"`;
+
 exports[`runtime blog-env: blog-env example should not succeed 1`] = `
 "error: Environment variable not found: SQLITE_URL.
   -->  schema.prisma:3

diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/.env b/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/.env
@@ -0,0 +1 @@
+SQLITE_URL_FROM_DOT_ENV_FILE="file:dev.db"
diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/.gitignore b/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/.gitignore
@@ -0,0 +1,2 @@
+!dev.db
+!.env
diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/dev.db b/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/dev.db
diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/index.js b/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/index.js
@@ -0,0 +1,15 @@
+const {
+  PrismaClient,
+  PrismaClientInitializationError,
+} = require('@prisma/client')
+
+module.exports = async () => {
+  const prisma = new PrismaClient({
+    errorFormat: 'colorless',
+  })
+  try {
+    await prisma.connect()
+  } catch (e) {
+    throw e
+  }
+}
diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/manifest.json b/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/manifest.json
@@ -0,0 +1,3 @@
+{
+  "shouldSucceed": true
+}
diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/schema.prisma b/src/packages/client/src/__tests__/runtime-tests/blog-dot-env/schema.prisma
@@ -0,0 +1,29 @@
+datasource db {
+  provider = "sqlite"
+  url      = env("SQLITE_URL_FROM_DOT_ENV_FILE")
+  default  = true
+}
+
+generator client {
+  provider = "prisma-client-js"
+}
+
+/// User model comment
+model User {
+  id    String  @default(uuid()) @id
+  email String  @unique
+  /// name comment
+  name  String?
+  posts Post[]
+}
+
+model Post {
+  id        String   @default(cuid()) @id
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  published Boolean
+  title     String
+  content   String?
+  authorId  String?
+  author    User? @relation(fields: [authorId])
+}
diff --git a/src/packages/engine-core/package.json b/src/packages/engine-core/package.json
@@ -37,7 +37,7 @@
     "@prisma/generator-helper": "workspace:*",
     "@prisma/get-platform": "workspace:*",
     "bent": "^7.1.2",
-    "chalk": "^3.0.0",
+    "chalk": "^4.0.0",
     "cross-fetch": "^3.0.4",
     "execa": "^4.0.2",
     "fast-json-stringify": "^2.0.0",

diff --git a/src/packages/generator-helper/package.json b/src/packages/generator-helper/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@prisma/debug": "workspace:*",
     "@types/cross-spawn": "^6.0.1",
-    "chalk": "^3.0.0",
+    "chalk": "^4.0.0",
     "cross-spawn": "^7.0.2"
   },
   "scripts": {

diff --git a/src/packages/ink-components/package.json b/src/packages/ink-components/package.json
@@ -8,7 +8,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@prisma/debug": "workspace:*",
-    "chalk": "^3.0.0",
+    "chalk": "^4.0.0",
     "cli-truncate": "2.1.0",
     "figures": "^3.2.0",
     "ink-spinner": "^3.0.1",

diff --git a/src/packages/introspection/package.json b/src/packages/introspection/package.json
@@ -36,7 +36,7 @@
     "@prisma/sdk": "*"
   },
   "dependencies": {
-    "chalk": "^3.0.0",
+    "chalk": "^4.0.0",
     "execa": "^4.0.0",
     "make-dir": "^3.0.2",
     "strip-ansi": "^6.0.0"

diff --git a/src/packages/migrate/fixtures/blog/package.json b/src/packages/migrate/fixtures/blog/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "devDependencies": {},
   "dependencies": {
-    "chalk": "^2.4.2",
+    "chalk": "^4.0.0",
     "ts-node": "^8.3.0"
   }
 }
diff --git a/src/packages/migrate/fixtures/blog/yarn.lock b/src/packages/migrate/fixtures/blog/yarn.lock
@@ -2,12 +2,18 @@
 # yarn lockfile v1
 
 
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
   dependencies:
-    color-convert "^1.9.0"
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
 
 arg@^4.1.0:
   version "4.1.0"
@@ -19,41 +25,35 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+chalk@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
   dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
-    color-name "1.1.3"
+    color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 diff@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
   integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
 
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 make-error@^1.1.1:
   version "1.3.5"
@@ -73,12 +73,12 @@ source-map@^0.6.0:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
 ts-node@^8.3.0:
   version "8.3.0"

diff --git a/src/packages/migrate/package.json b/src/packages/migrate/package.json
@@ -25,6 +25,7 @@
     "@typescript-eslint/parser": "2.34.0",
     "@zeit/ncc": "0.22.3",
     "better-sqlite3": "^7.1.0",
+    "chalk": "4.1.0",
     "del": "5.1.0",
     "eslint": "6.8.0",
     "eslint-config-prettier": "6.11.0",
@@ -84,10 +85,10 @@
     "install": "node scripts/download.js",
     "download": "node scripts/download.js",
     "run": "node dist/bin.js",
-    "precommit": "lint-staged && jest",
+    "precommit": "lint-staged && FORCE_COLOR=0 jest",
     "format": "prettier --write .",
     "lint": "eslint --fix --ext .js,.ts .",
-    "test": "jest",
+    "test": "FORCE_COLOR=0 jest",
     "build": "tsc -d && cp src/GeneratorWorker.js dist/GeneratorWorker.js",
     "ncc": "ncc build dist/index.js -o build",
     "ncc:req": "ncc build fixtures/req.js -o build",

diff --git a/src/packages/sdk/package.json b/src/packages/sdk/package.json
@@ -50,7 +50,7 @@
     "@prisma/get-platform": "workspace:*",
     "archiver": "^4.0.0",
     "arg": "^4.1.3",
-    "chalk": "3.0.0",
+    "chalk": "4.1.0",
     "checkpoint-client": "1.1.2",
     "cli-truncate": "^2.1.0",
     "execa": "^4.0.0",