Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix/re-enable-test-…
Browse files Browse the repository at this point in the history
…coverage
  • Loading branch information
achingbrain committed Jun 10, 2023
2 parents dacceda + c8ad457 commit 5937b2d
Show file tree
Hide file tree
Showing 74 changed files with 526 additions and 226 deletions.
21 changes: 21 additions & 0 deletions .aegir.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,26 @@
export default {
docs: {
entryPoint: 'utils'
},
dependencyCheck: {
ignore: [
'@typescript-eslint/eslint-plugin',
'buffer',
'c8',
'conventional-changelog-conventionalcommits',
'electron-mocha-main',
'mocha',
'npm-package-json-lint',
'nyc',
'path',
'playwright-test',
'react-native-test-runner',
'semantic-release',
'semantic-release-monorepo',
'source-map-support',
'typedoc-plugin-mdn-links',
'typedoc-plugin-missing-exports',
'electron'
]
}
}
93 changes: 93 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,96 @@
## [39.0.9](https://github.com/ipfs/aegir/compare/v39.0.8...v39.0.9) (2023-05-26)


### Bug Fixes

* Updated doc-check to generate config + format errors ([#1255](https://github.com/ipfs/aegir/issues/1255)) ([c97f9bf](https://github.com/ipfs/aegir/commit/c97f9bf6c1a262afea0c88be4ec1fb4a9d01e922))

## [39.0.8](https://github.com/ipfs/aegir/compare/v39.0.7...v39.0.8) (2023-05-19)


### Bug Fixes

* do not enforce engines in package.json ([#1277](https://github.com/ipfs/aegir/issues/1277)) ([5e9c2fa](https://github.com/ipfs/aegir/commit/5e9c2fa44508ffbc5cf89042d44dc22c13b260d2)), closes [#1184](https://github.com/ipfs/aegir/issues/1184)

## [39.0.7](https://github.com/ipfs/aegir/compare/v39.0.6...v39.0.7) (2023-05-17)


### Bug Fixes

* add tsconfig to exports map ([#1278](https://github.com/ipfs/aegir/issues/1278)) ([94b4c4b](https://github.com/ipfs/aegir/commit/94b4c4bb7fbccc13da5492d727c6e02b4e7c8eac))

## [39.0.6](https://github.com/ipfs/aegir/compare/v39.0.5...v39.0.6) (2023-05-09)


### Bug Fixes

* Update required node version to node 18 and npm 8 ([#1184](https://github.com/ipfs/aegir/issues/1184)) ([b7ef86c](https://github.com/ipfs/aegir/commit/b7ef86cd3291d08cb5f6e211682f4bfc09be69e0))

## [39.0.5](https://github.com/ipfs/aegir/compare/v39.0.4...v39.0.5) (2023-05-03)


### Bug Fixes

* downgrade @semantic-release/npm to cjs version ([#1253](https://github.com/ipfs/aegir/issues/1253)) ([4b4b77b](https://github.com/ipfs/aegir/commit/4b4b77b3ceae4935250469e1890ddd03578783d5))

## [39.0.4](https://github.com/ipfs/aegir/compare/v39.0.3...v39.0.4) (2023-05-03)


### Bug Fixes

* use semantic-release-monorepo fork ([#1252](https://github.com/ipfs/aegir/issues/1252)) ([dd91980](https://github.com/ipfs/aegir/commit/dd91980183615cfa17306730c42e37367d5efd5f))

## [39.0.3](https://github.com/ipfs/aegir/compare/v39.0.2...v39.0.3) (2023-04-27)


### Dependencies

* bump minimatch from 5.1.6 to 9.0.0 ([#1232](https://github.com/ipfs/aegir/issues/1232)) ([07150fc](https://github.com/ipfs/aegir/commit/07150fca81667064b5bbedcdfddbd9f53629b168))
* bump p-map from 5.5.0 to 6.0.0 ([#1249](https://github.com/ipfs/aegir/issues/1249)) ([584ceca](https://github.com/ipfs/aegir/commit/584cecac55637b6b846b58da337155f9ff4ae522))

## [39.0.2](https://github.com/ipfs/aegir/compare/v39.0.1...v39.0.2) (2023-04-27)


### Bug Fixes

* print useful dep-check message ([#1248](https://github.com/ipfs/aegir/issues/1248)) ([2473ae3](https://github.com/ipfs/aegir/commit/2473ae3b3798d4e70c8573b5a561e8b2c0134b56))


### Dependencies

* bump rimraf from 3.0.2 to 5.0.0 ([#1230](https://github.com/ipfs/aegir/issues/1230)) ([c761502](https://github.com/ipfs/aegir/commit/c761502b41ba5302d04fc19aa6c34daa7b58c80f))

## [39.0.1](https://github.com/ipfs/aegir/compare/v39.0.0...v39.0.1) (2023-04-27)


### Bug Fixes

* allow top level await ([#1196](https://github.com/ipfs/aegir/issues/1196)) ([e76b978](https://github.com/ipfs/aegir/commit/e76b9785b942b779a6b5e57dc1e661df3d210335))


### Dependencies

* bump typedoc-plugin-mdn-links from 2.0.2 to 3.0.3 ([#1209](https://github.com/ipfs/aegir/issues/1209)) ([536a111](https://github.com/ipfs/aegir/commit/536a1118f2ab3cef8a28573747410a63fe80be5e))

## [39.0.0](https://github.com/ipfs/aegir/compare/v38.1.8...v39.0.0) (2023-04-27)


### ⚠ BREAKING CHANGES

* check for unused dependencies by default (#1177)

### Features

* check for unused dependencies by default ([#1177](https://github.com/ipfs/aegir/issues/1177)) ([6b01e36](https://github.com/ipfs/aegir/commit/6b01e3634a16414d4c0c0ee2d078fdb327271f39))


### Dependencies

* bump @semantic-release/npm from 9.0.2 to 10.0.3 ([#1233](https://github.com/ipfs/aegir/issues/1233)) ([fd02d90](https://github.com/ipfs/aegir/commit/fd02d90d95563dcc795d288f949f025dce0e4f1c))
* bump eslint-config-ipfs from 3.1.7 to 4.0.0 ([#1229](https://github.com/ipfs/aegir/issues/1229)) ([d03ce94](https://github.com/ipfs/aegir/commit/d03ce94b1fe3809b26382e952f7df3edfa38dd6d))
* bump semantic-release from 20.1.3 to 21.0.1 ([#1223](https://github.com/ipfs/aegir/issues/1223)) ([7806e55](https://github.com/ipfs/aegir/commit/7806e558268e07fe079b84fc0fe2f0086de9721e))
* **dev:** bump electron from 23.2.4 to 24.1.2 ([#1240](https://github.com/ipfs/aegir/issues/1240)) ([a53d306](https://github.com/ipfs/aegir/commit/a53d306e72dd25b5d2989783570680ffb05dabc7))

## [38.1.8](https://github.com/ipfs/aegir/compare/v38.1.7...v38.1.8) (2023-03-23)


Expand Down
33 changes: 16 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aegir",
"version": "38.1.8",
"version": "39.0.9",
"description": "JavaScript project management",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/ipfs/aegir#readme",
Expand All @@ -17,8 +17,8 @@
"standard"
],
"engines": {
"node": ">=16.0.0",
"npm": ">=7.0.0"
"node": ">=18.0.0",
"npm": ">=8.6.0"
},
"bin": {
"aegir": "src/index.js"
Expand Down Expand Up @@ -101,6 +101,9 @@
"types": "./dist/utils/resolve.d.ts",
"browser": "./utils/resolve.browser.js",
"import": "./utils/resolve.js"
},
"./src/config/tsconfig.aegir.json": {
"require": "./src/config/tsconfig.aegir.json"
}
},
"eslintConfig": {
Expand Down Expand Up @@ -228,16 +231,15 @@
"@semantic-release/changelog": "^6.0.1",
"@semantic-release/commit-analyzer": "^9.0.2",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "https://registry.npmjs.org/@achingbrain/semantic-release-github/-/semantic-release-github-0.0.0.tgz",
"@semantic-release/npm": "^9.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",
"@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/sinon": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^5.18.0",
"buffer": "^6.0.3",
"bytes": "^3.1.0",
Expand All @@ -256,10 +258,10 @@
"env-paths": "^3.0.0",
"esbuild": "^0.17.9",
"eslint": "^8.31.0",
"eslint-config-ipfs": "^3.1.2",
"eslint-config-ipfs": "^4.0.2",
"eslint-plugin-etc": "^2.0.2",
"eslint-plugin-import": "^2.18.0",
"eslint-plugin-jsdoc": "^39.6.4",
"eslint-plugin-jsdoc": "^43.1.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.1.1",
"execa": "^7.0.0",
Expand All @@ -284,11 +286,11 @@
"micromark-extension-gfm-strikethrough": "^1.0.4",
"micromark-extension-gfm-table": "^1.0.5",
"micromark-extension-gfm-task-list-item": "^1.0.3",
"minimatch": "^5.1.0",
"minimatch": "^9.0.0",
"mocha": "^10.0.0",
"npm-package-json-lint": "^6.3.0",
"nyc": "^15.1.0",
"p-map": "^5.3.0",
"p-map": "^6.0.0",
"p-retry": "^5.1.2",
"pascalcase": "^2.0.0",
"path": "^0.12.7",
Expand All @@ -299,16 +301,16 @@
"proper-lockfile": "^4.1.2",
"react-native-test-runner": "^5.0.0",
"read-pkg-up": "^9.1.0",
"rimraf": "^3.0.2",
"semantic-release": "^20.0.2",
"rimraf": "^5.0.0",
"semantic-release": "^20.1.3",
"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-plugin-mdn-links": "^2.0.0",
"typedoc-plugin-mdn-links": "^3.0.3",
"typedoc-plugin-missing-exports": "^1.0.0",
"typescript": "^4.6.3",
"typescript-docs-verifier": "2.4.0",
Expand All @@ -332,13 +334,10 @@
"@types/polka": "^0.5.2",
"@types/prompt": "^1.1.2",
"@types/proper-lockfile": "^4.1.1",
"@types/rimraf": "^3.0.2",
"@types/semver": "^7.3.4",
"@types/update-notifier": "^6.0.1",
"@types/yargs": "^17.0.0",
"electron": "^23.1.0",
"sinon": "^15.0.0",
"util": "^0.12.4"
"electron": "^24.1.2"
},
"browser": {
"fs": false,
Expand Down
10 changes: 5 additions & 5 deletions src/build/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* eslint-disable no-console */

import Listr from 'listr'
import esbuild from 'esbuild'
import path from 'path'
import fs from 'fs-extra'
import pascalcase from 'pascalcase'
import bytes from 'bytes'
import { gzipSize, pkg, hasTsconfig, isTypescript, fromRoot, paths, findBinary } from './../utils.js'
import esbuild from 'esbuild'
import { execa } from 'execa'
import fs from 'fs-extra'
import Listr from 'listr'
import merge from 'merge-options'
import pascalcase from 'pascalcase'
import { gzipSize, pkg, hasTsconfig, isTypescript, fromRoot, paths, findBinary } from './../utils.js'

const defaults = merge.bind({
ignoreUndefined: true
Expand Down
2 changes: 1 addition & 1 deletion src/check-project/check-build-files.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-disable no-console */

import http from 'https'
import {
ensureFileHasContents,
ensureFileNotPresent
} from './utils.js'
import http from 'https'

const managedRepos = 'https://raw.githubusercontent.com/protocol/.github/master/configs/js.json'
const ciFileUrl = 'https://raw.githubusercontent.com/protocol/.github/master/templates/.github/workflows/js-test-and-release.yml'
Expand Down
2 changes: 1 addition & 1 deletion src/check-project/check-licence-files.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

/* eslint-disable no-console */

import fs from 'fs-extra'
import path from 'path'
import fs from 'fs-extra'
import kleur from 'kleur'
import {
ensureFileHasContents
Expand Down
12 changes: 6 additions & 6 deletions src/check-project/check-monorepo-readme.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

/* eslint-disable no-console */

import fs from 'fs-extra'
import path from 'path'
import {
ensureFileHasContents
} from './utils.js'
import fs from 'fs-extra'
import { toc as makeToc } from 'mdast-util-toc'
import { parseMarkdown, writeMarkdown } from './readme/utils.js'
import { APIDOCS } from './readme/api-docs.js'
import { HEADER } from './readme/header.js'
import { LICENSE } from './readme/license.js'
import { STRUCTURE } from './readme/structure.js'
import { APIDOCS } from './readme/api-docs.js'
import { parseMarkdown, writeMarkdown } from './readme/utils.js'
import {
ensureFileHasContents
} from './utils.js'

/**
* @param {string} projectDir
Expand Down
14 changes: 7 additions & 7 deletions src/check-project/check-readme.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

/* eslint-disable no-console,complexity */

import fs from 'fs-extra'
import path from 'path'
import {
ensureFileHasContents
} from './utils.js'
import fs from 'fs-extra'
import { toc as makeToc } from 'mdast-util-toc'
import { parseMarkdown, writeMarkdown } from './readme/utils.js'
import { APIDOCS } from './readme/api-docs.js'
import { HEADER } from './readme/header.js'
import { LICENSE } from './readme/license.js'
import { INSTALL } from './readme/install.js'
import { APIDOCS } from './readme/api-docs.js'
import { LICENSE } from './readme/license.js'
import { parseMarkdown, writeMarkdown } from './readme/utils.js'
import {
ensureFileHasContents
} from './utils.js'

/**
* @param {string} projectDir
Expand Down
30 changes: 15 additions & 15 deletions src/check-project/index.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
/* eslint-disable no-console,complexity */

import fs from 'fs-extra'
import path from 'path'
import { fileURLToPath } from 'url'
import { execa } from 'execa'
import fs from 'fs-extra'
import Listr from 'listr'
import prompt from 'prompt'
import semver from 'semver'
import yargsParser from 'yargs-parser'
import {
isMonorepoProject,
glob
} from '../utils.js'
import { checkBuildFiles } from './check-build-files.js'
import { checkLicenseFiles } from './check-licence-files.js'
import { checkMonorepoFiles } from './check-monorepo-files.js'
import { checkMonorepoReadme } from './check-monorepo-readme.js'
import { checkReadme } from './check-readme.js'
import { monorepoManifest } from './manifests/monorepo.js'
import { typedCJSManifest } from './manifests/typed-cjs.js'
import { typedESMManifest } from './manifests/typed-esm.js'
import { typescriptManifest } from './manifests/typescript.js'
import { untypedCJSManifest } from './manifests/untyped-cjs.js'
import { typedCJSManifest } from './manifests/typed-cjs.js'
import { checkLicenseFiles } from './check-licence-files.js'
import { checkBuildFiles } from './check-build-files.js'
import { checkMonorepoFiles } from './check-monorepo-files.js'
import { checkReadme } from './check-readme.js'
import { checkMonorepoReadme } from './check-monorepo-readme.js'
import {
sortManifest,
ensureFileHasContents,
calculateSiblingVersion
} from './utils.js'
import semver from 'semver'
import Listr from 'listr'
import yargsParser from 'yargs-parser'
import { fileURLToPath } from 'url'
import {
isMonorepoProject,
glob
} from '../utils.js'

const __dirname = path.dirname(fileURLToPath(import.meta.url))

Expand Down
2 changes: 1 addition & 1 deletion src/check-project/manifests/typed-cjs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { semanticReleaseConfig } from '../semantic-release-config.js'
import mergeOptions from 'merge-options'
import { semanticReleaseConfig } from '../semantic-release-config.js'
import {
sortFields,
constructManifest
Expand Down
2 changes: 1 addition & 1 deletion src/check-project/manifests/typed-esm.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { semanticReleaseConfig } from '../semantic-release-config.js'
import mergeOptions from 'merge-options'
import { semanticReleaseConfig } from '../semantic-release-config.js'
import {
sortFields,
sortExportsMap,
Expand Down
2 changes: 1 addition & 1 deletion src/check-project/manifests/typescript.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-console */

import { semanticReleaseConfig } from '../semantic-release-config.js'
import mergeOptions from 'merge-options'
import { semanticReleaseConfig } from '../semantic-release-config.js'
import {
sortFields,
sortExportsMap,
Expand Down
Loading

0 comments on commit 5937b2d

Please sign in to comment.