Skip to content

Commit 7f8e587

Browse files
authored
Merge pull request #444 from prismicio/v0.3.6
[Release Branch] v0.3.6
2 parents ec6f9cd + ca31c1b commit 7f8e587

23 files changed

Lines changed: 84 additions & 93 deletions

File tree

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"build": "lerna run build && npm run test",
1515
"prettier:check": "prettier --check .",
1616
"pretty": "prettier --write .",
17+
"bump:interactive":"lerna version --preid alpha --no-push --no-git-tag-version --exact",
1718
"bump:alpha": "lerna version prerelease --preid alpha --exact --yes",
1819
"publish:alpha": "lerna publish from-package --dist-tag alpha --yes --no-verify-access",
1920
"bump:production": "lerna version --conventional-graduate --exact",

packages/core/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@slicemachine/core",
3-
"version": "1.1.6",
3+
"version": "1.1.7-alpha.3",
44
"private": false,
55
"main": "./build/index.js",
66
"engines": {

packages/init/__tests__/logInOrBypass.test.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ describe("loginOrBypass", () => {
8989

9090
expect(fs.writeFileSync).toHaveBeenLastCalledWith(
9191
path.join(os.homedir(), ".prismic"),
92-
JSON.stringify({ base: fakeBase, cookies: fakeCookie, shortId }, null, 2),
92+
JSON.stringify(
93+
{ base: fakeBase, cookies: fakeCookie, shortId, intercomHash },
94+
null,
95+
2
96+
),
9397
"utf8"
9498
);
9599
});
@@ -138,7 +142,11 @@ describe("loginOrBypass", () => {
138142
expect(result?.profile?.intercomHash).toEqual(intercomHash);
139143
expect(fs.writeFileSync).toBeCalledWith(
140144
path.join(os.homedir(), ".prismic"),
141-
JSON.stringify({ base: fakeBase, cookies: fakeCookie, shortId }, null, 2),
145+
JSON.stringify(
146+
{ base: fakeBase, cookies: fakeCookie, shortId, intercomHash },
147+
null,
148+
2
149+
),
142150
"utf8"
143151
);
144152
});

packages/init/__tests__/utils/communication.test.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ describe("communication.validateSessionAndGetProfile", () => {
131131
expect(result?.profile).toBeNull();
132132
});
133133

134-
test("is should validate the session and get the users profile", async () => {
134+
test("it should validate the session and get the users profile", async () => {
135135
jest.spyOn(fs, "lstatSync").mockImplementation(() => ({} as fs.Stats));
136136
jest.spyOn(fs, "writeFileSync");
137137

@@ -167,11 +167,16 @@ describe("communication.validateSessionAndGetProfile", () => {
167167

168168
expect(result?.info.email).toEqual(email);
169169
expect(result?.profile?.shortId).toEqual(shortId);
170+
expect(result?.profile?.intercomHash).toEqual(intercomHash);
170171
expect(result?.profile?.userId).toEqual(userId);
171172

172173
expect(fs.writeFileSync).toHaveBeenLastCalledWith(
173174
path.join(os.homedir(), ".prismic"),
174-
JSON.stringify({ base: fakeBase, cookies: fakeCookie, shortId }, null, 2),
175+
JSON.stringify(
176+
{ base: fakeBase, cookies: fakeCookie, shortId, intercomHash },
177+
null,
178+
2
179+
),
175180
"utf8"
176181
);
177182
});

packages/init/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/init/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@slicemachine/init",
3-
"version": "1.1.6",
3+
"version": "1.1.7-alpha.3",
44
"description": "The easiest way to add Slice Machine to your project",
55
"license": "MIT",
66
"bin": {
@@ -19,7 +19,7 @@
1919
},
2020
"dependencies": {
2121
"@hapi/hapi": "^20.2.0",
22-
"@slicemachine/core": "1.1.6",
22+
"@slicemachine/core": "1.1.7-alpha.3",
2323
"adm-zip": "^0.5.9",
2424
"analytics-node": "^6.0.0",
2525
"axios": "^0.24.0",

packages/init/src/utils/communication.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export async function validateSessionAndGetProfile(
6262
if (profile?.shortId) {
6363
Prismic.PrismicSharedConfigManager.setProperties({
6464
shortId: profile.shortId,
65+
intercomHash: profile.intercomHash,
6566
});
6667
}
6768
return { info, profile };

packages/next-slicezone/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/next-slicezone/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "next-slicezone",
3-
"version": "0.2.6",
3+
"version": "0.2.7-alpha.2",
44
"description": "A component that maps other components to Prismic slices",
55
"source": "src/index.js",
66
"main": "dist/index.js",
@@ -32,7 +32,7 @@
3232
"gitHead": "29ddeeeb62e0bb8eb07476e1cee1d47c8618653d",
3333
"dependencies": {
3434
"slash": "^3.0.0",
35-
"sm-commons": "0.1.6"
35+
"sm-commons": "0.1.7-alpha.2"
3636
},
3737
"peerDependencies": {
3838
"react": ">=16.14.0",

0 commit comments

Comments
 (0)