Skip to content

Commit

Permalink
[meta] rename default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ljharb committed Aug 20, 2021
1 parent 6c957e7 commit c93db07
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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!
2 changes: 1 addition & 1 deletion docs/rules/unambiguous.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion resolvers/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/rules/no-commonjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion utils/moduleVisitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down

0 comments on commit c93db07

Please sign in to comment.