Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 86 additions & 43 deletions packages/blockly/eslint.config.mjs → eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import eslint from '@eslint/js';
import googleStyle from 'eslint-config-google';
import jsdoc from 'eslint-plugin-jsdoc';
import * as mdx from 'eslint-plugin-mdx';
import mochaPlugin from 'eslint-plugin-mocha';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import {defineConfig} from 'eslint/config';
import globals from 'globals';
import tseslint from 'typescript-eslint';

Expand Down Expand Up @@ -133,41 +135,64 @@ function buildTSOverride({files, tsconfig}) {
};
}

export default [
export default defineConfig(
{
// Note: there should be no other properties in this object
ignores: [
// Build artifacts
'msg/*',
'build/*',
'dist/*',
'typings/*',
'docs/*',
'packages/blockly/msg/*',
'packages/blockly/build/*',
'packages/blockly/dist/*',
'packages/blockly/typings/*',
'packages/blockly/docs/*',
// Tests other than mocha unit tests
'tests/blocks/*',
'tests/themes/*',
'tests/compile/*',
'tests/jsunit/*',
'tests/generators/*',
'tests/mocha/webdriver.js',
'tests/screenshot/*',
'tests/test_runner.js',
'tests/workspace_svg/*',
'packages/blockly/tests/blocks/*',
'packages/blockly/tests/themes/*',
'packages/blockly/tests/compile/*',
'packages/blockly/tests/jsunit/*',
'packages/blockly/tests/generators/*',
'packages/blockly/tests/mocha/webdriver.js',
'packages/blockly/tests/screenshot/*',
'packages/blockly/tests/test_runner.js',
'packages/blockly/tests/workspace_svg/*',
// Demos, scripts, misc
'node_modules/*',
'generators/*',
'demos/*',
'appengine/*',
'externs/*',
'closure/*',
'scripts/gulpfiles/*',
'CHANGELOG.md',
'PULL_REQUEST_TEMPLATE.md',
'packages/blockly/node_modules/*',
'packages/blockly/generators/*',
'packages/blockly/demos/*',
'packages/blockly/appengine/*',
'packages/blockly/externs/*',
'packages/blockly/closure/*',
'packages/blockly/scripts/gulpfiles/*',
'packages/blockly/CHANGELOG.md',
'packages/blockly/PULL_REQUEST_TEMPLATE.md',
// Docs
'packages/docs/docs/reference/**',
'packages/docs/build/**',
'packages/docs/.docusaurus/**',
'packages/docs/node_modules/**',
],
},
eslint.configs.recommended,
jsdoc.configs['flat/recommended'],
googleStyle,
{
files: ['packages/blockly/**/*.ts', 'packages/blockly/**/*.tsx', 'packages/blockly/**/*.js'],
extends: [eslint.configs.recommended, googleStyle],
languageOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
settings: {
// Allowlist some JSDoc tag aliases we use.
'jsdoc': {
'tagNamePreference': {
'return': 'return',
'fileoverview': 'fileoverview',
'extends': 'extends',
'constructor': 'constructor',
},
},
},
rules,
},
{
languageOptions: {
ecmaVersion: 2020,
Expand All @@ -188,14 +213,14 @@ export default [
},
{
files: [
'eslint.config.mjs',
'.prettierrc.js',
'gulpfile.mjs',
'scripts/helpers.js',
'tests/mocha/.mocharc.js',
'tests/migration/validate-renamings.mjs',
'tests/scripts/magic_symlink.js',
'tests/scripts/webdriver_helpers.js',
'packages/blockly/eslint.config.mjs',
'packages/blockly/.prettierrc.js',
'packages/blockly/gulpfile.mjs',
'packages/blockly/scripts/helpers.js',
'packages/blockly/tests/mocha/.mocharc.js',
'packages/blockly/tests/migration/validate-renamings.mjs',
'packages/blockly/tests/scripts/magic_symlink.js',
'packages/blockly/tests/scripts/webdriver_helpers.js',
],
languageOptions: {
globals: {
Expand All @@ -207,7 +232,7 @@ export default [
},
},
{
files: ['tests/**'],
files: ['packages/blockly/tests/**'],
plugins: {
mocha: mochaPlugin,
},
Expand Down Expand Up @@ -237,7 +262,7 @@ export default [
},
},
{
files: ['tests/browser/**'],
files: ['packages/blockly/tests/browser/**'],
languageOptions: {
sourceType: 'module',
globals: {
Expand All @@ -257,7 +282,7 @@ export default [
},
},
{
files: ['tests/mocha/**'],
files: ['packages/blockly/tests/mocha/**'],
languageOptions: {
sourceType: 'module',
globals: {
Expand All @@ -276,7 +301,7 @@ export default [
},
},
{
files: ['tests/node/**'],
files: ['packages/blockly/tests/node/**'],
languageOptions: {
globals: {
'console': true,
Expand All @@ -287,15 +312,15 @@ export default [
},
},
{
files: ['tests/playgrounds/**', 'tests/scripts/**'],
files: ['packages/blockly/tests/playgrounds/**', 'packages/blockly/tests/scripts/**'],
languageOptions: {
globals: {
...globals.browser,
},
},
},
{
files: ['scripts/**'],
files: ['packages/blockly/scripts/**'],
languageOptions: {
globals: {
...globals.browser,
Expand All @@ -307,17 +332,35 @@ export default [
'jsdoc/tag-lines': ['off'],
},
},
{
...mdx.flat,
files: ['packages/docs/**/*.mdx'],
rules: {
...mdx.flat.rules,
'mdx/remark': 'off',
},
},
{
...mdx.flat,
files: ['packages/docs/**/*.md'],
...mdx.flatCodeBlocks,
rules: {
...mdx.flat.rules,
...mdx.flatCodeBlocks.rules,
'mdx/remark': 'off',
},
},
...tseslint.config(
buildTSOverride({
files: ['**/*.ts', '**/*.tsx'],
files: ['packages/blockly/**/*.ts', 'packages/blockly/**/*.tsx'],
tsconfig: './tsconfig.json',
}),
buildTSOverride({
files: ['tests/typescript/**/*.ts', 'tests/typescript/**/*.tsx'],
files: ['packages/blockly/tests/typescript/**/*.ts', 'packages/blockly/tests/typescript/**/*.tsx'],
tsconfig: './tests/typescript/tsconfig.json',
}),
),
// Per the docs, this should be at the end because it disables rules that
// conflict with Prettier.
eslintPluginPrettierRecommended,
];
);
90 changes: 61 additions & 29 deletions package-lock.json

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

10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,15 @@
],
"devDependencies": {
"@commitlint/cli": "^21.2.0",
"@commitlint/config-conventional": "^21.0.2"
"@commitlint/config-conventional": "^21.0.2",
"@eslint/js": "^10.0.1",
"eslint": "10.5.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-jsdoc": "^63.0.11",
"eslint-plugin-mdx": "^3.7.0",
"eslint-plugin-mocha": "^11.3.0",
"eslint-plugin-prettier": "^5.5.5"
},
"scripts": {
"test": "npm run test --ws --if-present",
Expand Down
7 changes: 0 additions & 7 deletions packages/blockly/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
"@blockly/block-test": "^7.0.6",
"@blockly/dev-tools": "^9.0.9",
"@blockly/theme-modern": "^7.0.5",
"@eslint/js": "^10.0.1",
"@hyperjump/browser": "^1.3.1",
"@hyperjump/json-schema": "^1.17.6",
"@microsoft/api-documenter": "7.30.7",
Expand All @@ -115,12 +114,6 @@
"concurrently": "^10.0.3",
"conventional-changelog-conventionalcommits": "^9.3.1",
"conventional-recommended-bump": "^12.0.0",
"eslint": "10.5.0",
"eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-jsdoc": "^63.0.11",
"eslint-plugin-mocha": "^11.3.0",
"eslint-plugin-prettier": "^5.5.5",
"glob": "^13.0.6",
"globals": "^17.7.0",
"google-closure-compiler": "^20260520.0.0",
Expand Down
Loading
Loading