Skip to content

Commit bd52b7f

Browse files
committed
variable update
1 parent c24e036 commit bd52b7f

File tree

50 files changed

+210
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+210
-210
lines changed

package-lock.json

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

packages/contentstack-audit/src/audit-base-command.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { v4 as uuid } from 'uuid';
55
import isEmpty from 'lodash/isEmpty';
66
import { join, resolve } from 'path';
77
import cloneDeep from 'lodash/cloneDeep';
8-
import { cliux, sanitizepath, ux } from '@contentstack/cli-utilities';
8+
import { cliux, sanitizePath, ux } from '@contentstack/cli-utilities';
99
import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from 'fs';
1010

1111
import config from './config';
@@ -396,7 +396,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
396396
}
397397

398398
// NOTE write int json
399-
writeFileSync(join(sanitizepath(this.sharedConfig.reportPath), `${sanitizepath(moduleName)}.json`), JSON.stringify(listOfMissingRefs));
399+
writeFileSync(join(sanitizePath(this.sharedConfig.reportPath), `${sanitizePath(moduleName)}.json`), JSON.stringify(listOfMissingRefs));
400400

401401
// NOTE write into CSV
402402
return this.prepareCSV(moduleName, listOfMissingRefs);
@@ -417,7 +417,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
417417
listOfMissingRefs: Record<string, any>,
418418
): Promise<void> {
419419
if(Object.keys(config.moduleConfig).includes(moduleName)){
420-
const csvPath = join(sanitizepath(this.sharedConfig.reportPath), `${sanitizepath(moduleName)}.csv`);
420+
const csvPath = join(sanitizePath(this.sharedConfig.reportPath), `${sanitizePath(moduleName)}.csv`);
421421
return new Promise<void>((resolve, reject) => {
422422
// file deepcode ignore MissingClose: Will auto close once csv stream end
423423
const ws = createWriteStream(csvPath).on('error', reject);

packages/contentstack-audit/src/modules/content-types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import isEmpty from 'lodash/isEmpty';
44
import { join, resolve } from 'path';
55
import { existsSync, readFileSync, writeFileSync } from 'fs';
66

7-
import { sanitizepath, ux } from '@contentstack/cli-utilities';
7+
import { sanitizePath, ux } from '@contentstack/cli-utilities';
88

99
import {
1010
LogFn,
@@ -53,7 +53,7 @@ export default class ContentType {
5353
this.gfSchema = gfSchema;
5454
this.moduleName = this.validateModules(moduleName!,this.config.moduleConfig);
5555
this.fileName = config.moduleConfig[this.moduleName].fileName;
56-
this.folderPath = resolve(sanitizepath(config.basePath), sanitizepath(config.moduleConfig[this.moduleName].dirName));
56+
this.folderPath = resolve(sanitizePath(config.basePath), sanitizePath(config.moduleConfig[this.moduleName].dirName));
5757
}
5858

5959
validateModules(moduleName:keyof typeof auditConfig.moduleConfig, moduleConfig: Record<string, unknown>):keyof typeof auditConfig.moduleConfig {

packages/contentstack-audit/src/modules/entries.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import find from 'lodash/find';
33
import values from 'lodash/values';
44
import isEmpty from 'lodash/isEmpty';
55
import { join, resolve } from 'path';
6-
import { ux, FsUtility, sanitizepath } from '@contentstack/cli-utilities';
6+
import { ux, FsUtility, sanitizePath } from '@contentstack/cli-utilities';
77
import { existsSync, readFileSync, writeFileSync } from 'fs';
88

99
import auditConfig from '../config';
@@ -69,7 +69,7 @@ export default class Entries {
6969
this.gfSchema = gfSchema;
7070
this.moduleName = this.validateModules(moduleName!,this.config.moduleConfig);
7171
this.fileName = config.moduleConfig[this.moduleName].fileName;
72-
this.folderPath = resolve(sanitizepath(config.basePath), sanitizepath(config.moduleConfig.entries.dirName));
72+
this.folderPath = resolve(sanitizePath(config.basePath), sanitizePath(config.moduleConfig.entries.dirName));
7373
}
7474

7575
validateModules(moduleName:keyof typeof auditConfig.moduleConfig, moduleConfig: Record<string, unknown>):keyof typeof auditConfig.moduleConfig {

packages/contentstack-audit/src/modules/extensions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path, { join, resolve } from 'path';
22
import { existsSync, readFileSync, writeFileSync } from 'fs';
33
import { cloneDeep } from 'lodash';
44
import { LogFn, ConfigType, ContentTypeStruct, CtConstructorParam, ModuleConstructorParam, Extension } from '../types';
5-
import { ux, sanitizepath } from '@contentstack/cli-utilities';
5+
import { ux, sanitizePath } from '@contentstack/cli-utilities';
66

77
import auditConfig from '../config';
88
import { $t, auditMsg, commonMsg } from '../messages';
@@ -36,7 +36,7 @@ export default class Extensions {
3636
this.extensionsSchema = [];
3737
this.moduleName = this.validateModules(moduleName!,this.config.moduleConfig);
3838
this.fileName = config.moduleConfig[this.moduleName].fileName;
39-
this.folderPath = resolve(sanitizepath(config.basePath), sanitizepath(config.moduleConfig[this.moduleName].dirName));
39+
this.folderPath = resolve(sanitizePath(config.basePath), sanitizePath(config.moduleConfig[this.moduleName].dirName));
4040
this.ctUidSet = new Set(['$all']);
4141
this.missingCtInExtensions = [];
4242
this.missingCts = new Set();

packages/contentstack-audit/src/modules/workflows.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { join, resolve } from 'path';
22
import { existsSync, readFileSync, writeFileSync } from 'fs';
33
import { cloneDeep } from 'lodash';
44
import { LogFn, ConfigType, ContentTypeStruct, CtConstructorParam, ModuleConstructorParam, Workflow } from '../types';
5-
import { sanitizepath, ux } from '@contentstack/cli-utilities';
5+
import { sanitizePath, ux } from '@contentstack/cli-utilities';
66

77
import auditConfig from '../config';
88
import { $t, auditMsg, commonMsg } from '../messages';
@@ -37,7 +37,7 @@ export default class Workflows {
3737
this.workflowSchema = [];
3838
this.moduleName = this.validateModules(moduleName!,this.config.moduleConfig);
3939
this.fileName = config.moduleConfig[this.moduleName].fileName;
40-
this.folderPath = resolve(sanitizepath(config.basePath), sanitizepath(config.moduleConfig[this.moduleName].dirName));
40+
this.folderPath = resolve(sanitizePath(config.basePath), sanitizePath(config.moduleConfig[this.moduleName].dirName));
4141
this.ctUidSet = new Set(['$all']);
4242
this.missingCtInWorkflows = [];
4343
this.missingCts = new Set();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as path from 'path';
2-
import { cliux, sanitizepath } from '@contentstack/cli-utilities';
2+
import { cliux, sanitizePath } from '@contentstack/cli-utilities';
33
import { default as ContentStackSeed } from '@contentstack/cli-cm-seed/lib/commands/cm/stacks/seed';
44

55
import { AppConfig } from '../config';
@@ -58,7 +58,7 @@ export default class Bootstrap {
5858
if (options.appConfig.branch) {
5959
this.repo.branch = options.appConfig.branch;
6060
}
61-
this.cloneDirectory = path.join(sanitizepath(options.cloneDirectory), sanitizepath(this.repo.name));
61+
this.cloneDirectory = path.join(sanitizePath(options.cloneDirectory), sanitizePath(this.repo.name));
6262
this.ghClient = new GitHubClient(this.repo, options.appConfig.private, options.accessToken);
6363
this.options = options;
6464
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as fs from 'fs';
22
import * as path from 'path';
3-
import { cliux, pathValidator, sanitizepath } from '@contentstack/cli-utilities';
3+
import { cliux, pathValidator, sanitizePath } from '@contentstack/cli-utilities';
44
import { continueBootstrapCommand } from '../bootstrap/interactive';
55
import { AppConfig } from '../config';
66
import messageHandler from '../messages';
@@ -154,7 +154,7 @@ const envFileHandler = async (
154154
case 'reactjs':
155155
case 'reactjs-starter':
156156
fileName = `.env.${environmentVariables.environment}.local`;
157-
filePath = pathValidator(path.join(sanitizepath(clonedDirectory), sanitizepath(fileName)));
157+
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
158158
content = `REACT_APP_CONTENTSTACK_API_KEY=${
159159
environmentVariables.api_key
160160
}\nREACT_APP_CONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken}${
@@ -173,7 +173,7 @@ const envFileHandler = async (
173173
case 'nextjs':
174174
case 'nextjs-starter':
175175
fileName = `.env.${environmentVariables.environment}.local`;
176-
filePath = pathValidator(path.join(sanitizepath(clonedDirectory), sanitizepath(fileName)));
176+
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
177177
content = `CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nCONTENTSTACK_DELIVERY_TOKEN=${
178178
environmentVariables.deliveryToken
179179
}\n${
@@ -192,7 +192,7 @@ const envFileHandler = async (
192192
case 'gatsby':
193193
case 'gatsby-starter':
194194
fileName = `.env.${environmentVariables.environment}`;
195-
filePath = pathValidator(path.join(sanitizepath(clonedDirectory), sanitizepath(fileName)));
195+
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
196196
content = `CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nCONTENTSTACK_DELIVERY_TOKEN=${
197197
environmentVariables.deliveryToken
198198
}\n${
@@ -221,7 +221,7 @@ const envFileHandler = async (
221221
!isUSRegion && !customHost ? `,\n\t\tregion: '${region.name}'` : ''
222222
} \n\t } \n };`;
223223
fileName = `.env${environmentVariables.environment === 'production' ? '.prod' : ''}`;
224-
filePath = pathValidator(path.join(sanitizepath(clonedDirectory), 'src', 'environments', sanitizepath(fileName)));
224+
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), 'src', 'environments', sanitizePath(fileName)));
225225
result = await writeEnvFile(content, filePath);
226226
break;
227227
case 'angular-starter':
@@ -239,15 +239,15 @@ const envFileHandler = async (
239239
!isUSRegion && !customHost ? '\nCONTENTSTACK_REGION=' + region.name : ''
240240
}\nCONTENTSTACK_LIVE_PREVIEW=${livePreviewEnabled}\nCONTENTSTACK_LIVE_EDIT_TAGS=false`;
241241
fileName = `.env${environmentVariables.environment === 'production' ? '.prod' : ''}`;
242-
filePath = pathValidator(path.join(sanitizepath(clonedDirectory), sanitizepath(fileName)));
242+
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
243243
result = await writeEnvFile(content, filePath);
244244
break;
245245
case 'nuxtjs':
246246
case 'nuxt-starter':
247247
case 'nuxt3-starter':
248248
case 'stencil-starter':
249249
fileName = production ? '.env.production' : '.env';
250-
filePath = pathValidator(path.join(sanitizepath(clonedDirectory), sanitizepath(fileName)));
250+
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
251251
// 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.
252252
content = `CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nCONTENTSTACK_DELIVERY_TOKEN=${
253253
environmentVariables.deliveryToken
@@ -266,7 +266,7 @@ const envFileHandler = async (
266266
break;
267267
case 'vue-starter':
268268
fileName = '.env';
269-
filePath = pathValidator(path.join(sanitizepath(clonedDirectory), sanitizepath(fileName)));
269+
filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
270270
content = `VUE_APP_CONTENTSTACK_API_KEY=${environmentVariables.api_key}\nVUE_APP_CONTENTSTACK_DELIVERY_TOKEN=${
271271
environmentVariables.deliveryToken
272272
}\n${

packages/contentstack-branches/src/utils/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import fs from 'fs';
55
import path from 'path';
66
import forEach from 'lodash/forEach'
7-
import { configHandler, cliux, messageHandler, sanitizepath } from '@contentstack/cli-utilities';
7+
import { configHandler, cliux, messageHandler, sanitizePath } from '@contentstack/cli-utilities';
88
import { MergeParams } from '../interfaces';
99

1010
export const getbranchesList = (branchResult, baseBranch: string) => {
@@ -40,7 +40,7 @@ export const refreshbranchConfig = async (apiKey, branchUid) => {
4040
export const writeFile = (filePath, data) => {
4141
return new Promise((resolve, reject) => {
4242
data = typeof data === 'object' ? JSON.stringify(data, null, 2) : data || '{}';
43-
fs.writeFile(path.resolve(sanitizepath(filePath)), data, (error) => {
43+
fs.writeFile(path.resolve(sanitizePath(filePath)), data, (error) => {
4444
if (error) {
4545
return reject(error);
4646
}
@@ -52,7 +52,7 @@ export const writeFile = (filePath, data) => {
5252
// by default file type is json
5353
export const readFile = (filePath, options = { type: 'json' }) => {
5454
return new Promise((resolve, reject) => {
55-
filePath = path.resolve(sanitizepath(filePath));
55+
filePath = path.resolve(sanitizePath(filePath));
5656
fs.readFile(filePath, 'utf-8', (error, data) => {
5757
if (error) {
5858
reject(error);

packages/contentstack-bulk-publish/copyLogs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const path = require('path');
44
const logFileDir = 'logs';
55
const dummyDir = 'test/dummy/';
66

7-
import { sanitizepath } from '@contentstack/cli-utilities';
7+
import { sanitizePath } from '@contentstack/cli-utilities';
88

99
if (!fs.existsSync(path.join(__dirname, logFileDir))) {
1010
fs.mkdirSync(path.join(__dirname, logFileDir));
@@ -32,5 +32,5 @@ const logs = [
3232
];
3333

3434
logs.forEach((element) => {
35-
fs.createReadStream(path.join(__dirname, dummyDir, sanitizepath(element))).pipe(fs.createWriteStream(path.join(__dirname, logFileDir, sanitizepath(element))));
35+
fs.createReadStream(path.join(__dirname, dummyDir, sanitizePath(element))).pipe(fs.createWriteStream(path.join(__dirname, logFileDir, sanitizePath(element))));
3636
});

0 commit comments

Comments
 (0)