Skip to content

Commit d4f345e

Browse files
heiskrheiskr
authored
Move files out of lib/ (#45506)
1 parent bea0299 commit d4f345e

File tree

155 files changed

+186
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+186
-184
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RUN npm prune --production
4545
FROM all_deps as builder
4646

4747
COPY components ./components
48-
COPY lib ./lib
4948
COPY src ./src
5049
# The star is because it's an optional directory
5150
COPY .remotejson-cache* ./.remotejson-cache
@@ -88,7 +87,6 @@ ENV BUILD_SHA=$BUILD_SHA
8887
COPY --chown=node:node package.json ./
8988
COPY --chown=node:node assets ./assets
9089
COPY --chown=node:node content ./content
91-
COPY --chown=node:node lib ./lib
9290
COPY --chown=node:node src ./src
9391
COPY --chown=node:node .remotejson-cache* ./.remotejson-cache
9492
COPY --chown=node:node middleware ./middleware
@@ -107,7 +105,7 @@ CMD ["node", "server.js"]
107105
FROM preview as production
108106

109107
# Override what was set for previews
110-
# Make this match the default of `Object.keys(languages)` in lib/languages.js
108+
# Make this match the default of `Object.keys(languages)` in src/languages/lib/languages.js
111109
ENV ENABLED_LANGUAGES "en,zh,es,pt,ru,ja,fr,de,ko"
112110

113111
# Copy in all translations

‎middleware/block-robots.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { productMap } from '../lib/all-products.js'
1+
import { productMap } from '#src/products/lib/all-products.js'
22
import { deprecated } from '#src/versions/lib/enterprise-server-releases.js'
33

44
const pathRegExps = [

‎middleware/context.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import languages from '#src/languages/lib/languages.js'
22
import enterpriseServerReleases from '#src/versions/lib/enterprise-server-releases.js'
33
import { allVersions } from '#src/versions/lib/all-versions.js'
4-
import { productMap } from '../lib/all-products.js'
4+
import { productMap } from '#src/products/lib/all-products.js'
55
import {
66
getVersionStringFromPath,
77
getProductStringFromPath,
88
getCategoryStringFromPath,
99
getPathWithoutLanguage,
1010
getPathWithoutVersion,
11-
} from '../lib/path-utils.js'
12-
import productNames from '../lib/product-names.js'
13-
import warmServer from '../lib/warm-server.js'
11+
} from '#src/frame/lib/path-utils.js'
12+
import productNames from '#src/products/lib/product-names.js'
13+
import warmServer from '#src/frame/lib/warm-server.js'
1414
import searchVersions from '#src/search/lib/versions.js'
1515
import nonEnterpriseDefaultVersion from '#src/versions/lib/non-enterprise-default-version.js'
16-
import { getDataByLanguage, getUIDataMerged } from '../lib/get-data.js'
16+
import { getDataByLanguage, getUIDataMerged } from '#src/data-directory/lib/get-data.js'
1717

1818
// This doesn't change just because the request changes, so compute it once.
1919
const enterpriseServerVersions = Object.keys(allVersions).filter((version) =>

‎middleware/contextualizers/current-product-tree.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import path from 'path'
22
import { liquid } from '#src/content-render/index.js'
3-
import findPageInSiteTree from '../../lib/find-page-in-site-tree.js'
3+
import findPageInSiteTree from '#src/frame/lib/find-page-in-site-tree.js'
44
import removeFPTFromPath from '#src/versions/lib/remove-fpt-from-path.js'
5-
import { executeWithFallback } from '../../lib/render-with-fallback.js'
5+
import { executeWithFallback } from '#src/languages/lib/render-with-fallback.js'
66

77
// This module adds currentProductTree to the context object for use in layouts.
88
export default async function currentProductTree(req, res, next) {

‎middleware/contextualizers/generic-toc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import findPageInSiteTree from '../../lib/find-page-in-site-tree.js'
1+
import findPageInSiteTree from '#src/frame/lib/find-page-in-site-tree.js'
22

33
// This module adds either flatTocItems or nestedTocItems to the context object for
44
// product, categorie, and map topic TOCs that don't have other layouts specified.

‎middleware/contextualizers/glossaries.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { getDataByLanguage } from '../../lib/get-data.js'
1+
import { getDataByLanguage } from '#src/data-directory/lib/get-data.js'
22
import { liquid } from '#src/content-render/index.js'
3-
import { executeWithFallback } from '../../lib/render-with-fallback.js'
4-
import { correctTranslatedContentStrings } from '../../lib/correct-translation-content.js'
3+
import { executeWithFallback } from '#src/languages/lib/render-with-fallback.js'
4+
import { correctTranslatedContentStrings } from '#src/languages/lib/correct-translation-content.js'
55

66
export default async function glossaries(req, res, next) {
77
if (!req.pagePath.endsWith('get-started/quickstart/github-glossary')) return next()

‎middleware/contextualizers/product-examples.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getDataByLanguage } from '../../lib/get-data.js'
1+
import { getDataByLanguage } from '#src/data-directory/lib/get-data.js'
22

33
function getProductExampleData(product, key, language) {
44
// Because getDataByLanguage() depends on reading data files from

‎middleware/contextualizers/product-groups.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { getProductGroups } from '../../lib/get-product-groups.js'
2-
import warmServer from '../../lib/warm-server.js'
1+
import { getProductGroups } from '#src/products/lib/get-product-groups.js'
2+
import warmServer from '#src/frame/lib/warm-server.js'
33
import { languageKeys } from '#src/languages/lib/languages.js'
44
import { allVersionKeys } from '#src/versions/lib/all-versions.js'
55

‎middleware/contextualizers/whats-new-changelog.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getChangelogItems } from '../../lib/changelog.js'
1+
import { getChangelogItems } from '#src/changelogs/lib/changelog.js'
22
import getApplicableVersions from '#src/versions/lib/get-applicable-versions.js'
33

44
export default async function whatsNewChangelog(req, res, next) {

‎middleware/cookie-parser.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import cookieParser from 'cookie-parser'
2-
import cookieSettings from '../lib/cookie-settings.js'
2+
import cookieSettings from '#src/frame/lib/cookie-settings.js'
33
export default cookieParser(process.env.COOKIE_SECRET, cookieSettings)

0 commit comments

Comments
 (0)