Skip to content

Commit

Permalink
chore(storm-ops): Resolve merge conflicts in main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
sullivanpj committed Jun 28, 2024
2 parents 36c1c2c + 64654e4 commit fe04108
Show file tree
Hide file tree
Showing 8 changed files with 7,410 additions and 15,142 deletions.
7 changes: 7 additions & 0 deletions packages/eslint-plugin-graphql/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 0.3.0 (2024-06-26)

### 🚀 Features

- **eslint-plugin:** No longer provide duplicate require methods
([10bf27a6](https://github.com/storm-software/storm-ops/commit/10bf27a6))

## 0.2.1 (2024-06-26)

### 🩹 Fixes
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-storm-graphql",
"version": "0.2.1",
"version": "0.3.0",
"type": "module",
"description": "⚡ The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
"repository": {
Expand Down
7 changes: 7 additions & 0 deletions packages/eslint-plugin-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 0.3.0 (2024-06-26)

### 🚀 Features

- **eslint-plugin:** No longer provide duplicate require methods
([10bf27a6](https://github.com/storm-software/storm-ops/commit/10bf27a6))

## 0.2.1 (2024-06-26)

### 🩹 Fixes
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-storm-react",
"version": "0.2.1",
"version": "0.3.0",
"type": "module",
"description": "⚡ The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
"repository": {
Expand Down
11 changes: 9 additions & 2 deletions packages/eslint-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
## 0.18.0 (2024-06-26)
## 0.19.0 (2024-06-26)

### 🚀 Features

- **eslint-plugin:** No longer provide duplicate require methods
([10bf27a6](https://github.com/storm-software/storm-ops/commit/10bf27a6))

## 0.18.0 (2024-06-26)

### 🚀 Features

- **eslint-plugin:** Include typings in published package ([19902d74](https://github.com/storm-software/storm-ops/commit/19902d74))
- **eslint-plugin:** Include typings in published package
([19902d74](https://github.com/storm-software/storm-ops/commit/19902d74))

## 0.17.1 (2024-06-26)

Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages

<h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />

[![Version](https://img.shields.io/badge/version-0.17.1-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
[![Version](https://img.shields.io/badge/version-0.19.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with docusaurus](https://img.shields.io/badge/documented_with-docusaurus-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://docusaurus.io/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)

> [!IMPORTANT]
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-storm-software",
"version": "0.18.0",
"version": "0.19.0",
"type": "module",
"description": "⚡ The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
"repository": {
Expand Down
22,519 changes: 7,383 additions & 15,136 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

0 comments on commit fe04108

Please sign in to comment.