Skip to content

Commit

Permalink
Merge branch 'master' into fix/re-enable-test-coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
achingbrain authored Jul 26, 2023
2 parents 3c37832 + 4373c38 commit ba3ef52
Show file tree
Hide file tree
Showing 37 changed files with 448 additions and 199 deletions.
25 changes: 6 additions & 19 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,12 @@ name: Close and mark stale issue

on:
schedule:
- cron: '0 0 * * *'
- cron: '0 0 * * *'

permissions:
issues: write
pull-requests: write

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write

steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'Oops, seems like we needed more information for this issue, please comment with more details or this issue will be closed in 7 days.'
close-issue-message: 'This issue was closed because it is missing author input.'
stale-issue-label: 'kind/stale'
any-of-labels: 'need/author-input'
exempt-issue-labels: 'need/triage,need/community-input,need/maintainer-input,need/maintainers-input,need/analysis,status/blocked,status/in-progress,status/ready,status/deferred,status/inactive'
days-before-issue-stale: 6
days-before-issue-close: 7
enable-statistics: true
uses: pl-strflt/.github/.github/workflows/[email protected]
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package-lock.json
yarn.lock
# only the root node_modules folder since some of the test fixtures have them
/node_modules
/actions/bundle-size/node_modules
/coverage
/dist
/docs
dist
.docs
.nyc_output
*.log
Expand Down
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@
## [40.0.0](https://github.com/ipfs/aegir/compare/v39.0.13...v40.0.0) (2023-07-19)


### ⚠ BREAKING CHANGES

* update typescript to `5.1.6, typedoc to `0.24.8` and eslint-config-ipfs to `5.0.0`

### Trivial Changes

* Update .github/workflows/stale.yml [skip ci] ([48cc141](https://github.com/ipfs/aegir/commit/48cc1413972451fc58749b3cf4d91719d74e518c))


### Dependencies

* upgrade typescript and typedoc ([#1337](https://github.com/ipfs/aegir/issues/1337)) ([4ef4b62](https://github.com/ipfs/aegir/commit/4ef4b62f215316a24b58dac67c840c0dbd149d01))

## [39.0.13](https://github.com/ipfs/aegir/compare/v39.0.12...v39.0.13) (2023-06-28)


### Bug Fixes

* when generating api doc link, check typedoc entry point ([#1318](https://github.com/ipfs/aegir/issues/1318)) ([8f4ab17](https://github.com/ipfs/aegir/commit/8f4ab172b7f46381e08d3c709e576197396c5331))

## [39.0.12](https://github.com/ipfs/aegir/compare/v39.0.11...v39.0.12) (2023-06-28)


### Bug Fixes

* allow specifying ci file in check-project ([#1317](https://github.com/ipfs/aegir/issues/1317)) ([4c3ab55](https://github.com/ipfs/aegir/commit/4c3ab552b63017c896429cca9398592d703eeafc))

## [39.0.11](https://github.com/ipfs/aegir/compare/v39.0.10...v39.0.11) (2023-06-27)


### Bug Fixes

* handle invalid workspace entries ([#1316](https://github.com/ipfs/aegir/issues/1316)) ([a95aec3](https://github.com/ipfs/aegir/commit/a95aec346270472fe635e508476a1eb844e80cfe))


### Trivial Changes

* Update .github/workflows/stale.yml [skip ci] ([369453f](https://github.com/ipfs/aegir/commit/369453f7543488d43e72721c48320d6d8d59b705))

## [39.0.10](https://github.com/ipfs/aegir/compare/v39.0.9...v39.0.10) (2023-06-10)


### Trivial Changes

* fix linting ([#1305](https://github.com/ipfs/aegir/issues/1305)) ([17c0331](https://github.com/ipfs/aegir/commit/17c0331c9ebed841ccb00cb3ffb442f0e0c87549))

## [39.0.9](https://github.com/ipfs/aegir/compare/v39.0.8...v39.0.9) (2023-05-26)


Expand Down
64 changes: 32 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aegir",
"version": "39.0.9",
"version": "40.0.0",
"description": "JavaScript project management",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/ipfs/aegir#readme",
Expand Down Expand Up @@ -229,17 +229,17 @@
"@electron/get": "^2.0.0",
"@polka/send-type": "^0.5.2",
"@semantic-release/changelog": "^6.0.1",
"@semantic-release/commit-analyzer": "^9.0.2",
"@semantic-release/commit-analyzer": "^10.0.1",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "https://registry.npmjs.org/@achingbrain/semantic-release-github/-/semantic-release-github-0.0.2.tgz",
"@semantic-release/npm": "^9.0.2",
"@semantic-release/release-notes-generator": "^10.0.3",
"@semantic-release/github": "^9.0.3",
"@semantic-release/npm": "^10.0.4",
"@semantic-release/release-notes-generator": "^11.0.4",
"@types/chai": "^4.2.16",
"@types/chai-as-promised": "^7.1.3",
"@types/chai-string": "^1.4.2",
"@types/chai-subset": "^1.3.3",
"@types/mocha": "^10.0.0",
"@types/node": "^18.11.15",
"@types/node": "^20.4.2",
"@typescript-eslint/eslint-plugin": "^5.18.0",
"buffer": "^6.0.3",
"bytes": "^3.1.0",
Expand All @@ -250,18 +250,18 @@
"chai-parentheses": "^0.0.2",
"chai-string": "^1.5.0",
"chai-subset": "^1.6.0",
"conventional-changelog-conventionalcommits": "^5.0.0",
"conventional-changelog-conventionalcommits": "^6.1.0",
"cors": "^2.8.5",
"depcheck": "^1.4.3",
"diff": "^5.1.0",
"electron-mocha-main": "^11.0.3",
"env-paths": "^3.0.0",
"esbuild": "^0.17.9",
"esbuild": "^0.18.12",
"eslint": "^8.31.0",
"eslint-config-ipfs": "^4.0.2",
"eslint-config-ipfs": "^5.0.0",
"eslint-plugin-etc": "^2.0.2",
"eslint-plugin-import": "^2.18.0",
"eslint-plugin-jsdoc": "^43.1.1",
"eslint-plugin-jsdoc": "^46.4.3",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.1.1",
"execa": "^7.0.0",
Expand All @@ -272,48 +272,48 @@
"kleur": "^4.1.4",
"lilconfig": "^2.0.5",
"listr": "~0.14.2",
"mdast-util-from-markdown": "^1.2.0",
"mdast-util-gfm": "^2.0.1",
"mdast-util-gfm-footnote": "^1.0.1",
"mdast-util-gfm-strikethrough": "^1.0.1",
"mdast-util-gfm-table": "^1.0.4",
"mdast-util-gfm-task-list-item": "^1.0.1",
"mdast-util-to-markdown": "^1.3.0",
"mdast-util-toc": "^6.1.0",
"mdast-util-from-markdown": "^2.0.0",
"mdast-util-gfm": "^3.0.0",
"mdast-util-gfm-footnote": "^2.0.0",
"mdast-util-gfm-strikethrough": "^2.0.0",
"mdast-util-gfm-table": "^2.0.0",
"mdast-util-gfm-task-list-item": "^2.0.0",
"mdast-util-to-markdown": "^2.0.0",
"mdast-util-toc": "^7.0.0",
"merge-options": "^3.0.4",
"micromark-extension-gfm": "^2.0.1",
"micromark-extension-gfm-footnote": "^1.0.4",
"micromark-extension-gfm-strikethrough": "^1.0.4",
"micromark-extension-gfm-table": "^1.0.5",
"micromark-extension-gfm-task-list-item": "^1.0.3",
"micromark-extension-gfm": "^3.0.0",
"micromark-extension-gfm-footnote": "^2.0.0",
"micromark-extension-gfm-strikethrough": "^2.0.0",
"micromark-extension-gfm-table": "^2.0.0",
"micromark-extension-gfm-task-list-item": "^2.0.1",
"minimatch": "^9.0.0",
"mocha": "^10.0.0",
"npm-package-json-lint": "^6.3.0",
"npm-package-json-lint": "^7.0.0",
"nyc": "^15.1.0",
"p-map": "^6.0.0",
"p-retry": "^5.1.2",
"pascalcase": "^2.0.0",
"path": "^0.12.7",
"playwright-test": "^8.1.0",
"playwright-test": "^12.1.1",
"polka": "^0.5.2",
"premove": "^4.0.0",
"prompt": "^1.2.2",
"proper-lockfile": "^4.1.2",
"react-native-test-runner": "^5.0.0",
"read-pkg-up": "^9.1.0",
"read-pkg-up": "^10.0.0",
"rimraf": "^5.0.0",
"semantic-release": "^20.1.3",
"semantic-release": "^21.0.7",
"semantic-release-monorepo": "^7.0.5",
"semver": "^7.3.8",
"source-map-support": "^0.5.20",
"strip-bom": "^5.0.0",
"strip-json-comments": "^5.0.0",
"tempy": "^3.0.0",
"typedoc": "^0.23.21",
"typedoc": "^0.24.8",
"typedoc-plugin-mdn-links": "^3.0.3",
"typedoc-plugin-missing-exports": "^1.0.0",
"typescript": "^4.6.3",
"typescript-docs-verifier": "2.4.0",
"typedoc-plugin-missing-exports": "^2.0.0",
"typescript": "^5.1.6",
"typescript-docs-verifier": "^2.5.0",
"uint8arrays": "^4.0.2",
"undici": "^5.0.0",
"update-notifier": "^6.0.2",
Expand All @@ -337,7 +337,7 @@
"@types/semver": "^7.3.4",
"@types/update-notifier": "^6.0.1",
"@types/yargs": "^17.0.0",
"electron": "^24.1.2"
"electron": "^25.3.0"
},
"browser": {
"fs": false,
Expand Down
5 changes: 3 additions & 2 deletions src/check-project/check-monorepo-readme.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ import {
* @param {string} repoUrl
* @param {string} defaultBranch
* @param {string[]} projectDirs
* @param {string} ciFile
*/
export async function checkMonorepoReadme (projectDir, repoUrl, defaultBranch, projectDirs) {
export async function checkMonorepoReadme (projectDir, repoUrl, defaultBranch, projectDirs, ciFile) {
const repoParts = repoUrl.split('/')
const repoName = repoParts.pop()
const repoOwner = repoParts.pop()
Expand Down Expand Up @@ -47,7 +48,7 @@ export async function checkMonorepoReadme (projectDir, repoUrl, defaultBranch, p
const file = parseMarkdown(readmeContents)

// create basic readme with heading, CI link, etc
const readme = parseMarkdown(HEADER(pkg, repoOwner, repoName, defaultBranch))
const readme = parseMarkdown(HEADER(pkg, repoOwner, repoName, defaultBranch, ciFile))

// remove existing header, CI link, etc
/** @type {import('mdast').Root} */
Expand Down
5 changes: 3 additions & 2 deletions src/check-project/check-readme.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ import {
* @param {string} projectDir
* @param {string} repoUrl
* @param {string} defaultBranch
* @param {string} ciFile
* @param {any} [rootManifest]
*/
export async function checkReadme (projectDir, repoUrl, defaultBranch, rootManifest) {
export async function checkReadme (projectDir, repoUrl, defaultBranch, ciFile, rootManifest) {
const repoParts = repoUrl.split('/')
const repoName = repoParts.pop()
const repoOwner = repoParts.pop()
Expand Down Expand Up @@ -47,7 +48,7 @@ export async function checkReadme (projectDir, repoUrl, defaultBranch, rootManif
const file = parseMarkdown(readmeContents)

// create basic readme with heading, CI link, etc
const readme = parseMarkdown(HEADER(pkg, repoOwner, repoName, defaultBranch))
const readme = parseMarkdown(HEADER(pkg, repoOwner, repoName, defaultBranch, ciFile))

// remove existing header, CI link, etc
/** @type {import('mdast').Root} */
Expand Down
33 changes: 33 additions & 0 deletions src/check-project/check-typedoc-files.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/* eslint-disable no-console */

import path from 'path'
import fs from 'fs-extra'
import {
ensureFileHasContents
} from './utils.js'

/**
* @param {string} projectDir
* @param {boolean} isTypescriptProject
*/
export async function checkTypedocFiles (projectDir, isTypescriptProject) {
console.info('Check typedoc files')

const pkg = fs.readJSONSync(path.join(projectDir, 'package.json'))
const entryPoints = Object.values(pkg.exports)
.map(e => {
const path = e.import

if (isTypescriptProject) {
return path
.replace('dist/src', 'src')
.replace('.js', '.ts')
}

return path
})

await ensureFileHasContents(JSON.stringify({
entryPoints
}, null, 2), 'typedoc.json')
}
Loading

0 comments on commit ba3ef52

Please sign in to comment.