Skip to content

Commit

Permalink
Merge branch 'main' into linter/no_duplicate_imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Spoutnik97 authored Nov 16, 2024
2 parents 5f404d3 + cf3415b commit 0bbf025
Show file tree
Hide file tree
Showing 709 changed files with 20,947 additions and 48,790 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: taiki-e/checkout-action@v1
- uses: crate-ci/[email protected].0
- uses: crate-ci/[email protected].3
with:
files: .

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare_release_oxlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ needs.prepare.outputs.pull-request-number }}
body: Triggering Ecosystem CI https://github.com/oxc-project/oxlint-ecosystem-ci/actions/workflows/ecosystem-ci.yml
body: Triggering Ecosystem CI https://github.com/oxc-project/oxlint-ecosystem-ci/actions/workflows/ci.yml

- uses: benc-uk/workflow-dispatch@v1
with:
repo: oxc-project/oxlint-ecosystem-ci
workflow: ecosystem-ci.yml
workflow: ci.yml
token: ${{ secrets.OXC_BOT_PAT }}
ref: main
inputs: '{ "issue-number": "${{ needs.prepare.outputs.pull-request-number }}", "comment-id": "${{ steps.comment.outputs.comment-id }}" }'
Expand Down
61 changes: 35 additions & 26 deletions Cargo.lock

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

49 changes: 25 additions & 24 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,30 +78,30 @@ doc_lazy_continuation = "allow" # FIXME

[workspace.dependencies]
# publish = true
oxc = { version = "0.35.0", path = "crates/oxc" }
oxc_allocator = { version = "0.35.0", path = "crates/oxc_allocator" }
oxc_ast = { version = "0.35.0", path = "crates/oxc_ast" }
oxc_ast_macros = { version = "0.35.0", path = "crates/oxc_ast_macros" }
oxc_cfg = { version = "0.35.0", path = "crates/oxc_cfg" }
oxc_codegen = { version = "0.35.0", path = "crates/oxc_codegen" }
oxc_data_structures = { version = "0.35.0", path = "crates/oxc_data_structures" }
oxc_diagnostics = { version = "0.35.0", path = "crates/oxc_diagnostics" }
oxc_ecmascript = { version = "0.35.0", path = "crates/oxc_ecmascript" }
oxc_estree = { version = "0.35.0", path = "crates/oxc_estree" }
oxc_index = { version = "0.35.0", path = "crates/oxc_index" }
oxc_isolated_declarations = { version = "0.35.0", path = "crates/oxc_isolated_declarations" }
oxc_mangler = { version = "0.35.0", path = "crates/oxc_mangler" }
oxc_minifier = { version = "0.35.0", path = "crates/oxc_minifier" }
oxc_module_lexer = { version = "0.35.0", path = "crates/oxc_module_lexer" }
oxc_parser = { version = "0.35.0", path = "crates/oxc_parser" }
oxc_regular_expression = { version = "0.35.0", path = "crates/oxc_regular_expression" }
oxc_semantic = { version = "0.35.0", path = "crates/oxc_semantic" }
oxc_sourcemap = { version = "0.35.0", path = "crates/oxc_sourcemap" }
oxc_span = { version = "0.35.0", path = "crates/oxc_span" }
oxc_syntax = { version = "0.35.0", path = "crates/oxc_syntax" }
oxc_transform_napi = { version = "0.35.0", path = "napi/transform" }
oxc_transformer = { version = "0.35.0", path = "crates/oxc_transformer" }
oxc_traverse = { version = "0.35.0", path = "crates/oxc_traverse" }
oxc = { version = "0.36.0", path = "crates/oxc" }
oxc_allocator = { version = "0.36.0", path = "crates/oxc_allocator" }
oxc_ast = { version = "0.36.0", path = "crates/oxc_ast" }
oxc_ast_macros = { version = "0.36.0", path = "crates/oxc_ast_macros" }
oxc_cfg = { version = "0.36.0", path = "crates/oxc_cfg" }
oxc_codegen = { version = "0.36.0", path = "crates/oxc_codegen" }
oxc_data_structures = { version = "0.36.0", path = "crates/oxc_data_structures" }
oxc_diagnostics = { version = "0.36.0", path = "crates/oxc_diagnostics" }
oxc_ecmascript = { version = "0.36.0", path = "crates/oxc_ecmascript" }
oxc_estree = { version = "0.36.0", path = "crates/oxc_estree" }
oxc_index = { version = "0.36.0", path = "crates/oxc_index" }
oxc_isolated_declarations = { version = "0.36.0", path = "crates/oxc_isolated_declarations" }
oxc_mangler = { version = "0.36.0", path = "crates/oxc_mangler" }
oxc_minifier = { version = "0.36.0", path = "crates/oxc_minifier" }
oxc_module_lexer = { version = "0.36.0", path = "crates/oxc_module_lexer" }
oxc_parser = { version = "0.36.0", path = "crates/oxc_parser" }
oxc_regular_expression = { version = "0.36.0", path = "crates/oxc_regular_expression" }
oxc_semantic = { version = "0.36.0", path = "crates/oxc_semantic" }
oxc_sourcemap = { version = "0.36.0", path = "crates/oxc_sourcemap" }
oxc_span = { version = "0.36.0", path = "crates/oxc_span" }
oxc_syntax = { version = "0.36.0", path = "crates/oxc_syntax" }
oxc_transform_napi = { version = "0.36.0", path = "napi/transform" }
oxc_transformer = { version = "0.36.0", path = "crates/oxc_transformer" }
oxc_traverse = { version = "0.36.0", path = "crates/oxc_traverse" }

# publish = false
oxc_linter = { path = "crates/oxc_linter" }
Expand Down Expand Up @@ -140,6 +140,7 @@ dashmap = "6.1.0"
encoding_rs = "0.8.34"
encoding_rs_io = "0.1.7"
env_logger = { version = "0.11.5", default-features = false }
fast-glob = "0.4.0"
flate2 = "1.0.34"
futures = "0.3.31"
glob = "0.3.1"
Expand Down
11 changes: 11 additions & 0 deletions THIRD-PARTY-LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,16 @@ SOFTWARE.

--------------------------------------------------------------------------------

eslint-plugin-promise

Copyright (c) 2020, Jamund Ferguson

Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

--------------------------------------------------------------------------------

jsparagus

Copyright (c) 2020 Mozilla Foundation
Expand Down Expand Up @@ -486,3 +496,4 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

2 changes: 1 addition & 1 deletion apps/oxlint/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oxlint"
version = "0.11.0"
version = "0.11.1"
authors.workspace = true
categories.workspace = true
edition.workspace = true
Expand Down
Loading

0 comments on commit 0bbf025

Please sign in to comment.