Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update template-oss, fix changelog #7756

Merged
merged 2 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .commitlintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ module.exports = {
'header-max-length': [2, 'always', 80],
'subject-case': [0],
'body-max-line-length': [0],
'footer-max-line-length': [0],
},
}
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ module.exports = {
root: true,
ignorePatterns: [
'tap-testdir*/',
'/node_modules/.bin/',
'/node_modules/.cache/',
'docs/**',
'smoke-tests/**',
'mock-globals/**',
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/create-check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
with:
result-encoding: string
script: |
const { repo: { owner, repo}, runId, serverUrl } = context
const { repo: { owner, repo}, runId, serverUrl } = context
const { JOB_NAME, SHA } = process.env

const job = await github.rest.actions.listJobsForWorkflowRun({
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-latest-npm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ runs:
MATCH=$SPEC
echo "Found compatible version: npm@$MATCH"
break
fi
fi
done

if [ -z $MATCH ]; then
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
run: node . run postlint --ignore-scripts -ws -iwr --if-present
- name: Conclude Check
uses: LouisBrunner/checks-action@v1.6.0
if: always()
if: steps.create-check.outputs.check-id && always()
with:
token: ${{ secrets.GITHUB_TOKEN }}
conclusion: ${{ job.status }}
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
run: node scripts/git-dirty.js
- name: Conclude Check
uses: LouisBrunner/checks-action@v1.6.0
if: always()
if: steps.create-check.outputs.check-id && always()
with:
token: ${{ secrets.GITHUB_TOKEN }}
conclusion: ${{ job.status }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
git config --global user.email "npm-cli+bot@github.com"
git config --global user.name "npm CLI robot"
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: javascript
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

# ignore everything in the root
/*
# transient test directories
tap-testdir*/

# keep these
!**/.gitignore
!/.commitlintrc.js
!/.eslintrc.js
!/.eslintrc.local.*
!/.git-blame-ignore-revs
!/.gitattributes
!/.github/
!/.gitignore
!/.licensee.json
!/.mailmap
!/.npmrc
!/.prettierignore
!/.prettierrc.js
!/.release-please-manifest.json
!/AUTHORS
!/bin/
Expand All @@ -41,6 +41,7 @@ tap-testdir*/
!/tap-snapshots/
!/test/
!/tsconfig.json
tap-testdir*/
!/docs/
!/smoke-tests/
!/mock-globals/
Expand Down
159 changes: 0 additions & 159 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

GitHub takes the security of our software products and services seriously, including the open source code repositories managed through our GitHub organizations, such as [GitHub](https://github.com/GitHub).

If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways.
If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways.

If the vulnerability you have found is *not* [in scope for the GitHub Bug Bounty Program](https://bounty.github.com/#scope) or if you do not wish to be considered for a bounty reward, please report the issue to us directly through [opensource-security@github.com](mailto:opensource-security@github.com).

Expand Down
5 changes: 2 additions & 3 deletions docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

# ignore everything in the root
/*
# transient test directories
tap-testdir*/

# keep these
!**/.gitignore
!/.eslintrc.js
!/.eslintrc.local.*
!/.git-blame-ignore-revs
!/.gitignore
!/bin/
!/CHANGELOG*
Expand All @@ -21,3 +19,4 @@ tap-testdir*/
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir*/
11 changes: 6 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
"private": true,
"main": "lib/index.js",
"scripts": {
"lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
"lint": "npm run eslint",
"postlint": "template-oss-check",
"template-oss-apply": "template-oss-apply --force",
"lintfix": "npm run lint -- --fix",
"lintfix": "npm run eslint -- --fix",
"snap": "tap",
"test": "tap",
"posttest": "npm run lint",
"build": "node bin/build.js"
"build": "node bin/build.js",
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
},
"repository": {
"type": "git",
Expand All @@ -22,7 +23,7 @@
"devDependencies": {
"@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/eslint-config": "^4.0.0",
"@npmcli/template-oss": "4.22.0",
"@npmcli/template-oss": "4.23.3",
"front-matter": "^4.0.2",
"ignore-walk": "^6.0.5",
"jsdom": "^24.0.0",
Expand Down Expand Up @@ -55,7 +56,7 @@
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"ciVersions": "latest",
"version": "4.22.0",
"version": "4.23.3",
"content": "../scripts/template-oss/index.js",
"workspaceRepo": {
"add": {
Expand Down
5 changes: 2 additions & 3 deletions mock-globals/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

# ignore everything in the root
/*
# transient test directories
tap-testdir*/

# keep these
!**/.gitignore
!/.eslintrc.js
!/.eslintrc.local.*
!/.git-blame-ignore-revs
!/.gitignore
!/bin/
!/CHANGELOG*
Expand All @@ -21,3 +19,4 @@ tap-testdir*/
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir*/
11 changes: 6 additions & 5 deletions mock-globals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
"private": true,
"scripts": {
"test": "tap",
"lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
"lint": "npm run eslint",
"postlint": "template-oss-check",
"template-oss-apply": "template-oss-apply --force",
"lintfix": "npm run lint -- --fix",
"lintfix": "npm run eslint -- --fix",
"snap": "tap",
"posttest": "npm run lint"
"posttest": "npm run lint",
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
},
"repository": {
"type": "git",
Expand All @@ -34,7 +35,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.22.0",
"version": "4.23.3",
"content": "../scripts/template-oss/index.js"
},
"tap": {
Expand All @@ -49,7 +50,7 @@
},
"devDependencies": {
"@npmcli/eslint-config": "^4.0.1",
"@npmcli/template-oss": "4.22.0",
"@npmcli/template-oss": "4.23.3",
"tap": "^16.3.8"
}
}
5 changes: 2 additions & 3 deletions mock-registry/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

# ignore everything in the root
/*
# transient test directories
tap-testdir*/

# keep these
!**/.gitignore
!/.eslintrc.js
!/.eslintrc.local.*
!/.git-blame-ignore-revs
!/.gitignore
!/bin/
!/CHANGELOG*
Expand All @@ -21,3 +19,4 @@ tap-testdir*/
!/scripts/
!/tap-snapshots/
!/test/
tap-testdir*/
11 changes: 6 additions & 5 deletions mock-registry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
"private": true,
"scripts": {
"test": "tap",
"lint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"",
"lint": "npm run eslint",
"postlint": "template-oss-check",
"template-oss-apply": "template-oss-apply --force",
"lintfix": "npm run lint -- --fix",
"lintfix": "npm run eslint -- --fix",
"snap": "tap",
"posttest": "npm run lint"
"posttest": "npm run lint",
"eslint": "eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\""
},
"repository": {
"type": "git",
Expand All @@ -34,7 +35,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.22.0",
"version": "4.23.3",
"content": "../scripts/template-oss/index.js"
},
"tap": {
Expand All @@ -47,7 +48,7 @@
"devDependencies": {
"@npmcli/arborist": "^7.1.0",
"@npmcli/eslint-config": "^4.0.1",
"@npmcli/template-oss": "4.22.0",
"@npmcli/template-oss": "4.23.3",
"json-stringify-safe": "^5.0.1",
"nock": "^13.3.3",
"npm-package-arg": "^11.0.2",
Expand Down
Loading
Loading