diff --git a/config/scripts.yaml b/config/scripts.yaml index 6db5df79cd4..51dfe2782dd 100644 --- a/config/scripts.yaml +++ b/config/scripts.yaml @@ -68,7 +68,8 @@ dev: develop: *nextDev i18n: "SITE=dev node ../shared/prebuild/i18n-only.mjs" lint: &nextLint 'next lint' - prebuild: 'SITE=dev node --experimental-json-modules ../shared/prebuild/index.mjs' + buildsitedeps: &buildsitedeps 'cd ../../ && yarn buildall && cd -' + prebuild: 'yarn buildsitedeps && SITE=dev node --experimental-json-modules ../shared/prebuild/index.mjs' serve: "pm2 start npm --name 'dev' -- run start" start: &nextStart 'yarn prebuild && yarn dev' @@ -84,7 +85,8 @@ lab: develop: *nextDev e2e: &e2e 'yarn playwright test' lint: *nextLint - prebuild: 'SITE=lab node --experimental-json-modules ../shared/prebuild/index.mjs' + buildsitedeps: *buildsitedeps + prebuild: 'yarn buildsitedeps && SITE=lab node --experimental-json-modules ../shared/prebuild/index.mjs' start: *nextStart org: @@ -95,7 +97,8 @@ org: develop: *nextDev i18n: 'SITE=org node ../shared/prebuild/i18n-only.mjs' lint: *nextLint - prebuild: 'SITE=org node --experimental-json-modules ../shared/prebuild/index.mjs' + buildsitedeps: *buildsitedeps + prebuild: 'yarn buildsitedeps && SITE=org node --experimental-json-modules ../shared/prebuild/index.mjs' start: *nextStart sanity: diff --git a/sites/dev/package.json b/sites/dev/package.json index 0f72ca5d3a8..48c026857ee 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -21,7 +21,8 @@ "develop": "next dev -p 8000", "i18n": "SITE=dev node ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "prebuild": "SITE=dev node --experimental-json-modules ../shared/prebuild/index.mjs", + "buildsitedeps": "cd ../../ && yarn buildall && cd -", + "prebuild": "yarn buildsitedeps && SITE=dev node --experimental-json-modules ../shared/prebuild/index.mjs", "serve": "pm2 start npm --name 'dev' -- run start", "start": "yarn prebuild && yarn dev" }, diff --git a/sites/lab/package.json b/sites/lab/package.json index ac4ac5f2e3c..c9334314063 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -21,7 +21,8 @@ "develop": "next dev -p 8000", "e2e": "yarn playwright test", "lint": "next lint", - "prebuild": "SITE=lab node --experimental-json-modules ../shared/prebuild/index.mjs", + "buildsitedeps": "cd ../../ && yarn buildall && cd -", + "prebuild": "yarn buildsitedeps && SITE=lab node --experimental-json-modules ../shared/prebuild/index.mjs", "start": "yarn prebuild && yarn dev" }, "peerDependencies": {}, diff --git a/sites/org/package.json b/sites/org/package.json index 9175e1f4822..42d76a87358 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -21,7 +21,8 @@ "develop": "next dev -p 8000", "i18n": "SITE=org node ../shared/prebuild/i18n-only.mjs", "lint": "next lint", - "prebuild": "SITE=org node --experimental-json-modules ../shared/prebuild/index.mjs", + "buildsitedeps": "cd ../../ && yarn buildall && cd -", + "prebuild": "yarn buildsitedeps && SITE=org node --experimental-json-modules ../shared/prebuild/index.mjs", "start": "yarn prebuild && yarn dev" }, "peerDependencies": {}, diff --git a/sites/shared/prebuild/docs.mjs b/sites/shared/prebuild/docs.mjs index e4ba1f9c56f..72cdac07551 100644 --- a/sites/shared/prebuild/docs.mjs +++ b/sites/shared/prebuild/docs.mjs @@ -89,25 +89,17 @@ export const fileToSlug = (file, site, lang) => export const prebuildDocs = async (site) => { // Say hi console.log() - console.log(`Prebuilding docs pages for freesewing.${site}`) + console.log(`Compiling list of docs pages for freesewing.${site}`) // Setup MDX root path - const root = ['..', '..', 'markdown', site] if (site === 'org') root.push('docs') const mdxRoot = path.resolve(...root) - // Load page template - const template = fs.readFileSync( - path.resolve('..', 'shared', 'page-templates', `docs.${site}.mjs.mustache`), - 'utf-8' - ) - // Languages const locales = site === 'dev' ? ['en'] : ['en', 'fr', 'es', 'nl', 'de'] const pages = {} - // Loop over languages for (const lang of locales) { pages[lang] = {} @@ -136,25 +128,6 @@ export const prebuildDocs = async (site) => { // Create og image await generateOgImage({ lang, site, slug, title: meta.data.title, intro: intros[lang] }) } - - // Things to only do for English - if (lang === 'en') { - // Write page to disk - const dir = path.resolve('..', site, 'pages', ...slug.split('/')) - fs.mkdirSync(dir, { recursive: true }) - fs.writeFileSync( - path.resolve(dir, `index.mjs`), - mustache.render(template, { - slug, - slugArray: JSON.stringify(slug.split('/')), - introEN: intros.en || 'fixme', - introES: intros.es || 'fixme', - introDE: intros.de || 'fixme', - introFR: intros.fr || 'fixme', - introNL: intros.nl || 'fixme', - }) - ) - } } }