Skip to content

Commit db8494d

Browse files
committed
refactor:resolved conflicts in sitecore code
1 parent 4c58171 commit db8494d

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22

3-
// eslint-disable-next-line @typescript-eslint/no-var-requires
43
const contentTypes = require('./libs/contenttypes.js');
54
// eslint-disable-next-line @typescript-eslint/no-var-requires
65
const ExtractConfiguration = require('./libs/configuration.js');
@@ -9,12 +8,12 @@ const reference = require('./libs/reference.js');
98
// eslint-disable-next-line @typescript-eslint/no-var-requires
109
const ExtractFiles = require('./libs/convert.js');
1110
// eslint-disable-next-line @typescript-eslint/no-var-requires
12-
const { findAndExtractLanguages } = require('./libs/extractLocales.js');
11+
const extractLocales = require('./libs/extractLocales.js');
1312

1413
module.exports = {
1514
contentTypes,
1615
ExtractConfiguration,
1716
reference,
1817
ExtractFiles,
19-
findAndExtractLanguages
18+
extractLocales
2019
};

upload-api/migration-sitecore/libs/extractLocales.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
22
const fs = require('fs');
3-
/* eslint-disable @typescript-eslint/no-var-requires */
43
const path = require('path');
54

65
const uniqueLanguages = new Set(); // Define uniqueLanguages globally or pass it as a parameter
76

8-
const findAndExtractLanguages = (dir) => {
7+
const extractLocales = (dir) => {
98
const items = fs.readdirSync(dir, { withFileTypes: true });
109

1110
for (const item of items) {
1211
const fullPath = path.join(dir, item.name);
1312

1413
if (item.isDirectory()) {
15-
findAndExtractLanguages(fullPath); // Proper recursion
14+
extractLocales(fullPath); // Proper recursion
1615
} else if (item.isFile() && item.name === 'data.json.json') {
1716
try {
1817
const rawData = fs.readFileSync(fullPath, 'utf8');
@@ -29,4 +28,5 @@ const findAndExtractLanguages = (dir) => {
2928
}
3029
return uniqueLanguages;
3130
};
32-
module.exports = findAndExtractLanguages;
31+
32+
module.exports = extractLocales;

0 commit comments

Comments
 (0)