Merge pull request dev-next-release - 1.22.1 (#1248)

angeloashmore · web-flow · commit 7de52f507021 · 2023-12-18T10:31:06.000-10:00
dev-next-release - 1.22.1
diff --git a/e2e-projects/next-upgrade/package.json b/e2e-projects/next-upgrade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-upgrade",
-  "version": "1.22.0",
+  "version": "1.22.1-dev-next-release.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/e2e-projects/next/package.json b/e2e-projects/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cimsirp",
-  "version": "1.22.0",
+  "version": "1.22.1-dev-next-release.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/e2e-projects/sveltekit/package.json b/e2e-projects/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sveltekit",
-	"version": "1.22.0",
+	"version": "1.22.1-dev-next-release.1",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
diff --git a/packages/adapter-next/package.json b/packages/adapter-next/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-next",
-	"version": "0.3.30",
+	"version": "0.3.31-dev-next-release.1",
 	"description": "Slice Machine adapter for Next.js.",
 	"keywords": [
 		"typescript",
@@ -61,7 +61,7 @@
 	"dependencies": {
 		"@prismicio/simulator": "^0.1.4",
 		"@prismicio/types-internal": "^2.2.0",
-		"@slicemachine/plugin-kit": "workspace:^",
+		"@slicemachine/plugin-kit": "workspace:*",
 		"common-tags": "^1.8.2",
 		"fp-ts": "^2.13.1",
 		"io-ts": "^2.2.20",
diff --git a/packages/adapter-nuxt/package.json b/packages/adapter-nuxt/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt",
-	"version": "0.3.30",
+	"version": "0.3.31-dev-next-release.1",
 	"description": "Slice Machine adapter for Nuxt 3.",
 	"keywords": [
 		"typescript",
@@ -61,7 +61,7 @@
 	"dependencies": {
 		"@prismicio/simulator": "^0.1.4",
 		"@prismicio/types-internal": "^2.2.0",
-		"@slicemachine/plugin-kit": "workspace:^",
+		"@slicemachine/plugin-kit": "workspace:*",
 		"common-tags": "^1.8.2",
 		"fp-ts": "^2.13.1",
 		"io-ts": "^2.2.20",
diff --git a/packages/adapter-nuxt2/package.json b/packages/adapter-nuxt2/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt2",
-	"version": "0.3.30",
+	"version": "0.3.31-dev-next-release.1",
 	"description": "Slice Machine adapter for Nuxt 2.",
 	"keywords": [
 		"typescript",
@@ -61,7 +61,7 @@
 	"dependencies": {
 		"@prismicio/simulator": "^0.1.4",
 		"@prismicio/types-internal": "^2.2.0",
-		"@slicemachine/plugin-kit": "workspace:^",
+		"@slicemachine/plugin-kit": "workspace:*",
 		"common-tags": "^1.8.2",
 		"fp-ts": "^2.13.1",
 		"io-ts": "^2.2.20",
diff --git a/packages/adapter-sveltekit/package.json b/packages/adapter-sveltekit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-sveltekit",
-	"version": "0.3.30",
+	"version": "0.3.31-dev-next-release.1",
 	"description": "Slice Machine adapter for SvelteKit.",
 	"keywords": [
 		"typescript",
@@ -64,7 +64,7 @@
 	"dependencies": {
 		"@prismicio/simulator": "^0.1.4",
 		"@prismicio/types-internal": "^2.2.0",
-		"@slicemachine/plugin-kit": "workspace:^",
+		"@slicemachine/plugin-kit": "workspace:*",
 		"common-tags": "^1.8.2",
 		"fp-ts": "^2.13.1",
 		"io-ts": "^2.2.20",
diff --git a/packages/init/package.json b/packages/init/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/init",
-	"version": "2.9.8",
+	"version": "2.9.9-dev-next-release.1",
 	"description": "Init Prismic Slice Machine in your project",
 	"keywords": [
 		"typescript",
@@ -54,7 +54,7 @@
 		"@antfu/ni": "^0.20.0",
 		"@lihbr/listr-update-renderer": "^0.5.3",
 		"@sentry/node": "^7.70.0",
-		"@slicemachine/manager": "workspace:^",
+		"@slicemachine/manager": "workspace:*",
 		"chalk": "^4.1.2",
 		"giget": "^1.1.2",
 		"globby": "^13.1.3",
diff --git a/packages/manager/package.json b/packages/manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/manager",
-	"version": "0.17.4",
+	"version": "0.17.5-dev-next-release.1",
 	"description": "Manage all aspects of a Slice Machine project.",
 	"repository": {
 		"type": "git",
@@ -69,7 +69,7 @@
 		"@prismicio/mocks": "2.0.0",
 		"@prismicio/types-internal": "^2.2.0",
 		"@segment/analytics-node": "1.1.3",
-		"@slicemachine/plugin-kit": "workspace:^",
+		"@slicemachine/plugin-kit": "workspace:*",
 		"@wooorm/starry-night": "^1.6.0",
 		"cookie": "^0.5.0",
 		"cors": "^2.8.5",
@@ -87,7 +87,7 @@
 		"node-fetch": "^3.3.1",
 		"p-limit": "^4.0.0",
 		"prettier": "^3.0.3",
-		"r19": "^0.1.8",
+		"r19": "0.1.8",
 		"rc9": "^2.0.1",
 		"rehype-stringify": "^9.0.3",
 		"remark-gfm": "^3.0.1",
diff --git a/packages/manager/src/managers/prismicRepository/PrismicRepositoryManager.ts b/packages/manager/src/managers/prismicRepository/PrismicRepositoryManager.ts
@@ -503,7 +503,7 @@ export class PrismicRepositoryManager extends BaseManager {
 						environments = environments.filter((environment) => {
 							if (environment.kind === "dev") {
 								return environment.users.some(
-									(user) => user.id === profile.userId,
+									(user) => user.id === profile.shortId,
 								);
 							}
 
diff --git a/packages/manager/test/SliceMachineManager-prismicRepository-fetchEnvironments.test.ts b/packages/manager/test/SliceMachineManager-prismicRepository-fetchEnvironments.test.ts
@@ -23,12 +23,12 @@ it("returns a list of environments for the Prismic repository", async (ctx) => {
 		cwd,
 	});
 
-	const userId = "user-foo";
+	const shortId = "user-foo";
 
 	mockPrismicUserAPI(ctx, {
 		profileEndpoint: {
 			profile: {
-				userId,
+				shortId,
 			},
 		},
 	});
@@ -57,7 +57,7 @@ it("returns a list of environments for the Prismic repository", async (ctx) => {
 			kind: "dev",
 			domain: `${repositoryName}-bar`,
 			name: "bar",
-			users: [{ id: userId }],
+			users: [{ id: shortId }],
 		},
 		{
 			kind: "dev",
@@ -80,28 +80,28 @@ it("returns a list of environments for the Prismic repository", async (ctx) => {
 	expect(res).toStrictEqual({
 		environments: environments.filter((environment) => {
 			if (environment.kind === "dev") {
-				return environment.users.some((user) => user.id === userId);
+				return environment.users.some((user) => user.id === shortId);
 			}
 
 			return true;
 		}),
 	});
 });
 
-it("exludes personal environments that are not the user's by default", async (ctx) => {
+it("excludes personal environments that are not the user's by default", async (ctx) => {
 	const adapter = createTestPlugin();
 	const cwd = await createTestProject({ adapter });
 	const manager = createSliceMachineManager({
 		nativePlugins: { [adapter.meta.name]: adapter },
 		cwd,
 	});
 
-	const userId = "user-foo";
+	const shortId = "user-foo";
 
 	mockPrismicUserAPI(ctx, {
 		profileEndpoint: {
 			profile: {
-				userId,
+				shortId,
 			},
 		},
 	});
@@ -117,7 +117,7 @@ it("exludes personal environments that are not the user's by default", async (ct
 		kind: "dev",
 		domain: `${repositoryName}-bar`,
 		name: "bar",
-		users: [{ id: userId }],
+		users: [{ id: shortId }],
 	};
 	const someoneElsesEnvironment: Environment = {
 		kind: "dev",
@@ -150,12 +150,12 @@ it("includes all personal environments if configured", async (ctx) => {
 		cwd,
 	});
 
-	const userId = "user-foo";
+	const shortId = "user-foo";
 
 	mockPrismicUserAPI(ctx, {
 		profileEndpoint: {
 			profile: {
-				userId,
+				shortId,
 			},
 		},
 	});
@@ -171,7 +171,7 @@ it("includes all personal environments if configured", async (ctx) => {
 		kind: "dev",
 		domain: `${repositoryName}-bar`,
 		name: "bar",
-		users: [{ id: userId }],
+		users: [{ id: shortId }],
 	};
 	const someoneElsesEnvironment: Environment = {
 		kind: "dev",
diff --git a/packages/plugin-kit/package.json b/packages/plugin-kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/plugin-kit",
-	"version": "0.4.30",
+	"version": "0.4.31-dev-next-release.1",
 	"description": "A set of helpers to develop and run Slice Machine plugins",
 	"keywords": [
 		"typescript",
diff --git a/packages/slice-machine/package.json b/packages/slice-machine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "slice-machine-ui",
-  "version": "1.22.0",
+  "version": "1.22.1-dev-next-release.1",
   "license": "MIT",
   "description": "A visual builder for your Slice Models with all the tools you need to generate data models and mock CMS content locally.",
   "repository": {
@@ -31,8 +31,8 @@
     "start-slicemachine": "./bin/start-slicemachine.cjs"
   },
   "dependencies": {
-    "@slicemachine/manager": "workspace:^",
-    "start-slicemachine": "workspace:^"
+    "@slicemachine/manager": "workspace:*",
+    "start-slicemachine": "workspace:*"
   },
   "devDependencies": {
     "@emotion/react": "11.11.1",
diff --git a/packages/start-slicemachine/package.json b/packages/start-slicemachine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "start-slicemachine",
-	"version": "0.12.10",
+	"version": "0.12.11-dev-next-release.1",
 	"description": "Start Slice Machine from within a project.",
 	"repository": {
 		"type": "git",
@@ -57,7 +57,7 @@
 	"dependencies": {
 		"@prismicio/mocks": "^2.0.0-alpha.2",
 		"@prismicio/types-internal": "^2.2.0",
-		"@slicemachine/manager": "workspace:^",
+		"@slicemachine/manager": "workspace:*",
 		"body-parser": "^1.20.2",
 		"chalk": "^4.1.2",
 		"cors": "^2.8.5",
diff --git a/playwright/package.json b/playwright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@slicemachine/e2e",
-  "version": "0.0.3",
+  "version": "0.0.4-dev-next-release.1",
   "private": true,
   "description": "E2E tests for Slice Machine",
   "author": "Prismic <contact@prismic.io> (https://prismic.io)",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "next-upgrade",`
`3`		`- "version": "1.22.0",`
	`3`	`+ "version": "1.22.1-dev-next-release.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "next dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cimsirp",`
`3`		`- "version": "1.22.0",`
	`3`	`+ "version": "1.22.1-dev-next-release.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "next dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sveltekit",`
`3`		`- "version": "1.22.0",`
	`3`	`+ "version": "1.22.1-dev-next-release.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "vite dev",`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ export class PrismicRepositoryManager extends BaseManager {`
`503`	`503`	`environments = environments.filter((environment) => {`
`504`	`504`	`if (environment.kind === "dev") {`
`505`	`505`	`return environment.users.some(`
`506`		`- (user) => user.id === profile.userId,`
	`506`	`+ (user) => user.id === profile.shortId,`
`507`	`507`	`);`
`508`	`508`	`}`
`509`	`509`