Update to eslint v9 and eslint-config-scratch v12 #327
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| import {eslintConfigScratch} from 'eslint-config-scratch'; | ||
| import {globalIgnores} from 'eslint/config'; | ||
| import globals from 'globals'; | ||
| import importPlugin from 'eslint-plugin-import'; | ||
| import path from 'path'; | ||
|
|
||
| export default eslintConfigScratch.defineConfig( | ||
| eslintConfigScratch.legacy.base, | ||
| importPlugin.flatConfigs.errors, | ||
| { | ||
| files: ['*.{js,cjs,mjs,ts}', 'scripts/**/*.{js,cjs,mjs,ts}'], | ||
| extends: [eslintConfigScratch.legacy.node], | ||
| languageOptions: { | ||
| globals: globals.node | ||
| }, | ||
| rules: { | ||
| 'no-console': 'off' | ||
| }, | ||
| settings: { | ||
| // TODO: figure out why this is needed... | ||
| // probably something with eslint-plugin-import's parser or resolver | ||
| 'import/core-modules': [ | ||
| 'eslint/config' | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| files: ['{src,test}/**/*.{js,cjs,mjs,jsx,ts,tsx}'], | ||
| extends: [ | ||
| eslintConfigScratch.legacy.es6, | ||
| eslintConfigScratch.legacy.react, | ||
| eslintConfigScratch.legacy.typescript | ||
| ], | ||
| languageOptions: { | ||
| globals: { | ||
| ...globals.browser, | ||
| process: 'readonly' | ||
| }, | ||
| parserOptions: { | ||
| projectService: false, | ||
| tsconfigRootDir: import.meta.dirname, | ||
| project: [ | ||
| 'tsconfig.json', | ||
| 'tsconfig.test.json' | ||
| ] | ||
| } | ||
| }, | ||
| settings: { | ||
| 'react': { | ||
| version: 'detect' | ||
| }, | ||
| 'import/resolver': { | ||
| webpack: { | ||
| config: path.resolve(import.meta.dirname, 'webpack.config.js') | ||
| } | ||
| } | ||
| }, | ||
| rules: { | ||
| // BEGIN: these caused trouble after upgrading eslint-plugin-react from 7.24.0 to 7.33.2 | ||
| 'react/forbid-prop-types': 'warn', | ||
| 'react/no-unknown-property': 'warn', | ||
| // END: these caused trouble after upgrading eslint-plugin-react from 7.24.0 to 7.33.2 | ||
|
|
||
| // we should probably just fix these... | ||
| 'arrow-parens': 'warn', | ||
| 'react/no-deprecated': 'warn', | ||
| 'require-atomic-updates': 'warn', | ||
| '@typescript-eslint/no-unused-vars': ['warn', { | ||
| args: 'after-used', | ||
| caughtErrors: 'none', // TODO: use caughtErrorsPattern instead | ||
| varsIgnorePattern: '^_' | ||
| }], | ||
| '@typescript-eslint/no-use-before-define': 'warn', | ||
| '@typescript-eslint/prefer-promise-reject-errors': 'warn' | ||
| } | ||
| }, | ||
| { | ||
| files: ['test/**/*.{js,cjs,mjs,jsx,ts,tsx}'], | ||
| languageOptions: { | ||
| globals: { | ||
| ...globals.jest, | ||
| ...globals.node | ||
| } | ||
| }, | ||
| rules: { | ||
| 'max-len': [ | ||
| 'warn', | ||
| // settings copied from eslint-config-scratch.legacy.base | ||
| { | ||
| code: 120, | ||
| tabWidth: 4, | ||
| ignoreUrls: true | ||
| } | ||
| ], | ||
| 'react/prop-types': 'off' // don't worry about prop types in tests | ||
| } | ||
| }, | ||
| { | ||
| files: ['{src,test}/**/*.{ts,tsx}'], | ||
| rules: { | ||
| // TODO: get TS parsing to work with eslint-plugin-import | ||
| 'import/named': 'off' | ||
| } | ||
| }, | ||
| { | ||
| // disable some checks for these generated files | ||
| files: ['{src,test}/**/types.d.ts'], | ||
| rules: { | ||
| '@stylistic/indent': 'off' | ||
| } | ||
| }, | ||
| { | ||
| files: [ | ||
| 'src/lib/libraries/extensions/index.jsx', | ||
| 'src/lib/libraries/decks/*.js' | ||
| ], | ||
| rules: { | ||
| // the way these files are built makes duplicate imports the natural way to do things | ||
| 'no-duplicate-imports': 'off' | ||
| } | ||
| }, | ||
| { | ||
| files: ['test/unit/util/define-dynamic-block.test.js'], | ||
| settings: { | ||
| // TODO: figure out why this is needed... | ||
| // probably something with eslint-plugin-import's parser or resolver | ||
| 'import/core-modules': [ | ||
| '@scratch/scratch-vm/src/extension-support/block-type' | ||
| ] | ||
| } | ||
| }, | ||
| globalIgnores([ | ||
| 'build/**/*', | ||
| 'dist/**/*', | ||
| 'node_modules/**/*' | ||
| ]) | ||
| ); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ | |
| import styles from './library.css'; | ||
|
|
||
| const localStorageAvailable = | ||
| 'localStorage' in window && window.localStorage !== null; | ||
|
|
||
| const messages = defineMessages({ | ||
| filterPlaceholder: { | ||
|
|
@@ -67,10 +67,10 @@ | |
| const ALL_TAG = {tag: 'all', intlLabel: messages.allTag}; | ||
| const tagListPrefix = [ALL_TAG]; | ||
|
|
||
| /** | ||
|
Check warning on line 70 in packages/scratch-gui/src/components/library/library.jsx
|
||
| * Find the AssetType which corresponds to a particular file extension. For example, 'png' => AssetType.ImageBitmap. | ||
| * @param {string} fileExtension - the file extension to look up. | ||
| * @returns {AssetType} - the AssetType corresponding to the extension, if any. | ||
|
Check warning on line 73 in packages/scratch-gui/src/components/library/library.jsx
|
||
| */ | ||
| const getAssetTypeForFileExtension = function (fileExtension) { | ||
| const compareOptions = { | ||
|
|
@@ -86,7 +86,7 @@ | |
| } | ||
| }; | ||
|
|
||
| /** | ||
|
Check warning on line 89 in packages/scratch-gui/src/components/library/library.jsx
|
||
| * Figure out one or more icon(s) for a library item. | ||
| * If it's an animated thumbnail, this will return an array of `imageSource`. | ||
| * Otherwise it'll return just one `imageSource`. | ||
|
|
@@ -211,7 +211,7 @@ | |
| this.driver.destroy(); | ||
| this.driver = null; | ||
| } | ||
|
|
||
| if (this.animationFrameId) { | ||
| window.cancelAnimationFrame(this.animationFrameId); | ||
| } | ||
|
|
@@ -225,18 +225,18 @@ | |
| if (this.driver) { | ||
| this.driver.refresh(); | ||
| } | ||
|
|
||
| this.animationFrameId = null; | ||
| }); | ||
| } | ||
| handleSelect (id) { | ||
| const selectedItem = this.getFilteredData().find(item => this.constructKey(item) === id); | ||
|
|
||
| if (this.state.shouldShowFaceSensingCallout && selectedItem.extensionId === 'faceSensing') { | ||
| if (!this.driver) { | ||
| return; | ||
| } | ||
|
|
||
| setHasUsedFaceSensing(this.props.username); | ||
| this.setState({ | ||
| shouldShowFaceSensingCallout: false | ||
|
|
@@ -468,7 +468,7 @@ | |
|
|
||
| LibraryComponent.propTypes = { | ||
| data: PropTypes.arrayOf( | ||
| // An item in the library | ||
| PropTypes.shape({ | ||
| // @todo remove md5/rawURL prop from library, refactor to use storage | ||
|
|
@@ -479,7 +479,7 @@ | |
| ]), | ||
| rawURL: PropTypes.string | ||
| }) | ||
| ), | ||
| filterable: PropTypes.bool, | ||
| withCategories: PropTypes.bool, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was surprised to find that I had to update
jestandts-jestto get this all to work. I'm not sure exactly what the interaction was, but once I updated all theeslint-related things,jeststarted to fail with a parse error.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I figured it out, at least partially:
[email protected]requirestypescript@^2.4.1, but@typescript-eslint/eslint-pluginrequirestypescript>=4.8.4 <6.0.0. Npm "helpfully" resolves this by (among other things) providing a newerjest-clitoscratch-guithan the[email protected]thatscratch-gui/package.jsonasks for. Bringing in a newer version of Jest introduces several new requirements that seem to be met by properly updatingjestandts-jest.There are still a few holes in my understanding here, like why npm makes available a version of
jestthat doesn't matchpackage.jsoninstead of throwing an error, but I'm at least closer to understanding it 😅