Skip to content

Commit fb6844e

Browse files
heiskrheiskr
authored
Import statements: #src/ → @/ and remove file extensions (#56560)
1 parent e8cc2f7 commit fb6844e

File tree

364 files changed

+891
-920
lines changed

Some content is hidden

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

364 files changed

+891
-920
lines changed

‎next.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import fs from 'fs'
22
import path from 'path'
33

44
import frontmatter from 'gray-matter'
5-
import { ROOT } from '#src/frame/lib/constants.js'
5+
// Replace imports with hardcoded values
6+
const ROOT = process.env.ROOT || '.'
67

78
// Hard-coded language keys to avoid TypeScript import in config file
89
const languageKeys = ['en', 'es', 'ja', 'pt', 'zh', 'ru', 'fr', 'ko', 'de']

‎src/archives/lib/is-archived-version.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import patterns from '@/frame/lib/patterns.js'
2-
import { deprecated } from '@/versions/lib/enterprise-server-releases.js'
1+
import patterns from '@/frame/lib/patterns'
2+
import { deprecated } from '@/versions/lib/enterprise-server-releases'
33
import type { ExtendedRequest } from '@/types'
44

55
type IsArchivedInfo = {

‎src/archives/lib/old-versions-utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path from 'path'
2-
import { supported, latest } from '@/versions/lib/enterprise-server-releases.js'
3-
import patterns from '@/frame/lib/patterns.js'
4-
import nonEnterpriseDefaultVersion from '@/versions/lib/non-enterprise-default-version.js'
2+
import { supported, latest } from '@/versions/lib/enterprise-server-releases'
3+
import patterns from '@/frame/lib/patterns'
4+
import nonEnterpriseDefaultVersion from '@/versions/lib/non-enterprise-default-version'
55
import { allVersions } from '@/versions/lib/all-versions'
66
const latestNewVersion = `enterprise-server@${latest}`
77
const oldVersions = ['dotcom'].concat(supported)

‎src/archives/middleware/archived-enterprise-versions-assets.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import got from 'got'
22
import type { Response, NextFunction } from 'express'
33

4-
import patterns from '@/frame/lib/patterns.js'
4+
import patterns from '@/frame/lib/patterns'
55
import { isArchivedVersion } from '@/archives/lib/is-archived-version'
6-
import {
7-
setFastlySurrogateKey,
8-
SURROGATE_ENUMS,
9-
} from '@/frame/middleware/set-fastly-surrogate-key.js'
10-
import { archivedCacheControl, defaultCacheControl } from '@/frame/middleware/cache-control.js'
6+
import { setFastlySurrogateKey, SURROGATE_ENUMS } from '@/frame/middleware/set-fastly-surrogate-key'
7+
import { archivedCacheControl, defaultCacheControl } from '@/frame/middleware/cache-control'
118
import type { ExtendedRequest } from '@/types'
129

1310
// This module handles requests for the CSS and JS assets for

‎src/archives/middleware/archived-enterprise-versions.ts

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
import type { Response, NextFunction } from 'express'
22
import got from 'got'
33

4-
import statsd from '@/observability/lib/statsd.js'
4+
import statsd from '@/observability/lib/statsd'
55
import {
66
firstVersionDeprecatedOnNewSite,
77
lastVersionWithoutArchivedRedirectsFile,
88
deprecatedWithFunctionalRedirects,
99
firstReleaseStoredInBlobStorage,
10-
} from '@/versions/lib/enterprise-server-releases.js'
11-
import patterns from '@/frame/lib/patterns.js'
12-
import versionSatisfiesRange from '@/versions/lib/version-satisfies-range.js'
10+
} from '@/versions/lib/enterprise-server-releases'
11+
import patterns from '@/frame/lib/patterns'
12+
import versionSatisfiesRange from '@/versions/lib/version-satisfies-range'
1313
import { isArchivedVersion } from '@/archives/lib/is-archived-version'
14-
import {
15-
setFastlySurrogateKey,
16-
SURROGATE_ENUMS,
17-
} from '@/frame/middleware/set-fastly-surrogate-key.js'
18-
import { readCompressedJsonFileFallbackLazily } from '@/frame/lib/read-json-file.js'
19-
import { archivedCacheControl, languageCacheControl } from '@/frame/middleware/cache-control.js'
14+
import { setFastlySurrogateKey, SURROGATE_ENUMS } from '@/frame/middleware/set-fastly-surrogate-key'
15+
import { readCompressedJsonFileFallbackLazily } from '@/frame/lib/read-json-file'
16+
import { archivedCacheControl, languageCacheControl } from '@/frame/middleware/cache-control'
2017
import { pathLanguagePrefixed, languagePrefixPathRegex } from '@/languages/lib/languages'
21-
import getRedirect, { splitPathByLanguage } from '@/redirects/lib/get-redirect.js'
22-
import getRemoteJSON from '@/frame/lib/get-remote-json.js'
18+
import getRedirect, { splitPathByLanguage } from '@/redirects/lib/get-redirect'
19+
import getRemoteJSON from '@/frame/lib/get-remote-json'
2320
import { ExtendedRequest } from '@/types'
2421

2522
const OLD_PUBLIC_AZURE_BLOB_URL = 'https://githubdocs.azureedge.net'
@@ -75,7 +72,7 @@ const cacheAggressively = (res: Response) => {
7572
// 3. ~4000ms
7673
//
7774
// ...if the limit we set is 3.
78-
// Our own timeout, in #src/frame/middleware/timeout.js defaults to 10 seconds.
75+
// Our own timeout, in @/frame/middleware/timeout.js defaults to 10 seconds.
7976
// So there's no point in trying more attempts than 3 because it would
8077
// just timeout on the 10s. (i.e. 1000 + 2000 + 4000 + 8000 > 10,000)
8178
const retryConfiguration = { limit: 3 }

‎src/archives/scripts/warmup-remotejson.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import { program } from 'commander'
2020
import semver, { SemVer } from 'semver'
2121

22-
import getRemoteJSON from '@/frame/lib/get-remote-json.js'
22+
import getRemoteJSON from '@/frame/lib/get-remote-json'
2323
import {
2424
deprecated,
2525
lastVersionWithoutArchivedRedirectsFile,
26-
} from '@/versions/lib/enterprise-server-releases.js'
26+
} from '@/versions/lib/enterprise-server-releases'
2727

2828
program
2929
.description(

‎src/archives/tests/deprecated-enterprise-versions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { describe, expect, test, vi } from 'vitest'
22

3-
import enterpriseServerReleases from '@/versions/lib/enterprise-server-releases.js'
3+
import enterpriseServerReleases from '@/versions/lib/enterprise-server-releases'
44
import { get, getDOM } from '@/tests/helpers/e2etest-ts'
5-
import { SURROGATE_ENUMS } from '@/frame/middleware/set-fastly-surrogate-key.js'
5+
import { SURROGATE_ENUMS } from '@/frame/middleware/set-fastly-surrogate-key'
66

77
describe('enterprise deprecation', () => {
88
vi.setConfig({ testTimeout: 60 * 1000 })

‎src/article-api/middleware/article-body.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { Response } from 'express'
22

3-
import { Context } from '@/types.js'
3+
import { Context } from '@/types'
44
import { ExtendedRequestWithPageInfo } from '../types'
5-
import contextualize from '@/frame/middleware/context/context.js'
5+
import contextualize from '@/frame/middleware/context/context'
66

77
export async function getArticleBody(req: ExtendedRequestWithPageInfo) {
88
// req.pageinfo is set from pageValidationMiddleware and pathValidationMiddleware

‎src/article-api/middleware/article-pageinfo.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import type { Response } from 'express'
22
import type { ExtendedRequestWithPageInfo } from '../types'
33

44
import type { ExtendedRequest, Page, Context, Permalink } from '@/types'
5-
import shortVersions from '@/versions/middleware/short-versions.js'
5+
import shortVersions from '@/versions/middleware/short-versions'
66
import contextualize from '@/frame/middleware/context/context'
7-
import features from '@/versions/middleware/features.js'
8-
import breadcrumbs from '@/frame/middleware/context/breadcrumbs.js'
9-
import currentProductTree from '@/frame/middleware/context/current-product-tree.js'
10-
import { readCompressedJsonFile } from '@/frame/lib/read-json-file.js'
7+
import features from '@/versions/middleware/features'
8+
import breadcrumbs from '@/frame/middleware/context/breadcrumbs'
9+
import currentProductTree from '@/frame/middleware/context/current-product-tree'
10+
import { readCompressedJsonFile } from '@/frame/lib/read-json-file'
1111

1212
// If you have pre-computed page info into a JSON file on disk, this is
1313
// where it would be expected to be found.

‎src/article-api/middleware/article.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { RequestHandler, Response } from 'express'
22
import express from 'express'
33

4-
import { defaultCacheControl } from '@/frame/middleware/cache-control.js'
5-
import catchMiddlewareError from '@/observability/middleware/catch-middleware-error.js'
4+
import { defaultCacheControl } from '@/frame/middleware/cache-control'
5+
import catchMiddlewareError from '@/observability/middleware/catch-middleware-error'
66
import { ExtendedRequestWithPageInfo } from '../types'
77
import { pageValidationMiddleware, pathValidationMiddleware } from './validation'
88
import { getArticleBody } from './article-body'
@@ -11,8 +11,8 @@ import {
1111
makeLanguageSurrogateKey,
1212
setFastlySurrogateKey,
1313
SURROGATE_ENUMS,
14-
} from '@/frame/middleware/set-fastly-surrogate-key.js'
15-
import statsd from '@/observability/lib/statsd.js'
14+
} from '@/frame/middleware/set-fastly-surrogate-key'
15+
import statsd from '@/observability/lib/statsd'
1616

1717
const router = express.Router()
1818

0 commit comments

Comments
 (0)