Skip to content

Commit

Permalink
Merge branch 'main' of github.com:prismicio/slice-machine into dani/l…
Browse files Browse the repository at this point in the history
…ink-variant
  • Loading branch information
dani-mp committed Dec 20, 2024
2 parents 98d8bd0 + b2ce2b8 commit 189e246
Show file tree
Hide file tree
Showing 46 changed files with 1,237 additions and 997 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ npx create-next-app@latest my-app
npx nuxi@latest init my-app
```
```
npm create svelte@latest my-app
npx sv create my-app
```

Open the folder:
Expand Down
4 changes: 2 additions & 2 deletions e2e-projects/sveltekit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ If you're seeing this, you've probably already done this step. Congrats!

```bash
# create a new project in the current directory
npm create svelte@latest
npx sv create

# create a new project in my-app
npm create svelte@latest my-app
npx sv create my-app
```

## Developing
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-next",
"version": "0.3.60",
"version": "0.3.61",
"description": "Slice Machine adapter for Next.js.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-nuxt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-nuxt",
"version": "0.3.60",
"version": "0.3.61",
"description": "Slice Machine adapter for Nuxt 3.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-nuxt2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-nuxt2",
"version": "0.3.60",
"version": "0.3.61",
"description": "Slice Machine adapter for Nuxt 2.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-sveltekit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/adapter-sveltekit",
"version": "0.3.60",
"version": "0.3.61",
"description": "Slice Machine adapter for SvelteKit.",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/init/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/init",
"version": "2.10.17",
"version": "2.10.18",
"description": "Init Prismic Slice Machine in your project",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/init/src/SliceMachineInitProcess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ ${chalk.cyan("?")} Your Prismic repository name`.replace("\n", ""),
try {
const { value: onboardingExperimentVariant } =
(await this.manager.telemetry.getExperimentVariant(
"shared-onboarding",
"shared-onboarding-new",
)) ?? {};
if (onboardingExperimentVariant === "with-shared-onboarding") {
this.manager.prismicRepository.completeOnboardingStep(
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/manager",
"version": "0.23.0",
"version": "0.23.1",
"description": "Manage all aspects of a Slice Machine project.",
"repository": {
"type": "git",
Expand Down
32 changes: 8 additions & 24 deletions packages/manager/src/managers/telemetry/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,10 @@ export const SegmentEventType = {
postPush_emptyStateCtaClicked: "post-push:empty-state-cta-clicked",
postPush_toastCtaClicked: "post-push:toast-cta-clicked",
experiment_exposure: "experiment:exposure",
onboarding_step_opened: "onboarding:step-opened",
onboarding_step_completed: "onboarding:step-completed",
onboarding_completed: "onboarding:completed",
sharedOnboarding_step_opened: "shared-onboarding:step-opened",
sharedOnboarding_step_completed: "shared-onboarding:step-completed",
sharedOnboarding_completed: "shared-onboarding:completed",
sharedOnboarding_tutorial: "shared-onboarding:follow-tutorial",
} as const;
type SegmentEventTypes =
(typeof SegmentEventType)[keyof typeof SegmentEventType];
Expand Down Expand Up @@ -96,17 +94,14 @@ export const HumanSegmentEventType = {
[SegmentEventType.postPush_toastCtaClicked]:
"SliceMachine Post Push Toast CTA Clicked",
[SegmentEventType.experiment_exposure]: "$exposure",
[SegmentEventType.onboarding_step_opened]:
"SliceMachine Onboarding Step Opened",
[SegmentEventType.onboarding_step_completed]:
"SliceMachine Onboarding Step Completed",
[SegmentEventType.onboarding_completed]: "SliceMachine Onboarding Completed",
[SegmentEventType.sharedOnboarding_step_completed]:
"Prismic Onboarding Guide Step Completed",
[SegmentEventType.sharedOnboarding_step_opened]:
"Prismic Onboarding Guide Step Open",
[SegmentEventType.sharedOnboarding_completed]:
"Prismic Onboarding Guide Completed",
[SegmentEventType.sharedOnboarding_tutorial]:
"Prismic Onboarding Guide Follow Tutorial",
} as const;

export type HumanSegmentEventTypes =
Expand Down Expand Up @@ -364,18 +359,6 @@ type SharedOnboardingProperties<T = Record<string, string>> = T & {
source: "SliceMachine";
};

type SliceMachineOnboardingStepOpened = SegmentEvent<
typeof SegmentEventType.onboarding_step_opened,
OnboardingCommonPayload
>;
type SliceMachineOnboardingStepCompleted = SegmentEvent<
typeof SegmentEventType.onboarding_step_completed,
OnboardingCommonPayload
>;
type SliceMachineOnboardingCompleted = SegmentEvent<
typeof SegmentEventType.onboarding_completed
>;

type SliceMachineSharedOnboardingStepOpened = SegmentEvent<
typeof SegmentEventType.sharedOnboarding_step_opened,
SharedOnboardingProperties<OnboardingCommonPayload>
Expand All @@ -388,7 +371,10 @@ type SliceMachineSharedOnboardingCompleted = SegmentEvent<
typeof SegmentEventType.sharedOnboarding_completed,
SharedOnboardingProperties
>;

type SliceMachineSharedOnboardingTutorial = SegmentEvent<
typeof SegmentEventType.sharedOnboarding_tutorial,
SharedOnboardingProperties
>;
type SliceMachinePostPushEmptyStateCtaClicked = SegmentEvent<
typeof SegmentEventType.postPush_emptyStateCtaClicked
>;
Expand Down Expand Up @@ -436,12 +422,10 @@ export type SegmentEvents =
| SliceMachineStart
| SliceLibraryBetaModalOpened
| SliceLibraryBetaCodeOpened
| SliceMachineOnboardingStepOpened
| SliceMachineOnboardingStepCompleted
| SliceMachineOnboardingCompleted
| SliceMachineSharedOnboardingStepOpened
| SliceMachineSharedOnboardingStepCompleted
| SliceMachineSharedOnboardingCompleted
| SliceMachineSharedOnboardingTutorial
| SliceMachinePostPushEmptyStateCtaClicked
| SliceMachinePostPushToastCtaClicked
| SliceMachineExperimentExposure;
2 changes: 1 addition & 1 deletion packages/plugin-kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@slicemachine/plugin-kit",
"version": "0.4.60",
"version": "0.4.61",
"description": "A set of helpers to develop and run Slice Machine plugins",
"keywords": [
"typescript",
Expand Down
8 changes: 4 additions & 4 deletions packages/slice-machine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "slice-machine-ui",
"version": "2.11.0",
"version": "2.11.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": {
Expand Down Expand Up @@ -43,9 +43,9 @@
"@emotion/react": "11.11.1",
"@extractus/oembed-extractor": "3.1.8",
"@prismicio/client": "7.11.0",
"@prismicio/editor-fields": "0.4.58",
"@prismicio/editor-support": "0.4.58",
"@prismicio/editor-ui": "0.4.58",
"@prismicio/editor-fields": "0.4.59",
"@prismicio/editor-support": "0.4.59",
"@prismicio/editor-ui": "0.4.59",
"@prismicio/mock": "0.3.3",
"@prismicio/mocks": "2.7.0-alpha.0",
"@prismicio/simulator": "0.1.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const EditDropdown: FC<EditDropdownProps> = ({

return (
<>
<DropdownMenu modal>
<DropdownMenu>
<DropdownMenuTrigger disabled={isCustomTypeBeingConverted}>
<IconButton
color="grey"
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 189e246

Please sign in to comment.