Skip to content

Commit 41643af

Browse files
Merge pull request #2156 from contentstack/fix/dx-3622
Fixed error in Nuxt kickstarter apps
2 parents 0e5b9a3 + 40ab817 commit 41643af

File tree

7 files changed

+151
-146
lines changed

7 files changed

+151
-146
lines changed

.talismanrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: 23c42f846dfb95e8516b980e4d65a1f6d97ce6bd2b483d14af1e182ff2598da9
3+
checksum: ac09efe0941e2249d1648493761844e88c14e6f86c54be7e425d09bc1f0a118b
44
- filename: pnpm-lock.yaml
55
checksum: 4bfcc1a77f91a411e825884e375ef588dd16f2950ba0ec970f6a9b9a544fc0b6
66
- filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
@@ -74,7 +74,7 @@ fileignoreconfig:
7474
- filename: packages/contentstack-bootstrap/messages/index.json
7575
checksum: c435ceaa709a7504da303a6ea674e07a89030d8ad4152e7917cd17e7f3e58052
7676
- filename: packages/contentstack-bootstrap/src/config.ts
77-
checksum: 65d300dc729fb84f5446c0b14921555db01fe5c90be3d297e3d0418a37b3696a
77+
checksum: cc3270acd9d37479b24792f45a108e0f1c99265f92d59c35c0ec3ee2d1cc390d
7878
- filename: packages/contentstack-clone/src/commands/cm/stacks/clone.js
7979
checksum: 433a84a882ea3f12b27127d47d289dfc64dda6b6fc956369f5851daaa57ae493
8080
- filename: packages/contentstack-clone/src/lib/util/clone-handler.js

package-lock.json

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

packages/contentstack-bootstrap/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-cm-bootstrap",
33
"description": "Bootstrap contentstack apps",
4-
"version": "1.16.0",
4+
"version": "1.16.1",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"scripts": {

packages/contentstack-bootstrap/src/bootstrap/utils.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,17 @@ const envFileHandler = async (
190190
if (regionName !== 'eu' && !isUSRegion) {
191191
customHost = region?.cma?.substring(8);
192192
}
193+
let graphqlHost = "graphql.contentstack.com";
194+
if(regionName != 'na'){
195+
graphqlHost = `${regionName}-.graphql.contentstack.com`;
196+
}
197+
193198

194199
// Construct image hostname based on the actual host being used
195200
let imageHostname = '*-images.contentstack.com'; // default fallback
196201
if (region?.cda) {
197202
const baseHost = region.cda.replace(/^https?:\/\//, '').replace(/^[^.]+\./, '');
198-
imageHostname = `*-images.${baseHost}`;
203+
imageHostname = `images.${baseHost}`;
199204
}
200205
const production = environmentVariables.environment === 'production' ? true : false;
201206
switch (appConfigKey) {
@@ -212,7 +217,7 @@ const envFileHandler = async (
212217
}\nNEXT_PUBLIC_CONTENTSTACK_ENVIRONMENT=${environmentVariables.environment
213218
}\nNEXT_PUBLIC_CONTENTSTACK_REGION=${regionName
214219
}\nNEXT_PUBLIC_CONTENTSTACK_PREVIEW=${livePreviewEnabled ? 'true' : 'false'
215-
}\nNEXT_PUBLIC_CONTENTSTACK_CONTENT_DELIVERY = ${cdnHost
220+
}\nNEXT_PUBLIC_CONTENTSTACK_CONTENT_DELIVERY = ${graphqlHost
216221
}\nNEXT_PUBLIC_CONTENTSTACK_CONTENT_APPLICATION = ${appHost
217222
}\nNEXT_PUBLIC_CONTENTSTACK_PREVIEW_HOST = ${previewHost
218223
}\nNEXT_PUBLIC_CONTENTSTACK_IMAGE_HOSTNAME=${imageHostname}`;

packages/contentstack-bootstrap/src/config.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const config: Configuration = {
2828
{ displayName: 'Kickstart Next.js SSG', configKey: 'kickstart-next-ssg' },
2929
{ displayName: 'Kickstart Next.js GraphQL', configKey: 'kickstart-next-graphql' },
3030
{ displayName: 'Kickstart Next.js Middleware', configKey: 'kickstart-next-middleware' },
31-
{ displayName: 'Kickstart NuxtJS', configKey: 'kickstart-next-nuxt' },
32-
{ displayName: 'Kickstart NuxtJS SSR', configKey: 'kickstart-next-nuxt-ssr' },
31+
{ displayName: 'Kickstart NuxtJS', configKey: 'kickstart-nuxt' },
32+
{ displayName: 'Kickstart NuxtJS SSR', configKey: 'kickstart-nuxt-ssr' },
3333

3434
{ displayName: 'React JS (Deprecated)', configKey: 'reactjs-starter' },
3535
{ displayName: 'Next JS (Deprecated)', configKey: 'nextjs-starter' },
@@ -66,12 +66,12 @@ const config: Configuration = {
6666
stack: 'contentstack/kickstart-stack-seed',
6767
},
6868

69-
'kickstart-next-nuxt': {
70-
source: 'contentstack/kickstart-next-nuxt',
69+
'kickstart-nuxt': {
70+
source: 'contentstack/kickstart-nuxt',
7171
stack: 'contentstack/kickstart-stack-seed',
7272
},
73-
'kickstart-next-nuxt-ssr': {
74-
source: 'contentstack/kickstart-next-nuxt-ssr',
73+
'kickstart-nuxt-ssr': {
74+
source: 'contentstack/kickstart-nuxt-ssr',
7575
stack: 'contentstack/kickstart-stack-seed',
7676
},
7777
nextjs: {

packages/contentstack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"dependencies": {
2525
"@contentstack/cli-audit": "~1.15.0",
2626
"@contentstack/cli-auth": "~1.6.1",
27-
"@contentstack/cli-cm-bootstrap": "~1.16.0",
27+
"@contentstack/cli-cm-bootstrap": "~1.16.1",
2828
"@contentstack/cli-cm-branches": "~1.6.0",
2929
"@contentstack/cli-cm-bulk-publish": "~1.10.0",
3030
"@contentstack/cli-cm-clone": "~1.16.1",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)