Skip to content

Commit a92d820

Browse files
authored
Remove remaining JSON requires (github#20110)
* Remove remaining JSON requires * Lint * Update feature-flags.js
1 parent 6f4439a commit a92d820

File tree

21 files changed

+63
-34
lines changed

21 files changed

+63
-34
lines changed

lib/feature-flags.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const featureFlags = require('../feature-flags')
1+
const readJsonFile = require('./read-json-file')
2+
const featureFlags = readJsonFile('./feature-flags.json')
23

34
// add feature flags as environment variables
45
Object.entries(featureFlags).forEach(([feature, value]) => {

lib/read-json-file.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const fs = require('fs')
2+
const path = require('path')
3+
4+
module.exports = function readJsonFile (xpath) {
5+
return JSON.parse(
6+
fs.readFileSync(
7+
path.join(
8+
process.cwd(),
9+
xpath
10+
),
11+
'utf8'
12+
)
13+
)
14+
}

lib/redirects/precompile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const developerRedirects = require('../redirects/static/developer')
1+
const readJsonFile = require('../read-json-file')
2+
const developerRedirects = readJsonFile('./lib/redirects/static/developer.json')
23
const { latest } = require('../../lib/enterprise-server-releases')
34
const latestDevRedirects = {}
45

lib/render-content/plugins/rewrite-local-links.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
const path = require('path')
22
const visit = require('unist-util-visit')
3-
const externalRedirects = Object.keys(require('../../redirects/external-sites'))
43
const { getPathWithoutLanguage, getVersionStringFromPath } = require('../../path-utils')
54
const { getNewVersionedPath } = require('../../old-versions-utils')
65
const patterns = require('../../patterns')
76
const { deprecated, latest } = require('../../enterprise-server-releases')
87
const nonEnterpriseDefaultVersion = require('../../non-enterprise-default-version')
98
const allVersions = require('../../all-versions')
9+
const removeFPTFromPath = require('../../remove-fpt-from-path')
1010
const supportedVersions = Object.keys(allVersions)
1111
const supportedPlans = Object.values(allVersions).map(v => v.plan)
12-
const removeFPTFromPath = require('../../remove-fpt-from-path')
12+
const readJsonFile = require('../../read-json-file')
13+
const externalRedirects = Object.keys(readJsonFile('./lib/redirects/external-sites.json'))
14+
1315

1416
// Matches any <a> tags with an href that starts with `/`
1517
const matcher = node => (

lib/rewrite-local-links.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
const assert = require('assert')
22
const path = require('path')
3-
const externalRedirects = Object.keys(require('./redirects/external-sites'))
43
const { getPathWithoutLanguage, getVersionStringFromPath } = require('./path-utils')
54
const { getNewVersionedPath } = require('./old-versions-utils')
65
const patterns = require('./patterns')
@@ -10,6 +9,8 @@ const allVersions = require('./all-versions')
109
const supportedVersions = Object.keys(allVersions)
1110
const supportedPlans = Object.values(allVersions).map(v => v.plan)
1211
const removeFPTFromPath = require('./remove-fpt-from-path')
12+
const readJsonFile = require('./read-json-file')
13+
const externalRedirects = readJsonFile('./lib/redirects/external-sites.json')
1314

1415
// Content authors write links like `/some/article/path`, but they need to be
1516
// rewritten on the fly to match the current language and page version

lib/search/algolia-search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const algoliasearch = require('algoliasearch')
22
const { get } = require('lodash')
3-
const { namePrefix } = require('./config')
3+
const { namePrefix } = require('./config.js')
44

55
// https://www.algolia.com/apps/ZI5KPY1HBE/dashboard
66
// This API key is public. There's also a private API key for writing to the Algolia API

lib/search/lunr-search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require('lunr-languages/lunr.pt')(lunr)
88
require('lunr-languages/lunr.de')(lunr)
99
const { get } = require('lodash')
1010
const readFileAsync = require('../readfile-async')
11-
const { namePrefix } = require('./config')
11+
const { namePrefix } = require('./config.js')
1212
const { decompress } = require('./compress')
1313

1414
const LUNR_DIR = './indexes'

middleware/archived-enterprise-versions.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ const patterns = require('../lib/patterns')
55
const versionSatisfiesRange = require('../lib/version-satisfies-range')
66
const isArchivedVersion = require('../lib/is-archived-version')
77
const got = require('got')
8-
const archvivedRedirects = require('../lib/redirects/static/archived-redirects-from-213-to-217')
9-
const archivedFrontmatterFallbacks = require('../lib/redirects/static/archived-frontmatter-fallbacks')
8+
const readJsonFile = require('../lib/read-json-file')
9+
const archvivedRedirects = readJsonFile('./lib/redirects/static/archived-redirects-from-213-to-217.json')
10+
const archivedFrontmatterFallbacks = readJsonFile('./lib/redirects/static/archived-frontmatter-fallbacks.json')
1011

1112
// This module handles requests for deprecated GitHub Enterprise versions
1213
// by routing them to static content in help-docs-archived-enterprise-versions

middleware/context.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ const {
1111
} = require('../lib/path-utils')
1212
const productNames = require('../lib/product-names')
1313
const warmServer = require('../lib/warm-server')
14-
const featureFlags = Object.keys(require('../feature-flags'))
14+
const readJsonFile = require('../lib/read-json-file')
15+
const featureFlags = Object.keys(readJsonFile('./feature-flags.json'))
1516
const builtAssets = require('../lib/built-asset-urls')
1617
const searchVersions = require('../lib/search/versions')
1718
const nonEnterpriseDefaultVersion = require('../lib/non-enterprise-default-version')

middleware/contextualizers/graphql.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
const fs = require('fs')
22
const path = require('path')
3-
const previews = require('../../lib/graphql/static/previews')
4-
const upcomingChanges = require('../../lib/graphql/static/upcoming-changes')
5-
const changelog = require('../../lib/graphql/static/changelog')
6-
const prerenderedObjects = require('../../lib/graphql/static/prerendered-objects')
7-
const prerenderedInputObjects = require('../../lib/graphql/static/prerendered-input-objects')
3+
const readJsonFile = require('../../lib/read-json-file')
4+
const previews = readJsonFile('./lib/graphql/static/previews.json')
5+
const upcomingChanges = readJsonFile('./lib/graphql/static/upcoming-changes.json')
6+
const changelog = readJsonFile('./lib/graphql/static/changelog.json')
7+
const prerenderedObjects = readJsonFile('./lib/graphql/static/prerendered-objects.json')
8+
const prerenderedInputObjects = readJsonFile('./lib/graphql/static/prerendered-input-objects.json')
89
const allVersions = require('../../lib/all-versions')
910

1011
const explorerUrl = process.env.NODE_ENV === 'production'

0 commit comments

Comments
 (0)