Skip to content

Commit 21c6ecd

Browse files
cs-rajcs-raj
committed
Merge branch 'v2-dev' into enhc/DX-5737
2 parents dec6f22 + 8c00c36 commit 21c6ecd

33 files changed

Lines changed: 3792 additions & 1811 deletions

File tree

‎.talismanrc‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,4 @@
11
fileignoreconfig:
22
- filename: pnpm-lock.yaml
3-
checksum: 0942b9ee7e4b284bfd9f0a2258ca8281cf8569b60dd293e08abf64373db12d59
4-
- filename: packages/contentstack-import/src/types/index.ts
5-
checksum: d61bcc581f6d7f684caa75a5880fb740af12404d271d4e8429610f856154089f
6-
- filename: packages/contentstack-import/test/unit/utils/extension-helper.test.ts
7-
checksum: c61c823716710a29248bba5fdae199af949876f06308b878e3cf8f3d89e13b48
8-
- filename: packages/contentstack-import/test/unit/import/modules/locales.test.ts
9-
checksum: bd7f0036cb0a853848876a3664c599f8538a1d84a02fe50fb6bdbdad8d70b49e
10-
- filename: packages/contentstack-import/src/config/index.ts
11-
checksum: 53e460b7ff7f7c9dae29d0b551352f3f89da0c5b08f753865ce73165a06259e5
12-
- filename: packages/contentstack-variants/src/types/export-config.ts
13-
checksum: e6df2394b6acb1f1ff30ed18baca686ba5b36c9de03b529f9980acbec4c8c8fc
14-
- filename: packages/contentstack-export/src/config/index.ts
15-
checksum: 5dddd4e482975bdb65f3d94383438f09c43fcc8a8d50753d9be4af73b5a171aa
16-
- filename: packages/contentstack-import/src/import/modules/publishing-rules.ts
17-
checksum: 429a803bc18e691db93bae3df1714071d0face6441b82cb938a83e8bf94ae14c
18-
- filename: packages/contentstack-import/src/types/default-config.ts
19-
checksum: c117d060d6979540a1bb6ae20ad6ad6d43e9b15a6909291f76ed60b11e5f793d
20-
- filename: packages/contentstack-import/test/unit/import/modules/publishing-rules.test.ts
21-
checksum: 0fcbff5dab2f9e594fe2a316c3c96e8d86bcd5d72e7c1f9eb35c0e3458f87817
22-
- filename: packages/contentstack-export/src/types/default-config.ts
23-
checksum: 70c9ca7400c447f2b54f48a07965c7ba34706deee97d68951d6229d523c7e4b0
24-
- filename: packages/contentstack-export/src/types/index.ts
25-
checksum: 71f02ac11507c61222a661caf228dfd54ffdc6c57e4cc631f66598ecd617852b
26-
- filename: packages/contentstack-import/test/unit/utils/build-import-spaces-options.test.ts
27-
checksum: ecc39327ca93ca4ea749937ec853f5a4c9a609a96c4e4e15df1b596fb4f32c74
28-
- filename: packages/contentstack-asset-management/test/unit/import/workspaces.test.ts
29-
checksum: a0a17ff803fcf8f20538c8e158909d06705fc801f0bd3356b1eac1d92f006d83
30-
- filename: packages/contentstack-asset-management/test/unit/import/spaces.test.ts
31-
checksum: 163c7e519561f2c1f473f6f0c5303a2a47c9f5c231b638cd90782c37eaa4859e
32-
- filename: packages/contentstack-branches/README.md
33-
checksum: 2978e9a9c151cbbafb5dd542edf6815ccec12172ae4ca114a6c4e5e73a85a2b5
34-
- filename: packages/contentstack-seed/README.md
35-
checksum: ee6667dc5ce3a11517663ed19c090cac9ddfadf562a117b1f165220eb61cdc2b
3+
checksum: e5b5f8ab64f4f27a1483e426cc01d7388482263e1d6fe3baf1caafcf2878ebb2
364
version: '1.0'

‎packages/contentstack-asset-management/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/cli-asset-management",
3-
"version": "1.0.0-beta.0",
3+
"version": "1.0.0-beta.1",
44
"description": "Contentstack Assets API adapter for export and import",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",
@@ -30,7 +30,7 @@
3030
],
3131
"license": "MIT",
3232
"dependencies": {
33-
"@contentstack/cli-utilities": "~2.0.0-beta.5"
33+
"@contentstack/cli-utilities": "~2.0.0-beta.8"
3434
},
3535
"oclif": {
3636
"commands": "./lib/commands",

‎packages/contentstack-audit/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/cli-audit",
3-
"version": "2.0.0-beta.11",
3+
"version": "2.0.0-beta.12",
44
"description": "Contentstack audit plugin",
55
"author": "Contentstack CLI",
66
"homepage": "https://github.com/contentstack/cli",
@@ -18,8 +18,8 @@
1818
"/oclif.manifest.json"
1919
],
2020
"dependencies": {
21-
"@contentstack/cli-command": "~2.0.0-beta.6",
22-
"@contentstack/cli-utilities": "~2.0.0-beta.7",
21+
"@contentstack/cli-command": "~2.0.0-beta.7",
22+
"@contentstack/cli-utilities": "~2.0.0-beta.8",
2323
"@oclif/core": "^4.3.0",
2424
"chalk": "^5.6.2",
2525
"fast-csv": "^4.3.6",

‎packages/contentstack-bootstrap/package.json‎

Lines changed: 6 additions & 6 deletions
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": "2.0.0-beta.16",
4+
"version": "2.0.0-beta.18",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"scripts": {
@@ -16,10 +16,10 @@
1616
"test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
1717
},
1818
"dependencies": {
19-
"@contentstack/cli-cm-seed": "~2.0.0-beta.16",
20-
"@contentstack/cli-command": "~2.0.0-beta.6",
21-
"@contentstack/cli-utilities": "~2.0.0-beta.7",
22-
"@contentstack/cli-config": "~2.0.0-beta.8",
19+
"@contentstack/cli-cm-seed": "~2.0.0-beta.17",
20+
"@contentstack/cli-command": "~2.0.0-beta.7",
21+
"@contentstack/cli-utilities": "~2.0.0-beta.8",
22+
"@contentstack/cli-config": "~2.0.0-beta.9",
2323
"@oclif/core": "^4.3.0",
2424
"inquirer": "12.11.1",
2525
"mkdirp": "^2.1.6",
@@ -70,4 +70,4 @@
7070
}
7171
},
7272
"repository": "contentstack/cli"
73-
}
73+
}

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

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ const envFileHandler = async (
221221
//default
222222
imageHostname = '*-images.contentstack.com';
223223
}
224-
const production = environmentVariables.environment === 'production' ? true : false;
225224
switch (appConfigKey) {
226225
case 'kickstart-next':
227226
case 'kickstart-next-ssr':
@@ -275,34 +274,6 @@ const envFileHandler = async (
275274
result = await writeEnvFile(content, filePath);
276275
break;
277276

278-
case 'reactjs':
279-
case 'reactjs-starter':
280-
fileName = `.env.${environmentVariables.environment}.local`;
281-
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
282-
content = `REACT_APP_CONTENTSTACK_API_KEY=${environmentVariables.api_key
283-
}\nREACT_APP_CONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken}${livePreviewEnabled
284-
? `\nREACT_APP_CONTENTSTACK_PREVIEW_TOKEN=${environmentVariables.preview_token || `''`
285-
}\nREACT_APP_CONTENTSTACK_PREVIEW_HOST=${previewHost}\nREACT_APP_CONTENTSTACK_APP_HOST=${appHost}\n`
286-
: '\n'
287-
}\nREACT_APP_CONTENTSTACK_ENVIRONMENT=${environmentVariables.environment}\n${customHost ? '\nREACT_APP_CONTENTSTACK_API_HOST=' + customHost : ''
288-
}${!isUSRegion && !customHost ? '\nREACT_APP_CONTENTSTACK_REGION=' + region.name : ''
289-
}\nSKIP_PREFLIGHT_CHECK=true\nREACT_APP_CONTENTSTACK_LIVE_PREVIEW=${livePreviewEnabled}`;
290-
result = await writeEnvFile(content, filePath);
291-
break;
292-
case 'nextjs':
293-
case 'nextjs-starter':
294-
fileName = `.env.${environmentVariables.environment}.local`;
295-
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
296-
content = `CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nCONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken
297-
}\n${livePreviewEnabled
298-
? `\nCONTENTSTACK_PREVIEW_TOKEN=${environmentVariables.preview_token || `''`
299-
}\nCONTENTSTACK_PREVIEW_HOST=${previewHost}\nCONTENTSTACK_APP_HOST=${appHost}\n`
300-
: '\n'
301-
}CONTENTSTACK_ENVIRONMENT=${environmentVariables.environment}\nCONTENTSTACK_API_HOST=${customHost ? customHost : managementAPIHost
302-
}${!isUSRegion && !customHost ? '\nCONTENTSTACK_REGION=' + region.name : ''
303-
}\nCONTENTSTACK_LIVE_PREVIEW=${livePreviewEnabled}\nCONTENTSTACK_LIVE_EDIT_TAGS=false`;
304-
result = await writeEnvFile(content, filePath);
305-
break;
306277
case 'compass-app':
307278
fileName = '.env';
308279
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
@@ -318,75 +289,6 @@ const envFileHandler = async (
318289
}\nCONTENTSTACK_HOST=${cdnHost}`;
319290
result = await writeEnvFile(content, filePath);
320291
break;
321-
case 'gatsby':
322-
case 'gatsby-starter':
323-
fileName = `.env.${environmentVariables.environment}`;
324-
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
325-
content = `CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nCONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken
326-
}\n${livePreviewEnabled
327-
? `\nCONTENTSTACK_PREVIEW_TOKEN=${environmentVariables.preview_token || `''`
328-
}\nCONTENTSTACK_PREVIEW_HOST=${previewHost}\nCONTENTSTACK_APP_HOST=${appHost}\n`
329-
: '\n'
330-
}\nCONTENTSTACK_ENVIRONMENT=${environmentVariables.environment
331-
}\nCONTENTSTACK_API_HOST=${managementAPIHost}\nCONTENTSTACK_LIVE_PREVIEW=${livePreviewEnabled}`;
332-
result = await writeEnvFile(content, filePath);
333-
break;
334-
case 'angular':
335-
content = `export const environment = { \n\tproduction:${environmentVariables.environment === 'production' ? true : false
336-
}, \n\tconfig : { \n\t\tapi_key: '${environmentVariables.api_key}', \n\t\tdelivery_token: '${environmentVariables.deliveryToken
337-
}',\n${livePreviewEnabled
338-
? `\n\tpreivew_token:'${environmentVariables.preview_token || `''`
339-
}'\n\tpreview_host:'${previewHost}'\n\tapp_host:'${appHost}'\n`
340-
: '\n'
341-
},\n\t\tenvironment: '${environmentVariables.environment}'${!isUSRegion && !customHost ? `,\n\t\tregion: '${region.name}'` : ''
342-
} \n\t } \n };`;
343-
fileName = `.env${environmentVariables.environment === 'production' ? '.prod' : ''}`;
344-
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), 'src', 'environments', sanitizePath(fileName)));
345-
result = await writeEnvFile(content, filePath);
346-
break;
347-
case 'angular-starter':
348-
content = `CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nCONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken
349-
}\n${livePreviewEnabled
350-
? `\nCONTENTSTACK_PREVIEW_TOKEN=${environmentVariables.preview_token || `''`
351-
}\nCONTENTSTACK_PREVIEW_HOST=${previewHost}\nCONTENTSTACK_APP_HOST=${appHost}\n`
352-
: '\n'
353-
}CONTENTSTACK_ENVIRONMENT=${environmentVariables.environment}\nCONTENTSTACK_API_HOST=${customHost ? customHost : managementAPIHost
354-
}${!isUSRegion && !customHost ? '\nCONTENTSTACK_REGION=' + region.name : ''
355-
}\nCONTENTSTACK_LIVE_PREVIEW=${livePreviewEnabled}\nCONTENTSTACK_LIVE_EDIT_TAGS=false`;
356-
fileName = `.env${environmentVariables.environment === 'production' ? '.prod' : ''}`;
357-
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
358-
result = await writeEnvFile(content, filePath);
359-
break;
360-
case 'nuxtjs':
361-
case 'nuxt-starter':
362-
case 'nuxt3-starter':
363-
case 'stencil-starter':
364-
fileName = production ? '.env.production' : '.env';
365-
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
366-
// Note: Stencil app needs all the env variables, even if they are not having values otherwise the rollup does not work properly and throws process in undefined error.
367-
content = `CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nCONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken
368-
}\n${livePreviewEnabled
369-
? `\nCONTENTSTACK_PREVIEW_TOKEN=${environmentVariables.preview_token || `''`}\nCONTENTSTACK_PREVIEW_HOST=${customHost ?? previewHost
370-
}\nCONTENTSTACK_APP_HOST=${appHost}`
371-
: '\n'
372-
}\nCONTENTSTACK_ENVIRONMENT=${environmentVariables.environment}${!isUSRegion && !customHost ? '\nCONTENTSTACK_REGION=' + region.name : ''
373-
}\nCONTENTSTACK_API_HOST=${customHost ? customHost : managementAPIHost
374-
}\nCONTENTSTACK_LIVE_PREVIEW=${livePreviewEnabled}\n\nCONTENTSTACK_LIVE_EDIT_TAGS=false`;
375-
result = await writeEnvFile(content, filePath);
376-
break;
377-
case 'vue-starter':
378-
fileName = '.env';
379-
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
380-
content = `VUE_APP_CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nVUE_APP_CONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken
381-
}\n${livePreviewEnabled
382-
? `\nVUE_APP_CONTENTSTACK_PREVIEW_TOKEN=${environmentVariables.preview_token || `''`
383-
}\nVUE_APP_CONTENTSTACK_PREVIEW_HOST=${previewHost}\nVUE_APP_CONTENTSTACK_APP_HOST=${appHost}\n`
384-
: '\n'
385-
}\nVUE_APP_CONTENTSTACK_ENVIRONMENT=${environmentVariables.environment}${customHost ? '\nVUE_APP_CONTENTSTACK_API_HOST=' + customHost : ''
386-
}${!isUSRegion && !customHost ? '\nVUE_APP_CONTENTSTACK_REGION=' + region.name : ''
387-
}\nVUE_APP_CONTENTSTACK_LIVE_PREVIEW=${livePreviewEnabled}`;
388-
result = await writeEnvFile(content, filePath);
389-
break;
390292
default:
391293
cliux.error(messageHandler.parse('CLI_BOOTSTRAP_INVALID_APP_NAME'));
392294
}

‎packages/contentstack-bootstrap/src/config.ts‎

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ export interface AppConfig {
1515
}
1616

1717
const config: Configuration = {
18-
sampleApps: [
19-
{ displayName: 'React JS (Deprecated)', configKey: 'reactjs' },
20-
{ displayName: 'Next JS (Deprecated)', configKey: 'nextjs' },
21-
{ displayName: 'Gatsby (Deprecated)', configKey: 'gatsby' },
22-
{ displayName: 'Angular (Deprecated)', configKey: 'angular' },
23-
],
18+
sampleApps: [],
2419
starterApps: [
2520
{ displayName: 'Compass App', configKey: 'compass-app' },
2621
{ displayName: 'Kickstart Next.js', configKey: 'kickstart-next' },
@@ -30,15 +25,6 @@ const config: Configuration = {
3025
{ displayName: 'Kickstart Next.js Middleware', configKey: 'kickstart-next-middleware' },
3126
{ displayName: 'Kickstart NuxtJS', configKey: 'kickstart-nuxt' },
3227
{ displayName: 'Kickstart NuxtJS SSR', configKey: 'kickstart-nuxt-ssr' },
33-
34-
{ displayName: 'React JS (Deprecated)', configKey: 'reactjs-starter' },
35-
{ displayName: 'Next JS (Deprecated)', configKey: 'nextjs-starter' },
36-
{ displayName: 'Gatsby (Deprecated)', configKey: 'gatsby-starter' },
37-
{ displayName: 'Angular (Deprecated)', configKey: 'angular-starter' },
38-
{ displayName: 'Nuxt JS (Deprecated)', configKey: 'nuxt-starter' },
39-
{ displayName: 'Vue JS (Deprecated)', configKey: 'vue-starter' },
40-
{ displayName: 'Stencil (Deprecated)', configKey: 'stencil-starter' },
41-
{ displayName: 'Nuxt3 (Deprecated)', configKey: 'nuxt3-starter' },
4228
],
4329
appLevelConfig: {
4430
'kickstart-next': {
@@ -74,63 +60,11 @@ const config: Configuration = {
7460
source: 'contentstack/kickstart-nuxt-ssr',
7561
stack: 'contentstack/kickstart-stack-seed',
7662
},
77-
nextjs: {
78-
source: 'contentstack/contentstack-nextjs-react-universal-demo',
79-
stack: 'contentstack/stack-contentstack-nextjs-react-universal-demo',
80-
},
81-
reactjs: {
82-
source: 'contentstack/contentstack-reactjs-universal-sample-app',
83-
stack: 'contentstack/stack-contentstack-reactjs-universal-sample-app',
84-
},
85-
gatsby: {
86-
source: 'contentstack/gatsby-starter-contentstack',
87-
stack: 'contentstack/stack-gatsby-starter-contentstack',
88-
},
89-
angular: {
90-
source: 'contentstack/contentstack-angular-modularblock-example',
91-
stack: 'contentstack/stack-contentstack-angular-modularblock-example',
92-
},
9363
'compass-app': {
9464
source: 'contentstack/compass-starter-app',
9565
stack: 'contentstack/compass-starter-stack',
9666
master_locale: 'en',
9767
},
98-
'nuxtjs-disabled': {
99-
source: 'contentstack/contentstack-nuxtjs-vue-universal-demo',
100-
stack: 'shafeeqd959/stack-contentstack-nuxtjs-vue-universal-demo',
101-
},
102-
'nuxt-starter': {
103-
source: 'contentstack/contentstack-nuxtjs-starter-app',
104-
stack: 'contentstack/stack-starter-app',
105-
},
106-
'reactjs-starter': {
107-
source: 'contentstack/contentstack-react-starter-app',
108-
stack: 'contentstack/stack-starter-app',
109-
},
110-
'nextjs-starter': {
111-
source: 'contentstack/contentstack-nextjs-starter-app',
112-
stack: 'contentstack/stack-starter-app',
113-
},
114-
'gatsby-starter': {
115-
source: 'contentstack/contentstack-gatsby-starter-app',
116-
stack: 'contentstack/stack-starter-app',
117-
},
118-
'angular-starter': {
119-
source: 'contentstack/contentstack-angular-starter',
120-
stack: 'contentstack/stack-starter-app',
121-
},
122-
'vue-starter': {
123-
source: 'contentstack/contentstack-vuejs-starter-app',
124-
stack: 'contentstack/stack-starter-app',
125-
},
126-
'stencil-starter': {
127-
source: 'contentstack/contentstack-stencil-starter-app',
128-
stack: 'contentstack/stack-starter-app',
129-
},
130-
'nuxt3-starter': {
131-
source: 'contentstack/contentstack-nuxt3-starter-app',
132-
stack: 'contentstack/stack-starter-app',
133-
},
13468
},
13569
};
13670
export default config;

‎packages/contentstack-bootstrap/test/bootstrap.test.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ const mock = {
4747
preview_token: 'test-preview-token',
4848
},
4949
appConfig: {
50-
configKey: 'reactjs-starter',
51-
displayName: 'React.js Starter',
50+
configKey: 'kickstart-next',
51+
displayName: 'Kickstart Next.js',
5252
source: 'contentstack/stack-starter-app',
5353
stack: 'contentstack/stack-starter-app',
5454
master_locale: 'en-us',
@@ -159,10 +159,10 @@ describe('Bootstrapping an app', () => {
159159
});
160160
sandbox.stub(cliux, 'prompt').callsFake((question) => {
161161
const responses = {
162-
'app-name': 'reactjs-starter',
162+
'app-name': 'kickstart-next',
163163
org: 'org-uid',
164164
'stack-name': 'test-bootstrap-cmd',
165-
'app-type': 'reactjs-starter',
165+
'app-type': 'kickstart-next',
166166
yes: true,
167167
};
168168
return Promise.resolve(responses[question.name] || {});
@@ -654,7 +654,7 @@ describe('Bootstrapping an app', () => {
654654
// Track Bootstrap instantiation
655655
sandbox.stub(require('../lib/bootstrap/index'), 'default').callsFake(function (_options) {
656656
// Verify that appConfig was retrieved using app-name
657-
expect(config.getAppLevelConfigByName.calledWith('reactjs-starter')).to.be.true;
657+
expect(config.getAppLevelConfigByName.calledWith('kickstart-next')).to.be.true;
658658
return {
659659
run: sandbox.stub().resolves(),
660660
};
@@ -664,7 +664,7 @@ describe('Bootstrapping an app', () => {
664664
command.parse = sandbox.stub().resolves({
665665
flags: {
666666
alias: undefined,
667-
'app-name': 'reactjs-starter',
667+
'app-name': 'kickstart-next',
668668
'app-type': undefined,
669669
'project-dir': undefined,
670670
'stack-api-key': undefined,

0 commit comments

Comments
 (0)