Skip to content

Commit

Permalink
chore: Merge branch master into rc/v11.0.0
Browse files Browse the repository at this point in the history
Merge pull request #2348 from cpcallen/chore/merge-master
  • Loading branch information
cpcallen authored May 10, 2024
2 parents 5eade55 + 0b7e472 commit 610b1b5
Show file tree
Hide file tree
Showing 254 changed files with 6,886 additions and 3,923 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x, 18.x, 20.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ PULL_REQUEST_TEMPLATE.md
plugins/dev-create/templates/sample-app/*
plugins/dev-create/templates/sample-app-ts/*

# Golden test files
plugins/**/golden/*
7 changes: 7 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ module.exports = [
// specific examples that are sometimes copied into plugins
'plugins/dev-create/templates/sample-app',
'plugins/dev-create/templates/sample-app-ts',
// Golden test files
'plugins/**/golden/*',
],
},
js.configs.recommended, // eslint-recommended
Expand Down Expand Up @@ -230,6 +232,11 @@ module.exports = [
match: false,
},
},
{
selector: 'variable',
modifiers: ['const'],
format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
},
],
'@typescript-eslint/consistent-type-assertions': 'error',

Expand Down
4 changes: 0 additions & 4 deletions examples/backpack-demo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ const toolbox = {
kind: 'block',
type: 'text',
},
{
kind: 'block',
type: 'text_multiline',
},
{
'kind': 'label',
'text': 'Input/Output:',
Expand Down
88 changes: 44 additions & 44 deletions examples/blockly-angular/package-lock.json

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

Loading

0 comments on commit 610b1b5

Please sign in to comment.