repo sync

Author: Octomerger

lib/page.js

@@ -1,5 +1,5 @@
 const assert = require('assert')
-const fs = require('fs').promises
+const fs = require('fs')
 const path = require('path')
 const cheerio = require('cheerio')
 const patterns = require('./patterns')
@@ -23,30 +23,15 @@ const slash = require('slash')
 const statsd = require('./statsd')
 
 class Page {
-  static async init (opts) {
+  constructor (opts) {
     assert(opts.relativePath, 'relativePath is required')
     assert(opts.basePath, 'basePath is required')
-
-    const relativePath = slash(opts.relativePath)
-    const fullPath = slash(path.join(opts.basePath, relativePath))
-    const raw = await fs.readFile(fullPath, 'utf8')
-
-    return new Page({ ...opts, relativePath, fullPath, raw })
-  }
-
-  static async exists (path) {
-    try {
-      return await fs.stat(path)
-    } catch (err) {
-      if (err.code === 'ENOENT') return false
-      console.error(err)
-    }
-  }
-
-  constructor (opts) {
     assert(opts.languageCode, 'languageCode is required')
 
     Object.assign(this, { ...opts })
+    this.relativePath = slash(this.relativePath)
+    this.fullPath = slash(path.join(this.basePath, this.relativePath))
+    this.raw = fs.readFileSync(this.fullPath, 'utf8')
 
     // TODO remove this when crowdin-support issue 66 has been resolved
     if (this.languageCode !== 'en' && this.raw.includes(': verdadero')) {

lib/pages.js

@@ -2,50 +2,42 @@ const path = require('path')
 const walk = require('walk-sync').entries
 const Page = require('./page')
 const languages = require('./languages')
-const { mapLimit, filterLimit } = require('async')
-const FILE_READ_LIMIT = 500
+const fs = require('fs')
 
 async function loadPageList () {
   const pageList = []
 
   // load english pages
   const englishPath = path.join(__dirname, '..', languages.en.dir, 'content')
-  const englishPaths = walk(englishPath)
-    .filter(({ relativePath }) =>
-      relativePath.endsWith('.md') && !relativePath.includes('README')
-    )
-  const englishPages = await mapLimit(
-    englishPaths,
-    FILE_READ_LIMIT,
-    async fileData => await Page.init({ ...fileData, languageCode: languages.en.code })
-  )
+  const englishPages = walk(englishPath)
+    .filter(({ relativePath }) => {
+      return relativePath.endsWith('.md') &&
+      !relativePath.includes('README')
+    })
+    .map(fileData => new Page({ ...fileData, languageCode: languages.en.code }))
+
   pageList.push(...englishPages)
 
   // load matching pages in other languages
-  let localizedPaths = Object.values(languages)
-    .filter(({ code }) => code !== 'en')
-    .map(language => {
+  for (const page of englishPages) {
+    for (const language of Object.values(languages)) {
+      if (language.code === 'en') continue
+
       const basePath = path.join(__dirname, '..', language.dir, 'content')
-      return englishPages.map(page => ({
-        basePath,
+      const localizedPath = path.join(basePath, page.relativePath)
+      try {
+        fs.statSync(localizedPath)
+      } catch (_) {
+        continue
+      }
+
+      pageList.push(new Page({
         relativePath: page.relativePath,
-        localizedPath: path.join(basePath, page.relativePath),
+        basePath,
         languageCode: language.code
       }))
-    })
-    .flat()
-  localizedPaths = await filterLimit(
-    localizedPaths,
-    FILE_READ_LIMIT,
-    async ({ localizedPath }) => Page.exists(localizedPath)
-  )
-  const localizedPages = await mapLimit(
-    localizedPaths,
-    FILE_READ_LIMIT,
-    async ({ basePath, relativePath, languageCode }) =>
-      await Page.init({ basePath, relativePath, languageCode })
-  )
-  pageList.push(...localizedPages)
+    }
+  }
 
   return pageList
 }

tests/browser/browser.js

@@ -3,17 +3,13 @@ const sleep = require('await-sleep')
 const querystring = require('querystring')
 
 describe('homepage', () => {
-  jest.setTimeout(60 * 1000)
-
   test('should be titled "GitHub Documentation"', async () => {
     await page.goto('http://localhost:4001')
     await expect(page.title()).resolves.toMatch('GitHub Documentation')
   })
 })
 
 describe('algolia browser search', () => {
-  jest.setTimeout(60 * 1000)
-
   it('works on the homepage', async () => {
     await page.goto('http://localhost:4001/en')
     await page.click('#search-input-container input[type="search"]')

tests/content/crowdin-config.js

@@ -4,8 +4,6 @@ const ignoredPagePaths = config.files[0].ignore
 const ignoredDataPaths = config.files[2].ignore
 
 describe('crowdin.yml config file', () => {
-  jest.setTimeout(60 * 1000)
-
   let pages
   beforeAll(async (done) => {
     pages = await loadPages()

tests/content/site-data-references.js

@@ -7,8 +7,6 @@ const fs = require('fs').promises
 const path = require('path')
 
 describe('data references', () => {
-  jest.setTimeout(60 * 1000)
-
   let data, pages
 
   beforeAll(async (done) => {

tests/routing/redirects.js

@@ -17,17 +17,17 @@ describe('redirects', () => {
     done()
   })
 
-  test('page.redirects is an array', async () => {
-    const page = await Page.init({
+  test('page.redirects is an array', () => {
+    const page = new Page({
       relativePath: 'github/collaborating-with-issues-and-pull-requests/about-branches.md',
       basePath: path.join(__dirname, '../../content'),
       languageCode: 'en'
     })
     expect(isPlainObject(page.redirects)).toBe(true)
   })
 
-  test('dotcom homepage page.redirects', async () => {
-    const page = await Page.init({
+  test('dotcom homepage page.redirects', () => {
+    const page = new Page({
       relativePath: 'github/index.md',
       basePath: path.join(__dirname, '../../content'),
       languageCode: 'en'
@@ -41,7 +41,7 @@ describe('redirects', () => {
   })
 
   test('converts single `redirect_from` strings values into arrays', async () => {
-    const page = await Page.init({
+    const page = new Page({
       relativePath: 'github/collaborating-with-issues-and-pull-requests/about-conversations-on-github.md',
       basePath: path.join(__dirname, '../../content'),
       languageCode: 'en'

tests/unit/find-page.js

@@ -8,7 +8,7 @@ describe('find page', () => {
   jest.setTimeout(1000 * 1000)
 
   test('falls back to the English page if it can\'t find a localized page', async () => {
-    const page = await Page.init({
+    const page = new Page({
       relativePath: 'page-that-does-not-exist-in-translations-dir.md',
       basePath: path.join(__dirname, '../fixtures'),
       languageCode: 'en'
@@ -24,7 +24,7 @@ describe('find page', () => {
   })
 
   test('follows redirects', async () => {
-    const page = await Page.init({
+    const page = new Page({
       relativePath: 'page-with-redirects.md',
       basePath: path.join(__dirname, '../fixtures'),
       languageCode: 'en'

tests/unit/liquid-helpers.js

@@ -5,8 +5,6 @@ const { set } = require('lodash')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
 describe('liquid helper tags', () => {
-  jest.setTimeout(60 * 1000)
-
   const context = {}
   let pageMap
   beforeAll(async (done) => {