Merge branch 'main' into mk/warn-out

kodiakhq[bot] · web-flow · commit 84e359c77568 · 2021-12-13T13:34:58.000Z
diff --git a/demos/default/netlify.toml b/demos/default/netlify.toml
@@ -1,7 +1,7 @@
 [build]
 command = "next build"
 publish = ".next"
-ignore = "echo CACHED_COMMIT_REF: $CACHED_COMMIT_REF COMMIT_REF: $COMMIT_REF && git diff --exit-code $CACHED_COMMIT_REF $COMMIT_REF ../../"
+ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../../"
 
 [build.environment]
 # cache Cypress binary in local "node_modules" folder
diff --git a/demos/nx-next-monorepo-demo/netlify.toml b/demos/nx-next-monorepo-demo/netlify.toml
@@ -1,7 +1,7 @@
 [build]
 command = "npm run build"
 publish = "dist/apps/demo-monorepo/.next"
-ignore = "git diff --exit-code $CACHED_COMMIT_REF $COMMIT_REF ../../"
+ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../../"
 
 [dev]
 command = "npm run start"
diff --git a/demos/nx-next-monorepo-demo/package-lock.json b/demos/nx-next-monorepo-demo/package-lock.json
diff --git a/demos/nx-next-monorepo-demo/package.json b/demos/nx-next-monorepo-demo/package.json
@@ -48,7 +48,7 @@
     "eslint-plugin-react-hooks": "4.3.0",
     "jest": "27.4.3",
     "prettier": "^2.3.1",
-    "ts-jest": "27.1.0",
+    "ts-jest": "27.1.1",
     "typescript": "~4.5.0",
     "workbox-webpack-plugin": "^6.4.1"
   }
diff --git a/demos/static-root/netlify.toml b/demos/static-root/netlify.toml
@@ -1,7 +1,7 @@
 [build]
 command = "next build"
 publish = ".next"
-ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../../"
+ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../../"
 
 [build.environment]
 # cache Cypress binary in local "node_modules" folder
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`"eslint-plugin-react-hooks": "4.3.0",`
`49`	`49`	`"jest": "27.4.3",`
`50`	`50`	`"prettier": "^2.3.1",`
`51`		`- "ts-jest": "27.1.0",`
	`51`	`+ "ts-jest": "27.1.1",`
`52`	`52`	`"typescript": "~4.5.0",`
`53`	`53`	`"workbox-webpack-plugin": "^6.4.1"`
`54`	`54`	`}`