Skip to content

Commit

Permalink
Merge pull request #1822 from intuit/dependabot/npm_and_yarn/eslint-c…
Browse files Browse the repository at this point in the history
…onfig-prettier-8.0.0

Bump eslint-config-prettier from 6.15.0 to 8.0.0
  • Loading branch information
hipstersmoothie committed Feb 22, 2021
2 parents 46b5da2 + a499b1b commit 8ead68c
Show file tree
Hide file tree
Showing 47 changed files with 142 additions and 153 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -5,7 +5,7 @@ defaults: &defaults
docker:
- image: circleci/node:12-browsers
environment:
TZ: '/usr/share/zoneinfo/America/Los_Angeles'
TZ: "/usr/share/zoneinfo/America/Los_Angeles"

aliases:
# Circle related commands
Expand Down Expand Up @@ -122,7 +122,7 @@ workflows:
- build

- release:
context: '@auto-canary'
context: "@auto-canary"
requires:
- test
- lint
5 changes: 2 additions & 3 deletions .eslintrc
Expand Up @@ -13,11 +13,10 @@
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"prettier",
"prettier/@typescript-eslint"
"prettier"
],

"plugins": ["prettier", "jest", "@typescript-eslint", "eslint-plugin-jsdoc", "import"],
"plugins": ["jest", "@typescript-eslint", "eslint-plugin-jsdoc", "import"],

"rules": {
"import/no-extraneous-dependencies": 2,
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,9 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
title: ""
labels: bug
assignees: ''

assignees: ""
---

**Describe the bug**
Expand All @@ -30,6 +29,7 @@ assignees: ''
<!-- Please run `npx auto info` and put the results in the section below -->

```txt
```

**Additional context**
Expand Down
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
title: ""
labels: enhancement
assignees: ''

assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
11 changes: 10 additions & 1 deletion .prettierignore
@@ -1 +1,10 @@
scripts/template-plugin/
scripts/template-plugin/
CHANGELOG.md
coverage
.next
.mdx-data
docs/out
docs/generated
dist/
test-plugin-malformed.js
lerna.json
2 changes: 1 addition & 1 deletion docs/pages/blog.js
Expand Up @@ -3,4 +3,4 @@ import { BlogIndex } from "next-ignite";
/** The blog index */
const Blog = () => <BlogIndex />;

export default Blog;
export default Blog;
2 changes: 1 addition & 1 deletion docs/pages/blog/using-shipit.mdx
Expand Up @@ -3,7 +3,7 @@ image: https://images.unsplash.com/photo-1556473062-062e556b0920?ixlib=rb-1.2.1&
title: Stress-free Continuous Delivery with auto
author: Andrew Lisowski
email: lisowski54@gmail.com
date: 'Thu, 12 Mar 2020 23:00:02 -0700'
date: "Thu, 12 Mar 2020 23:00:02 -0700"
---

`auto` makes releasing your code a breeze. Instead of manually calculating a version and doing your whole release process manually, `auto` takes care of it for you.
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/blog/v8.mdx
Expand Up @@ -3,7 +3,7 @@ image: https://images.unsplash.com/photo-1485795046599-702122cd1267?crop=entropy
title: Announcing "auto" 8.0.0
author: Andrew Lisowski
email: lisowski54@gmail.com
date: 'Thu, 12 Mar 2020 23:00:02 -0700'
date: "Thu, 12 Mar 2020 23:00:02 -0700"
---

We are excited to announce the release of `auto` 8.0.0.
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/blog/why.mdx
Expand Up @@ -3,7 +3,7 @@ image: https://cdn-images-1.medium.com/max/800/1*TVSbt7qsyleNiQ84la_log.jpeg
title: Death to Monotony
author: Adam Dierkens
url: https://github.intuit.com/adierkens
date: 'Thu, 12 Mar 2020 23:00:02 -0700'
date: "Thu, 12 Mar 2020 23:00:02 -0700"
---

# How auto can "handle the rest for you"
Expand Down
3 changes: 2 additions & 1 deletion docs/pages/docs/build-platforms/jenkins.mdx
Expand Up @@ -92,7 +92,7 @@ For `auto`'s prerelease to work you need to makes sure that you jenkins instance

![A screenshot of the jenkins configuration](/jenkins-next-branches.png)

2. Add this to the top of your `Jenkinsfile`.
2. Add this to the top of your `Jenkinsfile`.

```groovy
// Exit the branch build if not on "baseBranch" or a prerelease, but still do PR builds
Expand Down Expand Up @@ -120,6 +120,7 @@ For `auto`'s prerelease to work you need to makes sure that you jenkins instance
}
}
```

4. Add a stage for the prerelease

```groovy
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/docs/extras/create-labels.md
@@ -1 +1 @@
> :warning: For this to work you must have a \`GH_TOKEN\` set, ex: \`GH_TOKEN=YOUR_TOKEN auto create-labels\`
> :warning: For this to work you must have a \`GH_TOKEN\` set, ex: \`GH_TOKEN=YOUR_TOKEN auto create-labels\`
8 changes: 2 additions & 6 deletions docs/pages/docs/index.mdx
Expand Up @@ -7,11 +7,7 @@ import { GetStarted } from "../../plugins/get-started-button";
media="(prefers-color-scheme: dark)"
className="w-full"
/>
<img
src="light-logo-large.png"
alt="Auto Logo"
className="w-full"
/>
<img src="light-logo-large.png" alt="Auto Logo" className="w-full" />
</picture>
</div>

Expand Down Expand Up @@ -58,4 +54,4 @@ For instance, you could just use `auto changelog` to generate the changelog and

<div className="my-20 flex align-center justify-center w-full">
<GetStarted />
</div>
</div>
2 changes: 1 addition & 1 deletion docs/pages/docs/plugins/changelog-hooks.mdx
Expand Up @@ -14,7 +14,7 @@ This is where you hook into the changelog's hooks.
See examples below.

```ts
auto.hooks.onCreateChangelog.tapPromise('Giphy', (changelog, { bump }) => {});
auto.hooks.onCreateChangelog.tapPromise("Giphy", (changelog, { bump }) => {});
```

## addToBody
Expand Down
6 changes: 3 additions & 3 deletions docs/pages/index.mdx
@@ -1,7 +1,7 @@
---
layout: 'nav-bar'
layout: "nav-bar"
---

import Home from '../plugins/home'
import Home from "../plugins/home";

<Home />
<Home />
2 changes: 1 addition & 1 deletion docs/public/manifest.json
Expand Up @@ -7,4 +7,4 @@
"description": "The documentation for using auto.",
"display": "standalone",
"orientation": "portrait"
}
}
5 changes: 2 additions & 3 deletions package.json
Expand Up @@ -54,12 +54,11 @@
"copy-template-dir": "^1.4.0",
"endent": "^2.0.1",
"eslint": "^7.6.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-prettier": "^8.0.0",
"eslint-config-xo": "^0.33.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^24.0.1",
"eslint-plugin-jsdoc": "^31.0.3",
"eslint-plugin-prettier": "^3.1.4",
"graphql": "^15.0.0",
"husky": "^4.0.7",
"jest": "~26.6.3",
Expand All @@ -70,7 +69,7 @@
"lint-staged": "^10.0.7",
"next-ignite": "^0.9.20",
"patch-package": "^6.2.2",
"prettier": "^2.0.1",
"prettier": "^2.2.1",
"prism-react-renderer": "^1.1.1",
"push-dir": "^0.4.1",
"rimraf": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/__tests__/config.test.ts
Expand Up @@ -7,7 +7,7 @@ test.each(commands.map((c) => [c.name, c] as const))(
(name, command) => {
const configOptions = globalOptions.props[name]?.props || {};

expect.assertions(command.options?.filter((o) => o.config).length ?? 0);
expect.assertions(command.options?.filter((o) => o.config).length ?? 0);

Object.keys(configOptions).forEach((option) => {
expect(command.options.some((o) => camelCase(o.name) === option)).toBe(
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/__tests__/auto-in-pr-ci.test.ts
Expand Up @@ -37,7 +37,7 @@ jest.mock("@octokit/rest", () => {
};

issues = {
listLabelsOnIssue: jest.fn().mockReturnValue({ data: []}),
listLabelsOnIssue: jest.fn().mockReturnValue({ data: [] }),
};

hook = {
Expand Down Expand Up @@ -239,7 +239,7 @@ describe("next in ci", () => {
jest.spyOn(console, "log").mockImplementation();
auto.git!.getLatestTagInBranch = () => Promise.resolve("1.4.0-next.0");
auto.release!.getSemverBump = () => Promise.resolve(SEMVER.patch);

auto.git!.getLabels = () => Promise.resolve([]);
expect(await auto.getVersion()).toBe(SEMVER.prepatch);

Expand Down
34 changes: 18 additions & 16 deletions packages/core/src/auto-args.ts
Expand Up @@ -159,23 +159,25 @@ interface ForceOption {
force?: boolean;
}

export type ICanaryOptions = QuietOption & ForceOption & {
/** Do not actually do anything */
dryRun?: boolean;
/** THe PR to attach the canary to */
pr?: number;
/** The build to attach the canary to */
build?: number;
/** The message used when attaching the canary version to a PR */
message?: string | "false";
};
export type ICanaryOptions = QuietOption &
ForceOption & {
/** Do not actually do anything */
dryRun?: boolean;
/** THe PR to attach the canary to */
pr?: number;
/** The build to attach the canary to */
build?: number;
/** The message used when attaching the canary version to a PR */
message?: string | "false";
};

export type INextOptions = QuietOption & ForceOption & {
/** Do not actually do anything */
dryRun?: boolean;
/** The message used when attaching the prerelease version to a PR */
message?: string;
};
export type INextOptions = QuietOption &
ForceOption & {
/** Do not actually do anything */
dryRun?: boolean;
/** The message used when attaching the prerelease version to a PR */
message?: string;
};

export interface IInfoOptions {
/** List some of the available plugins */
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/config.ts
Expand Up @@ -91,7 +91,8 @@ export default class Config {
return {
...rawConfig,
labels,
prereleaseBranches: rawConfig.prereleaseBranches || DEFAULT_PRERELEASE_BRANCHES,
prereleaseBranches:
rawConfig.prereleaseBranches || DEFAULT_PRERELEASE_BRANCHES,
versionBranches:
typeof rawConfig.versionBranches === "boolean" &&
rawConfig.versionBranches
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/git.ts
Expand Up @@ -883,13 +883,13 @@ export default class Git {
"--merged",
branch,
]);

return tags
.split("\n")
.map((tag) => tag.trim())
.filter(Boolean);
} catch (error) {
return []
return [];
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/src/utils/__tests__/exec-promise.test.ts
Expand Up @@ -30,9 +30,11 @@ test("fails correctly", async () => {
});

test("fails correctly with GH_TOKEN", async () => {
process.env.GH_TOKEN = '1234567890'
process.env.GH_TOKEN = "1234567890";
expect.assertions(1);
return expect(exec("false", [process.env.GH_TOKEN])).rejects.toMatchInlineSnapshot(
return expect(
exec("false", [process.env.GH_TOKEN])
).rejects.toMatchInlineSnapshot(
`[Error: Running command 'false' with args [****7890] failed]`
);
});
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/utils/__tests__/load-plugin.test.ts
Expand Up @@ -41,7 +41,7 @@ jest.mock(

describe("loadPlugins", () => {
beforeEach(() => {
setLogLevel('quiet');
setLogLevel("quiet");
});

test("should load official plugins", () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/utils/load-plugins.ts
Expand Up @@ -132,8 +132,8 @@ export function findPlugin(

if (exists(localPath)) {
return localPath;
}
}

if (extendedLocation) {
localPath = path.join(
extendedLocation.endsWith("package.json")
Expand Down
7 changes: 6 additions & 1 deletion packages/core/src/utils/test-config/package.json
Expand Up @@ -2,7 +2,12 @@
"auto": {
"plugins": [
"./some-other-plugin.js",
["./some-plugin.js", {"foo": "bar"}]
[
"./some-plugin.js",
{
"foo": "bar"
}
]
]
}
}
4 changes: 1 addition & 3 deletions packages/package-json-utils/src/index.ts
Expand Up @@ -19,9 +19,7 @@ export interface IRepoConfig {
}

/** Try to the the owner/repo from the package.json */
export async function getRepo(): Promise<
IRepoConfig | undefined
> {
export async function getRepo(): Promise<IRepoConfig | undefined> {
const { repository } = await loadPackageJson();

if (!repository) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/gh-pages/README.md
Expand Up @@ -57,7 +57,7 @@ If you also want `auto` to run the build for you docs site provide the `buildCom
}
```

You *must* also make sure that your built website is in your `.gitignore`.
You _must_ also make sure that your built website is in your `.gitignore`.
Otherwise your release will fail because of uncommitted changes.

**.gitignore:**
Expand Down
4 changes: 2 additions & 2 deletions plugins/magic-zero/README.md
Expand Up @@ -13,7 +13,7 @@ _Starting version:_ `0.0.1`
`patch` => `0.0.2`
`minor` => `0.0.2`
`major` => `0.0.2`
`graduate` => `0.1.0`
`graduate` => `0.1.0`

**0.x.y:**

Expand All @@ -22,7 +22,7 @@ _Starting version:_ `0.1.0`
`patch` => `0.1.1`
`minor` => `0.1.1`
`major` => `0.2.0`
`graduate` => `1.0.0`
`graduate` => `1.0.0`

Once you're project is `>= 1.0.0` this plugin effectively does nothing.

Expand Down
2 changes: 1 addition & 1 deletion plugins/microsoft-teams/README.md
Expand Up @@ -15,7 +15,7 @@ yarn add -D @auto-it/microsoft-teams
## Usage

To use the plugin include it in your `.autorc`.
To generate incoming webhook in microsoft teams, checkout [this blog](https://medium.com/@ankush.kumar133/get-started-with-microsoft-team-connectors-incoming-webhook-a330657993e7).
To generate incoming webhook in microsoft teams, checkout [this blog](https://medium.com/@ankush.kumar133/get-started-with-microsoft-team-connectors-incoming-webhook-a330657993e7).

```json
{
Expand Down

0 comments on commit 8ead68c

Please sign in to comment.