Skip to content

Commit f410fd1

Browse files
committed
Mostly reverting github/docs-internal#15313
1 parent ed3baeb commit f410fd1

19 files changed

+136
-283
lines changed

.env.example

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
ALGOLIA_API_KEY=
22
ALGOLIA_APPLICATION_ID=
33
ALLOW_TRANSLATION_COMMITS=
4-
EARLY_ACCESS_HOSTNAME=
5-
EARLY_ACCESS_SHARED_SECRET=
6-
GITHUB_TOKEN=

.github/workflows/test.yml

-7
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,3 @@ jobs:
127127
run: npx jest tests/${{ matrix.test-group }}/
128128
env:
129129
NODE_OPTIONS: "--max_old_space_size=4096"
130-
131-
- name: Send Slack notification if workflow fails
132-
uses: rtCamp/action-slack-notify@e17352feaf9aee300bf0ebc1dfbf467d80438815
133-
if: failure() && github.ref == 'early-access'
134-
env:
135-
SLACK_WEBHOOK: ${{ secrets.DOCS_ALERTS_SLACK_WEBHOOK }}
136-
SLACK_MESSAGE: "Tests are failing on the `early-access` branch. https://github.com/github/docs-internal/tree/early-access"

.gitignore

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
.algolia-cache
22
.DS_Store
33
.env
4-
node_modules
4+
/node_modules/
55
npm-debug.log
6-
coverage
7-
content/early-access
8-
content/early-access-test
6+
coverage/
7+
/assets/early-access/
8+
/content/early-access/
9+
/data/early-access/
910

1011
# blc: broken link checker
1112
blc_output.log
1213
blc_output_internal.log
13-
dist
14+
/dist/

crowdin.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ files:
1414
"data/reusables/README.md",
1515
"data/variables/product.yml",
1616
"data/variables/README.md",
17+
"data/early-access",
1718
"data/graphql",
1819
"data/products.yml"
19-
]
20+
]
2021

2122
# These end up as env vars used by the GitHub Actions workflow
2223
project_id_env: CROWDIN_PROJECT_ID

lib/fetch-early-access-paths.js

-33
This file was deleted.

lib/warm-server.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const fetchEarlyAccessPaths = require('./fetch-early-access-paths')
2-
let pages, site, redirects, siteTree, earlyAccessPaths
1+
let pages, site, redirects, siteTree
32

43
module.exports = async function warmServer () {
54
if (!pages) {
@@ -8,17 +7,16 @@ module.exports = async function warmServer () {
87
}
98

109
// Promise.all is used to load multiple things in parallel
11-
;[pages, site, earlyAccessPaths] = await Promise.all([
10+
;[pages, site] = await Promise.all([
1211
require('./pages')(),
13-
require('./site-data')(),
14-
fetchEarlyAccessPaths()
12+
require('./site-data')()
1513
])
1614

1715
redirects = await require('./redirects/precompile')(pages)
1816
siteTree = await require('./site-tree')(pages, site, redirects)
1917
}
2018

2119
return {
22-
pages, site, redirects, siteTree, earlyAccessPaths
20+
pages, site, redirects, siteTree
2321
}
2422
}

middleware/context.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const featureFlags = Object.keys(require('../feature-flags'))
1212
// Note that additional middleware in middleware/index.js adds to this context object
1313
module.exports = async function contextualize (req, res, next) {
1414
// Ensure that we load some data only once on first request
15-
const { site, redirects, pages, siteTree, earlyAccessPaths } = await warmServer()
15+
const { site, redirects, pages, siteTree } = await warmServer()
1616
req.context = {}
1717

1818
// make feature flag environment variables accessible in layouts
@@ -33,7 +33,6 @@ module.exports = async function contextualize (req, res, next) {
3333
req.context.currentPath = req.path
3434
req.context.query = req.query
3535
req.context.languages = languages
36-
req.context.earlyAccessPaths = earlyAccessPaths
3736
req.context.productNames = productNames
3837
req.context.enterpriseServerReleases = enterpriseServerReleases
3938
req.context.enterpriseServerVersions = Object.keys(allVersions).filter(version => version.startsWith('enterprise-server@'))

middleware/early-access-paths.js

-33
This file was deleted.

middleware/early-access-proxy.js

-25
This file was deleted.

middleware/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ module.exports = function (app) {
4040
app.use(require('./detect-language'))
4141
app.use(asyncMiddleware(require('./context')))
4242
app.use('/csrf', require('./csrf-route'))
43-
app.use(require('./early-access-paths'))
44-
app.use(require('./early-access-proxy'))
4543
app.use(require('./find-page'))
4644
app.use(require('./notices'))
4745
app.use(require('./archived-enterprise-versions'))
@@ -56,6 +54,7 @@ module.exports = function (app) {
5654
app.use(require('./contextualizers/webhooks'))
5755
app.use(require('./disable-caching-on-safari'))
5856
app.get('/_500', asyncMiddleware(require('./trigger-error')))
57+
app.get('/hidden', require('./list-hidden-pages'))
5958
app.use(require('./breadcrumbs'))
6059
app.use(require('./featured-links'))
6160
app.get('/*', asyncMiddleware(require('./render-page')))

middleware/list-hidden-pages.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
module.exports = async function listHidden (req, res, next) {
2+
if (process.env.NODE_ENV === 'production') {
3+
return res.status(403).end()
4+
}
5+
6+
const hiddenPages = req.context.pages.filter(page => page.hidden)
7+
let urls = []
8+
9+
hiddenPages.forEach(page => {
10+
const pageUrls = page.permalinks.map(permalink => permalink.href)
11+
urls = urls.concat(pageUrls)
12+
})
13+
14+
const output = `
15+
<ul>
16+
${urls.map(url => `<li><a href="${url}">${url}</li>`).join('\n')}
17+
</ul>
18+
`
19+
20+
return res.send(output)
21+
}

middleware/render-page.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const { get } = require('lodash')
2-
const env = require('lil-env-thing')
32
const { liquid } = require('../lib/render-content')
43
const patterns = require('../lib/patterns')
54
const layouts = require('../lib/layouts')
@@ -64,7 +63,7 @@ module.exports = async function renderPage (req, res, next) {
6463
}
6564

6665
// `?json` query param for debugging request context
67-
if ('json' in req.query && !env.production) {
66+
if ('json' in req.query && process.env.NODE_ENV !== 'production') {
6867
if (req.query.json.length > 1) {
6968
// deep reference: ?json=page.permalinks
7069
return res.json(get(context, req.query.json))

package-lock.json

+12-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"is-url": "^1.2.4",
5050
"js-cookie": "^2.2.1",
5151
"js-yaml": "^3.14.0",
52-
"lil-env-thing": "^1.0.0",
5352
"liquid": "^5.1.0",
5453
"lodash": "^4.17.19",
5554
"mini-css-extract-plugin": "^0.9.0",

0 commit comments

Comments
 (0)