From d02f6705f34c3d0b9884c3cfdb4fedddcb2e226d Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Tue, 7 Feb 2023 07:51:45 +0100 Subject: [PATCH] fix: update default branch pattern detection (#1183) Also enforce gitignore contents --- src/check-project/check-build-files.js | 2 +- src/check-project/files/gitignore | 9 +++++++++ src/check-project/index.js | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/check-project/files/gitignore diff --git a/src/check-project/check-build-files.js b/src/check-project/check-build-files.js index 8af48f15c..6e9086571 100644 --- a/src/check-project/check-build-files.js +++ b/src/check-project/check-build-files.js @@ -67,7 +67,7 @@ export async function checkBuildFiles (projectDir, branchName, repoUrl) { } let defaultCiContent = await download(ciFileUrl) - defaultCiContent = defaultCiContent.replace(/\$default-branch/g, branchName) + defaultCiContent = defaultCiContent.replace(/\${{{ github.default_branch }}}/g, branchName) await ensureFileHasContents(projectDir, '.github/workflows/js-test-and-release.yml', defaultCiContent) diff --git a/src/check-project/files/gitignore b/src/check-project/files/gitignore new file mode 100644 index 000000000..7ad9e674e --- /dev/null +++ b/src/check-project/files/gitignore @@ -0,0 +1,9 @@ +node_modules +build +dist +.docs +.coverage +node_modules +package-lock.json +yarn.lock +.vscode diff --git a/src/check-project/index.js b/src/check-project/index.js index 28462bcdb..ecb0f652e 100755 --- a/src/check-project/index.js +++ b/src/check-project/index.js @@ -23,6 +23,9 @@ import { import semver from 'semver' import Listr from 'listr' import yargsParser from 'yargs-parser' +import { fileURLToPath } from 'url' + +const __dirname = path.dirname(fileURLToPath(import.meta.url)) /** * @param {string} projectDir @@ -125,6 +128,9 @@ async function processMonorepo (projectDir, manifest, branchName, repoUrl) { proposedManifest = sortManifest(proposedManifest) await ensureFileHasContents(projectDir, 'package.json', JSON.stringify(proposedManifest, null, 2)) + await ensureFileHasContents(projectDir, '.gitignore', fs.readFileSync(path.join(__dirname, 'files', 'gitignore'), { + encoding: 'utf-8' + })) await checkLicenseFiles(projectDir) await checkBuildFiles(projectDir, branchName, repoUrl) await checkMonorepoReadme(projectDir, repoUrl, branchName, projectDirs) @@ -382,6 +388,9 @@ async function processModule (projectDir, manifest, branchName, repoUrl, homePag proposedManifest = sortManifest(proposedManifest) await ensureFileHasContents(projectDir, 'package.json', JSON.stringify(proposedManifest, null, 2)) + await ensureFileHasContents(projectDir, '.gitignore', fs.readFileSync(path.join(__dirname, 'files', 'gitignore'), { + encoding: 'utf-8' + })) await checkLicenseFiles(projectDir) await checkReadme(projectDir, repoUrl, branchName, rootManifest) }