Skip to content

Commit

Permalink
Merge pull request dev-next-release - 1.19.1 (#1195)
Browse files Browse the repository at this point in the history
  • Loading branch information
xrutayisire authored Oct 30, 2023
2 parents 17a581b + bd2bebf commit c7e1dec
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 37 deletions.
8 changes: 4 additions & 4 deletions .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

name: Setup Node 16
description: Setup Node 16
name: Setup Node LTS
description: Setup Node LTS
runs:
using: composite
steps:
- name: Use Node.js 16
- name: Use Node.js LTS
uses: actions/setup-node@v3
with:
cache: yarn
node-version: 16
node-version: lts/*
registry-url: https://registry.npmjs.org
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
2 changes: 1 addition & 1 deletion cypress-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ else
fi

rm -rf e2e-projects/cypress-next-app \
&& yarn dlx --quiet create-next-app@13.4.6 --app --eslint --import-alias '@/*' --no-src-dir --tailwind --typescript --use-npm e2e-projects/cypress-next-app \
&& yarn dlx --quiet create-next-app@latest --app --eslint --import-alias '@/*' --no-src-dir --tailwind --typescript --use-npm e2e-projects/cypress-next-app \
&& yarn dlx --quiet vite-node ./cypress/plugins/addAuth.ts -- ${EMAIL} ${PASSWORD} ${PRISMIC_URL} \
&& yarn dlx --quiet vite-node ./cypress/plugins/createRepo.ts -- "${_PRISMIC_REPO}" "${PASSWORD}" "${PRISMIC_URL}" \
&& yarn workspaces foreach --include '{@slicemachine/adapter-next,@slicemachine/init,@slicemachine/manager,@slicemachine/plugin-kit,slice-machine-ui,start-slicemachine}' --topological --verbose pack --out "${THIS_DIR}"/e2e-projects/cypress-next-app/%s-%v.tgz \
Expand Down
2 changes: 1 addition & 1 deletion e2e-projects/next-upgrade/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-upgrade",
"version": "1.19.0",
"version": "1.19.1-dev-next-release.3",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
2 changes: 1 addition & 1 deletion e2e-projects/next/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cimsirp",
"version": "1.19.0",
"version": "1.19.1-dev-next-release.3",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
2 changes: 1 addition & 1 deletion e2e-projects/sveltekit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sveltekit",
"version": "1.19.0",
"version": "1.19.1-dev-next-release.3",
"private": true,
"scripts": {
"dev": "vite dev",
Expand Down
4 changes: 2 additions & 2 deletions 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.22",
"version": "0.3.23-dev-next-release.3",
"description": "Slice Machine adapter for Next.js.",
"keywords": [
"typescript",
Expand Down Expand Up @@ -97,7 +97,7 @@
"vitest": "0.32.0"
},
"peerDependencies": {
"next": "^11 || ^12 || ^13",
"next": ">=11.0.0",
"react": "^17 || ^18"
},
"engines": {
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.22",
"version": "0.3.23-dev-next-release.3",
"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.22",
"version": "0.3.23-dev-next-release.3",
"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.22",
"version": "0.3.23-dev-next-release.3",
"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.9.0",
"version": "2.9.1-dev-next-release.3",
"description": "Init Prismic Slice Machine in your project",
"keywords": [
"typescript",
Expand Down
12 changes: 6 additions & 6 deletions packages/init/src/lib/framework.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export type Framework = {
* Framework 's id sent to Segment from Slice Machine
*/
sliceMachineTelemetryID:
| "next-11-13"
| "next"
| "nuxt-2"
| "nuxt-3"
| "sveltekit-1"
Expand Down Expand Up @@ -97,14 +97,14 @@ export const FRAMEWORKS: Record<string, Framework> = {
"@slicemachine/adapter-nuxt": isPrerelease ? "alpha" : "latest",
},
},
"next-11-13": {
name: "Next.js 11-13",
sliceMachineTelemetryID: "next-11-13",
next: {
name: "Next.js",
sliceMachineTelemetryID: "next",
wroomTelemetryID: "next",
prismicDocumentation: "https://prismic.dev/init/next-11-13",
prismicDocumentation: "https://prismic.dev/init/next",
adapterName: "@slicemachine/adapter-next",
compatibility: {
next: "^11.0.0 || ^12.0.0 || ^13.0.0",
next: ">=11.0.0",
},
devDependencies: {
...DEFAULT_DEV_DEPENDENCIES,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ it("detects framework, starter and package manager", async () => {
"framework": {
"adapterName": "@slicemachine/adapter-next",
"compatibility": {
"next": "^11.0.0 || ^12.0.0 || ^13.0.0",
"next": ">=11.0.0",
},
"devDependencies": {
"@slicemachine/adapter-next": "latest",
"slice-machine-ui": "latest",
},
"name": "Next.js 11-13",
"prismicDocumentation": "https://prismic.dev/init/next-11-13",
"sliceMachineTelemetryID": "next-11-13",
"name": "Next.js",
"prismicDocumentation": "https://prismic.dev/init/next",
"sliceMachineTelemetryID": "next",
"wroomTelemetryID": "next",
},
"packageManager": "npm",
Expand Down Expand Up @@ -82,15 +82,15 @@ it("assumes unconventional tags match semver range when detecting framework", as
"framework": {
"adapterName": "@slicemachine/adapter-next",
"compatibility": {
"next": "^11.0.0 || ^12.0.0 || ^13.0.0",
"next": ">=11.0.0",
},
"devDependencies": {
"@slicemachine/adapter-next": "latest",
"slice-machine-ui": "latest",
},
"name": "Next.js 11-13",
"prismicDocumentation": "https://prismic.dev/init/next-11-13",
"sliceMachineTelemetryID": "next-11-13",
"name": "Next.js",
"prismicDocumentation": "https://prismic.dev/init/next",
"sliceMachineTelemetryID": "next",
"wroomTelemetryID": "next",
},
"packageManager": "npm",
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.15.1",
"version": "0.15.2-dev-next-release.3",
"description": "Manage all aspects of a Slice Machine project.",
"repository": {
"type": "git",
Expand Down
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.22",
"version": "0.4.23-dev-next-release.3",
"description": "A set of helpers to develop and run Slice Machine plugins",
"keywords": [
"typescript",
Expand Down
2 changes: 1 addition & 1 deletion packages/slice-machine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "slice-machine-ui",
"version": "1.19.0",
"version": "1.19.1-dev-next-release.3",
"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
2 changes: 1 addition & 1 deletion packages/start-slicemachine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "start-slicemachine",
"version": "0.12.2",
"version": "0.12.3-dev-next-release.3",
"description": "Start Slice Machine from within a project.",
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,22 @@ export const FRAMEWORKS: Record<string, Framework> = {
},
},
previousNext: {
name: "Next.js 11-13 (legacy)",
name: "Next.js (legacy)",
adapterName: "@slicemachine/adapter-next",
adapterVersion: "latest",
runProjectInitHook: true,
compatibility: {
next: "^11.0.0 || ^12.0.0 || ^13.0.0",
next: ">=11.0.0",
"prismic-reactjs": "*",
},
},
next: {
name: "Next.js 11-13",
name: "Next.js",
adapterName: "@slicemachine/adapter-next",
adapterVersion: "latest",
runProjectInitHook: false,
compatibility: {
next: "^11.0.0 || ^12.0.0 || ^13.0.0",
next: ">=11.0.0",
},
},
} as const;
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8196,7 +8196,7 @@ __metadata:
vite-plugin-sdk: 0.1.1
vitest: 0.32.0
peerDependencies:
next: ^11 || ^12 || ^13
next: ">=11.0.0"
react: ^17 || ^18
languageName: unknown
linkType: soft
Expand Down

0 comments on commit c7e1dec

Please sign in to comment.