Skip to content

Commit

Permalink
Merge branch 'main' into utils-assert-our-parser
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaKGoldberg committed Jan 7, 2024
2 parents 7b30a3a + 5a33c2b commit 649917f
Show file tree
Hide file tree
Showing 133 changed files with 7,477 additions and 2,745 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,19 +279,25 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0 # we need the tags to be available

- name: Install
uses: ./.github/actions/prepare-install
with:
node-version: ${{ env.PRIMARY_NODE_VERSION }}
registry-url: 'https://registry.npmjs.org'

- name: Build
uses: ./.github/actions/prepare-build

# Fetch all history for all tags and branches in this job because lerna needs it
- run: |
git fetch --prune --unshallow
- name: Figure out and apply the next canary version
run: npx nx run repo-tools:apply-canary-version

- name: Publish all packages to npm
run: npx lerna publish --loglevel=verbose --canary --exact --force-publish --yes
- name: Publish all packages to npm with the canary tag
# NOTE: this needs to be npx, rather than yarn, to make sure the authenticated npm registry is used
run: npx nx release publish --tag canary --verbose
env:
NX_CLOUD_DISTRIBUTED_EXECUTION: false
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_CONFIG_PROVENANCE: true
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
package-lock=false
provenance=true
36 changes: 33 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,37 @@
# Change Log
## 6.18.0 (2024-01-06)


### 🚀 Features

- **eslint-plugin:** [no-var-requires, no-require-imports] allow option ([#7710](https://github.com/typescript-eslint/typescript-eslint/pull/7710))
- **typescript-estree:** throw on invalid update expressions ([#7202](https://github.com/typescript-eslint/typescript-eslint/pull/7202))
- **typescript-estree:** throw error when CatchClause param contains initializer ([#8183](https://github.com/typescript-eslint/typescript-eslint/pull/8183))

### ❤️ Thank You

- auvred @auvred
- Joshua Chen

You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.

# [6.17.0](https://github.com/typescript-eslint/typescript-eslint/compare/v6.16.0...v6.17.0) (2024-01-01)


### Bug Fixes

* **eslint-plugin:** [no-restricted-imports] prevent crash when `patterns` or `paths` in options are empty ([#8108](https://github.com/typescript-eslint/typescript-eslint/issues/8108)) ([675e987](https://github.com/typescript-eslint/typescript-eslint/commit/675e987ca1d13244c03d7e09d4e42c6539689d9a))


### Features

* **eslint-plugin:** [no-floating-promises] flag result of .map(async) ([#7897](https://github.com/typescript-eslint/typescript-eslint/issues/7897)) ([5857356](https://github.com/typescript-eslint/typescript-eslint/commit/5857356962060b19aa792bee778f9167ee54154b))
* **eslint-plugin:** [switch-exhaustiveness-check] add an option to warn against a `default` case on an already exhaustive `switch` ([#7539](https://github.com/typescript-eslint/typescript-eslint/issues/7539)) ([6a219bd](https://github.com/typescript-eslint/typescript-eslint/commit/6a219bdfe6fcf86aae28158e0d855f87a8bac719))

You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.




All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [6.16.0](https://github.com/typescript-eslint/typescript-eslint/compare/v6.15.0...v6.16.0) (2023-12-25)

Expand Down
73 changes: 12 additions & 61 deletions CONTRIBUTORS.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/Packages.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: Packages
---

The `@typescript-eslint/*` packages are all stored in [our GitHub monorepo](https://github.com/typescript-eslint/typescript-eslint).
The monorepo is built with [Lerna](https://lerna.js.org) and [Nx](https://nx.dev).
The monorepo is built and released with [Nx](https://nx.dev).

Each page in this section corresponds to a package we intentionally expose to users.
They are:
Expand Down
2 changes: 1 addition & 1 deletion docs/linting/Configurations.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,4 @@ If you feel strongly that a specific rule should (or should not) be one of these

None of the preset configs provided by typescript-eslint enable formatting rules (rules that only serve to enforce code whitespace and other trivia).
We strongly recommend you use Prettier or an equivalent for formatting your code, not ESLint formatting rules.
See [What About Formatting? > Suggested Usage](./troubleshooting/formatting#suggested-usage).
See [What About Formatting? > Suggested Usage](./troubleshooting/Formatting.mdx#suggested-usage---prettier).
2 changes: 2 additions & 0 deletions docs/maintenance/Releases.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ id: releases
title: Releases
---

{/* TODO: update references to lerna to be `nx release instead` */}

[Users > Releases](../users/Releases.mdx) describes how our automatic releases are done.
There is generally no maintenance activity we need to take for the weekly releases.

Expand Down
11 changes: 0 additions & 11 deletions lerna.json

This file was deleted.

21 changes: 21 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"nxCloudAccessToken": "YjIzMmMxMWItMjhiMS00NWY2LTk1NWYtYWU3YWQ0YjE4YjBlfHJlYWQ=",
"release": {
"changelog": {
"git": {
"commit": true,
"tag": true
},
"workspaceChangelog": {
"createRelease": "github",
"renderer": "tools/release/changelog-renderer"
},
"projectChangelogs": {
"renderer": "tools/release/changelog-renderer"
}
},
"version": {
"generatorOptions": {
"currentVersionResolver": "git-tag",
"specifierSource": "conventional-commits"
}
}
},
"targetDefaults": {
"build": {
"dependsOn": ["^build"],
Expand Down
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"check-docs": "npx nx run-many --target=check-docs --parallel",
"check-format": "prettier --check .",
"check-spelling": "cspell --config=.cspell.json \"**/*.{md,mdx,ts,mts,cts,js,cjs,mjs,tsx,jsx}\" --no-progress --show-context --show-suggestions",
"clean": "lerna clean -y && nx run-many --target=clean",
"clean": "nx run-many --target=clean",
"format": "prettier --write .",
"generate-breaking-changes": "npx nx run eslint-plugin:generate-breaking-changes",
"generate-configs": "npx nx run eslint-plugin:generate:configs",
Expand All @@ -43,6 +43,7 @@
"lint": "npx nx run-many --target=lint --parallel",
"postinstall": "npx nx run repo-tools:postinstall-script",
"pre-commit": "yarn lint-staged",
"release": "tsx tools/release/release.ts",
"start": "npx nx run website:start",
"test": "npx nx run-many --target=test --parallel --exclude integration-tests --exclude website --exclude website-eslint",
"test-integration": "npx nx run integration-tests:test",
Expand All @@ -59,9 +60,9 @@
"@babel/eslint-parser": "^7.23.3",
"@babel/parser": "^7.23.3",
"@babel/types": "^7.23.3",
"@nx/eslint": "17.1.2",
"@nx/jest": "17.1.2",
"@nx/workspace": "17.1.2",
"@nx/eslint": "17.2.8",
"@nx/jest": "17.2.8",
"@nx/workspace": "17.2.8",
"@prettier/sync": "^0.3.0",
"@swc/core": "^1.3.68",
"@swc/jest": "^0.2.26",
Expand Down Expand Up @@ -99,13 +100,12 @@
"jest-diff": "^29.6.2",
"jest-snapshot": "^29.6.2",
"jest-specific-snapshot": "^8.0.0",
"lerna": "7.4.2",
"lint-staged": "^15.0.0",
"make-dir": "^4.0.0",
"markdownlint-cli": "^0.37.0",
"ncp": "^2.0.0",
"netlify": "^13.1.9",
"nx": "17.1.2",
"nx": "17.2.8",
"prettier": "3.1.0",
"pretty-format": "^29.6.2",
"raw-loader": "^4.0.2",
Expand All @@ -114,7 +114,8 @@
"ts-node": "10.7.0",
"tslint": "^6.1.3",
"tsx": "^4.6.2",
"typescript": ">=4.3.5 <5.4.0"
"typescript": ">=4.3.5 <5.4.0",
"yargs": "17.7.1"
},
"resolutions": {
"@jest/create-cache-key-function": "^29",
Expand All @@ -141,7 +142,7 @@
"pretty-format": "^29",
"react-split-pane@^0.1.92": "patch:react-split-pane@npm%3A0.1.92#./.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch",
"tsx": "^4.6.2",
"typescript": "5.3.2"
"typescript": "5.3.3"
},
"packageManager": "yarn@3.7.0"
}
28 changes: 25 additions & 3 deletions packages/ast-spec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
# Change Log
## 6.18.0 (2024-01-06)


### 🚀 Features

- **typescript-estree:** throw on invalid update expressions

- **typescript-estree:** throw error when CatchClause param contains initializer


### ❤️ Thank You

- auvred
- Joshua Chen

You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.

# [6.17.0](https://github.com/typescript-eslint/typescript-eslint/compare/v6.16.0...v6.17.0) (2024-01-01)

**Note:** Version bump only for package @typescript-eslint/ast-spec

You can read about our [versioning strategy](https://main--typescript-eslint.netlify.app/users/versioning) and [releases](https://main--typescript-eslint.netlify.app/users/releases) on our website.




All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [6.16.0](https://github.com/typescript-eslint/typescript-eslint/compare/v6.15.0...v6.16.0) (2023-12-25)

Expand Down
2 changes: 1 addition & 1 deletion packages/ast-spec/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@typescript-eslint/ast-spec",
"version": "6.16.0",
"version": "6.18.0",
"description": "Complete specification for the TypeScript-ESTree AST",
"private": true,
"keywords": [
Expand Down
1 change: 0 additions & 1 deletion packages/ast-spec/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["packages/ast-spec/**/*.{mts,cts,ts,tsx}"],
"ignorePath": ".eslintignore"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a()++;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1++;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x?.y++;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x?.y.z++;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x?.y().z++;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(a())++;

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
class F {
#a;

m() {
this.#a++;
this.m().a++;
this[1] = 1;
F++;
// prettier-ignore
(this.#a)++;
(<number>this.#a)++;
(this.#a satisfies number)++;
(this.#a as number)++;
this.#a!++;
}
}

0 comments on commit 649917f

Please sign in to comment.