Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/app/src/cli/utilities/app/config/getTomls.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import {AppConfigurationFileName, isValidFormatAppConfigurationFileName} from '../../../models/app/loader.js'
import {isDirectory} from '@shopify/cli-kit/node/fs'
import {isDirectory, readdir} from '@shopify/cli-kit/node/fs'
import {joinPath} from '@shopify/cli-kit/node/path'
import {TomlFile} from '@shopify/cli-kit/node/toml/toml-file'
import {readdirSync} from 'fs'

export async function getTomls(appDirectory?: string): Promise<{[clientId: string]: AppConfigurationFileName}> {
if (!appDirectory || !(await isDirectory(appDirectory))) {
Expand All @@ -11,7 +10,7 @@ export async function getTomls(appDirectory?: string): Promise<{[clientId: strin

const clientIds: {[key: string]: AppConfigurationFileName} = {}

const files = readdirSync(appDirectory)
const files = await readdir(appDirectory)
await Promise.all(
files.map(async (file) => {
if (isValidFormatAppConfigurationFileName(file)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {joinPath, basename} from '@shopify/cli-kit/node/path'
import {glob} from '@shopify/cli-kit/node/fs'
import {glob, fileSize, readFile} from '@shopify/cli-kit/node/fs'
import {AbortError, BugError} from '@shopify/cli-kit/node/error'
import fs from 'fs'

export async function loadLocalesConfig(extensionPath: string, extensionIdentifier: string) {
const localesPaths = await glob(joinPath(extensionPath, 'locales/*.json'))
Expand All @@ -24,13 +23,13 @@ export async function loadLocalesConfig(extensionPath: string, extensionIdentifi

// Locale validations
for (const locale of localesPaths) {
const size = fs.statSync(locale).size
const size = await fileSize(locale)
if (size === 0) throw new AbortError(`Error loading ${extensionIdentifier}`, `Locale file ${locale} can't be empty`)
}

return {
default_locale: defaultLanguageCode[0],
translations: getAllLocales(localesPaths),
translations: await getAllLocales(localesPaths),
}
}

Expand All @@ -39,12 +38,12 @@ function findDefaultLocale(filePaths: string[]) {
return defaultLocale.map((locale) => basename(locale).split('.')[0])
}

function getAllLocales(localesPath: string[]) {
async function getAllLocales(localesPath: string[]) {
const all: {[key: string]: string} = {}
for (const localePath of localesPath) {
const localeCode = failIfUnset(basename(localePath).split('.')[0], 'Locale code is unset')
const locale = fs.readFileSync(localePath, 'base64')
all[localeCode] = locale
const content = await readFile(localePath)
all[localeCode] = Buffer.from(content).toString('base64')
}
return all
}
Expand Down
Loading