Skip to content

Commit 8d4f3e6

Browse files
JasonEtcochiedo
andauthored
Move test & script utils out of /lib (github#17517)
* Remove an unused file * Move authenticate-to-aws to scripts/utils * Move crowdin-config to tests/utils * Remove add-frontmatter-to-file * Move find-unused-assets * Move git-utils to script/utils * Move lib/github to script/utils * Revert "Remove an unused file" This reverts commit cd93ad846a0354e957359f23124eb0724c9147cf. * Move find-extraneous-translation-files to script/utils * We already have tests/helpers * Rename script/utils => helpers for consistency * Forgot a path * Fix path to crowdin-config Co-authored-by: Chiedo John <2156688+chiedo@users.noreply.github.com>
1 parent 0e04893 commit 8d4f3e6

16 files changed

+16
-24
lines changed

lib/add-frontmatter-to-file.js

-8
This file was deleted.

script/check-s3-images.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const allVersions = require('../lib/all-versions')
99
const nonEnterpriseDefaultVersion = require('../lib/non-enterprise-default-version')
1010
const { getS3BucketPathFromVersion, getVersionFromS3BucketPath } = require('../lib/s3-bucket-path-utils')
1111
const patterns = require('../lib/patterns')
12-
const authenticateToAWS = require('../lib/authenticate-to-aws.js')
12+
const authenticateToAWS = require('./helpers/authenticate-to-aws.js')
1313
const readlineSync = require('readline-sync')
1414
const { execSync } = require('child_process')
1515
const enterpriseServerVersions = Object.keys(allVersions).filter(v => v.startsWith('enterprise-server@'))

script/delete-unused-staging-apps.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ assert(process.env.HEROKU_API_TOKEN)
1414
const { chain } = require('lodash')
1515
const chalk = require('chalk')
1616
const Heroku = require('heroku-client')
17-
const github = require('../lib/github')()
17+
const github = require('./helpers/github')()
1818
const heroku = new Heroku({ token: process.env.HEROKU_API_TOKEN })
1919
const owner = 'github'
2020
const repo = 'docs-internal'

script/graphql/update-files.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const yaml = require('js-yaml')
77
const { execSync } = require('child_process')
88
const graphqlDataDir = path.join(process.cwd(), 'data/graphql')
99
const graphqlStaticDir = path.join(process.cwd(), 'lib/graphql/static')
10-
const { getContents, listMatchingRefs } = require('../../lib/git-utils')
10+
const { getContents, listMatchingRefs } = require('../helpers/git-utils')
1111
const dataFilenames = require('./utils/data-filenames')
1212
const allVersions = require('../../lib/all-versions')
1313
const processPreviews = require('./utils/process-previews')
File renamed without changes.

lib/find-extraneous-translation-files.js script/helpers/find-extraneous-translation-files.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require('path')
22
const { difference } = require('lodash')
33
const walk = require('walk-sync').entries
4-
const languages = require('../lib/languages')
4+
const languages = require('../../lib/languages')
55

66
module.exports = function findExtraneousTranslatedFiles () {
77
const files = []

lib/find-unused-assets.js script/helpers/find-unused-assets.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ const path = require('path')
55
const walk = require('walk-sync')
66
const { execSync } = require('child_process')
77
const assert = require('assert')
8-
const loadSiteData = require('./site-data')
9-
const { loadPages } = require('./pages')
10-
const patterns = require('./patterns')
11-
const getDataReferences = require('./get-liquid-data-references')
8+
const loadSiteData = require('../../lib/site-data')
9+
const { loadPages } = require('../../lib/pages')
10+
const patterns = require('../../lib/patterns')
11+
const getDataReferences = require('../../lib/get-liquid-data-references')
1212
const imagesPath = '/assets/images'
1313

1414
// these paths should remain in the repo even if they are not referenced directly

lib/git-utils.js script/helpers/git-utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const github = require('../lib/github')()
1+
const github = require('./github')()
22

33
// https://docs.github.com/rest/reference/git#get-a-reference
44
async function getCommitSha (owner, repo, ref) {
File renamed without changes.

script/remove-extraneous-translation-files.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

33
const fs = require('fs')
4-
const findExtraneousFiles = require('../lib/find-extraneous-translation-files')
4+
const findExtraneousFiles = require('./helpers/find-extraneous-translation-files')
55

66
// [start-readme]
77
//

script/remove-unused-assets.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const fs = require('fs')
44
const path = require('path')
5-
const findUnusedAssets = require('../lib/find-unused-assets')
5+
const findUnusedAssets = require('./helpers/find-unused-assets')
66

77
// [start-readme]
88
//

script/update-enterprise-dates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22

3-
const { getContents } = require('../lib/git-utils')
3+
const { getContents } = require('./helpers/git-utils')
44
const fs = require('fs')
55
const path = require('path')
66
const enterpriseDatesFile = path.join(__dirname, '../lib/enterprise-dates.json')

script/update-s3cmd-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22

3-
const authenticateToAWS = require('../lib/authenticate-to-aws.js')
3+
const authenticateToAWS = require('./helpers/authenticate-to-aws.js')
44

55
// [start-readme]
66
//

script/upload-images-to-s3.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const fs = require('fs')
44
const path = require('path')
55
const program = require('commander')
66
const allVersions = require('../lib/all-versions')
7-
const authenticateToAWS = require('../lib/authenticate-to-aws')
7+
const authenticateToAWS = require('./helpers/authenticate-to-aws')
88
const nonEnterpriseDefaultVersion = require('../lib/non-enterprise-default-version')
99
const { getS3BucketPathFromVersion } = require('../lib/s3-bucket-path-utils')
1010
const walk = require('walk-sync')

tests/content/crowdin-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const config = require('../../lib/crowdin-config').read()
1+
const config = require('../helpers/crowdin-config').read()
22
const { loadPages } = require('../../lib/pages')
33
const ignoredPagePaths = config.files[0].ignore
44
const ignoredDataPaths = config.files[2].ignore

lib/crowdin-config.js tests/helpers/crowdin-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const path = require('path')
33
const yaml = require('js-yaml')
44

55
const read = function () {
6-
const filename = path.join(__dirname, '../crowdin.yml')
6+
const filename = path.join(__dirname, '../../crowdin.yml')
77
return yaml.load(fs.readFileSync(filename, 'utf8'), { filename })
88
}
99

0 commit comments

Comments
 (0)