From c93db077901c05d2ac62c2ba7c18022de7052851 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Fri, 20 Aug 2021 08:54:06 -0700 Subject: [PATCH] [meta] rename default branch --- README.md | 14 ++++++++++---- RELEASE.md | 6 +++--- docs/rules/unambiguous.md | 2 +- resolvers/webpack/package.json | 2 +- src/rules/no-commonjs.js | 2 +- utils/moduleVisitor.js | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 964c123a7e..d800cbfe57 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # eslint-plugin-import -[![build status](https://travis-ci.org/import-js/eslint-plugin-import.svg?branch=master)](https://travis-ci.org/import-js/eslint-plugin-import) -[![Coverage Status](https://coveralls.io/repos/github/import-js/eslint-plugin-import/badge.svg?branch=master)](https://coveralls.io/github/import-js/eslint-plugin-import?branch=master) -[![win32 build status](https://ci.appveyor.com/api/projects/status/3mw2fifalmjlqf56/branch/master?svg=true)](https://ci.appveyor.com/project/import-js/eslint-plugin-import/branch/master) +[![github actions][actions-image]][actions-url] +[![travis-ci](https://travis-ci.org/import-js/eslint-plugin-import.svg?branch=main)](https://travis-ci.org/import-js/eslint-plugin-import) +[![coverage][codecov-image]][codecov-url] +[![win32 build status](https://ci.appveyor.com/api/projects/status/3mw2fifalmjlqf56/branch/main?svg=true)](https://ci.appveyor.com/project/import-js/eslint-plugin-import/branch/main) [![npm](https://img.shields.io/npm/v/eslint-plugin-import.svg)](https://www.npmjs.com/package/eslint-plugin-import) [![npm downloads](https://img.shields.io/npm/dt/eslint-plugin-import.svg?maxAge=2592000)](http://www.npmtrends.com/eslint-plugin-import) @@ -171,7 +172,7 @@ extends: - plugin:import/typescript # this line does the trick ``` -[`@typescript-eslint/parser`]: https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/parser +[`@typescript-eslint/parser`]: https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser # Resolvers @@ -510,3 +511,8 @@ In Package Settings / SublimeLinter / User Settings: I believe this defaults to `3`, so you may not need to alter it depending on your project folder max depth. + +[codecov-image]: https://codecov.io/gh/import-js/eslint-plugin-import/branch/main/graphs/badge.svg +[codecov-url]: https://app.codecov.io/gh/import-js/eslint-plugin-import/ +[actions-image]: https://img.shields.io/endpoint?url=https://github-actions-badge-u3jn4tfpocch.runkit.sh/import-js/eslint-plugin-import +[actions-url]: https://github.com/import-js/eslint-plugin-import diff --git a/RELEASE.md b/RELEASE.md index 34ef1aadc6..6c048dc093 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,9 +1,9 @@ # Release steps -1. create a `release-[x.y.z]` branch from tip of `master` (or whatever release commit) +1. create a `release-[x.y.z]` branch from tip of `main` (or whatever release commit) ```bash - git checkout master && git pull && git checkout -b release-2.1.0 + git checkout main && git pull && git checkout -b release-2.1.0 ``` 2. bump `package.json` + update CHANGELOG version links for all releasing packages (i.e., root + any resolvers) @@ -49,6 +49,6 @@ 7. merge `release-[x.y.z]` into `release` ( - ideally fast-forward, probably with Git CLI instead of Github -8. merge `release` into `master` +8. merge `release` into `main` Done! diff --git a/docs/rules/unambiguous.md b/docs/rules/unambiguous.md index 7955c3fbc8..92839b0c35 100644 --- a/docs/rules/unambiguous.md +++ b/docs/rules/unambiguous.md @@ -51,4 +51,4 @@ a `module`. - [node-eps#13](https://github.com/nodejs/node-eps/issues/13) [`parserOptions.sourceType`]: http://eslint.org/docs/user-guide/configuring#specifying-parser-options -[Unambiguous JavaScript Grammar]: https://github.com/nodejs/node-eps/blob/master/002-es-modules.md#32-determining-if-source-is-an-es-module +[Unambiguous JavaScript Grammar]: https://github.com/nodejs/node-eps/blob/HEAD/002-es-modules.md#32-determining-if-source-is-an-es-module diff --git a/resolvers/webpack/package.json b/resolvers/webpack/package.json index 1e9fdd3ab1..fd805af8b7 100644 --- a/resolvers/webpack/package.json +++ b/resolvers/webpack/package.json @@ -30,7 +30,7 @@ "bugs": { "url": "https://github.com/import-js/eslint-plugin-import/issues" }, - "homepage": "https://github.com/import-js/eslint-plugin-import/tree/master/resolvers/webpack", + "homepage": "https://github.com/import-js/eslint-plugin-import/tree/HEAD/resolvers/webpack", "dependencies": { "array-find": "^1.0.0", "debug": "^3.2.7", diff --git a/src/rules/no-commonjs.js b/src/rules/no-commonjs.js index 08d29a0cdb..98f759cbc2 100644 --- a/src/rules/no-commonjs.js +++ b/src/rules/no-commonjs.js @@ -33,7 +33,7 @@ function validateScope(scope) { return scope.variableScope.type === 'module'; } -// https://github.com/estree/estree/blob/master/es5.md +// https://github.com/estree/estree/blob/HEAD/es5.md function isConditional(node) { if ( node.type === 'IfStatement' diff --git a/utils/moduleVisitor.js b/utils/moduleVisitor.js index 7f783624b4..8fb2b2604c 100644 --- a/utils/moduleVisitor.js +++ b/utils/moduleVisitor.js @@ -37,7 +37,7 @@ exports.default = function visitModules(visitor, options) { // for esmodule dynamic `import()` calls function checkImportCall(node) { let modulePath; - // refs https://github.com/estree/estree/blob/master/es2020.md#importexpression + // refs https://github.com/estree/estree/blob/HEAD/es2020.md#importexpression if (node.type === 'ImportExpression') { modulePath = node.source; } else if (node.type === 'CallExpression') {