Головна сторінка Огляд Довідка
Увійти
biheng
/
uppy
1
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

meta: harden linter rule for JSX/ESM validation (#3681)

Previously, we were using Babel parser to lint our files, which has the
downside of auto-magically convert JSX syntax to classic JS syntax,
which doesn't let us forbid JSX syntax on `.js` files, which makes
the transition from CJS  to ESM a bit error prone.
Since we are no longer using language features that are not already
supported by Espree parser, we can safely disable Babel parser for
those files. We can re-enable it later once the transition is done.
Antoine du Hamel 3 роки тому
батько
134539ab52
коміт
df12aecb56
5 змінених файлів з 56 додано та 64 видалено
Розділений вигляд Показати статистику Diff
  1. 7 5
      .eslintrc.js
  2. 0 0
      e2e/clients/dashboard-react/App.jsx
  3. 1 1
      e2e/clients/dashboard-react/index.html
  4. 1 1
      e2e/clients/dashboard-react/index.jsx
  5. 47 57
      yarn.lock

+ 7 - 5
.eslintrc.js
Переглянути файл 

@@ -36,7 +36,7 @@ module.exports = {
 
   parser: '@babel/eslint-parser',
 
   parserOptions: {
 
     sourceType: 'script',
 
-    ecmaVersion: 2021,
 
+    ecmaVersion: 2022,
 
     ecmaFeatures: {
 
       jsx: true,
 
     },
 
@@ -148,9 +148,10 @@ module.exports = {
 
   overrides: [
 
     {
 
       files: [
 
-        'packages/@uppy/*/src/**/*.jsx',
 
-        'packages/uppy/src/**/*.jsx',
 
+        '*.jsx',
 
+        'packages/@uppy/react-native/**/*.js',
 
       ],
 
+      parser: 'espree',
 
       parserOptions: {
 
         sourceType: 'module',
 
         ecmaFeatures: {
 
@@ -204,11 +205,11 @@ module.exports = {
 
         'packages/@uppy/facebook/src/**/*.js',
 
         'packages/@uppy/file-input/src/**/*.js',
 
         'packages/@uppy/form/src/**/*.js',
 
-        'packages/@uppy/react-native/**/*.js',
 
         'packages/@uppy/svelte/src/**/*.js',
 
         'packages/@uppy/svelte/rollup.config.js',
 
         'packages/@uppy/vue/src/**/*.js',
 
       ],
 
+      parser: 'espree',
 
       parserOptions: {
 
         sourceType: 'module',
 
         ecmaFeatures: {
 
@@ -216,6 +217,7 @@ module.exports = {
 
         },
 
       },
 
       rules: {
 
+        'import/named': 'off', // Disabled because that rule tries and fails to parse JSX dependencies.
 
         'no-restricted-globals': [
 
           'error',
 
           {
 
@@ -429,7 +431,7 @@ module.exports = {
 
       extends: ['plugin:cypress/recommended'],
 
     },
 
     {
 
-      files: ['e2e/**/*.ts', 'e2e/**/*.js'],
 
+      files: ['e2e/**/*.ts', 'e2e/**/*.js', 'e2e/**/*.jsx'],
 
       rules: { 'import/no-extraneous-dependencies': 'off' },
 
     },
 
   ],

+ 0 - 0
e2e/clients/dashboard-react/App.js → e2e/clients/dashboard-react/App.jsx
Переглянути файл


+ 1 - 1
e2e/clients/dashboard-react/index.html
Переглянути файл 

@@ -3,7 +3,7 @@
 
   <head>
 
     <meta charset="utf-8"/>
 
     <title>dashboard-react</title>
 
-    <script defer type="module" src="index.js"></script>
 
+    <script defer type="module" src="index.jsx"></script>
 
   </head>
 
   <body>
 
     <div id="app"></div>

+ 1 - 1
e2e/clients/dashboard-react/index.js → e2e/clients/dashboard-react/index.jsx
Переглянути файл 

@@ -1,5 +1,5 @@
 
 /* eslint-disable react/react-in-jsx-scope */
 
 import ReactDOM from 'react-dom'
 
-import App from './App.js'
 
+import App from './App.jsx'
 
 
 ReactDOM.render(<App />, document.getElementById('app'))

+ 47 - 57
yarn.lock
Переглянути файл 

@@ -11506,21 +11506,12 @@ __metadata:
 
   languageName: node
 
   linkType: hard
 
 
-"acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.6.0":
 
-  version: 8.6.0
 
-  resolution: "acorn@npm:8.6.0"
 
-  bin:
 
-    acorn: bin/acorn
 
-  checksum: 9d0de73b73cb6ea8ccd8263a8144d9e2c4b6af90ea0c429997538af0ebbe83c5addecee814b2a7f91f7f615d0bd1547cc7137b3fa236ce058adc64feccee850b
 
-  languageName: node
 
-  linkType: hard
 
-
 
-"acorn@npm:^8.5.0":
 
-  version: 8.7.0
 
-  resolution: "acorn@npm:8.7.0"
 
+"acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.0":
 
+  version: 8.7.1
 
+  resolution: "acorn@npm:8.7.1"
 
   bin:
 
     acorn: bin/acorn
 
-  checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0
 
+  checksum: aca0aabf98826717920ac2583fdcad0a6fbe4e583fdb6e843af2594e907455aeafe30b1e14f1757cd83ce1776773cf8296ffc3a4acf13f0bd3dfebcf1db6ae80
 
   languageName: node
 
   linkType: hard
 
 
@@ -19496,14 +19487,13 @@ __metadata:
 
   languageName: node
 
   linkType: hard
 
 
-"eslint-module-utils@npm:^2.7.1":
 
-  version: 2.7.1
 
-  resolution: "eslint-module-utils@npm:2.7.1"
 
+"eslint-module-utils@npm:^2.7.3":
 
+  version: 2.7.3
 
+  resolution: "eslint-module-utils@npm:2.7.3"
 
   dependencies:
 
     debug: ^3.2.7
 
     find-up: ^2.1.0
 
-    pkg-dir: ^2.0.0
 
-  checksum: c30dfa125aafe65e5f6a30a31c26932106fcf09934a2f47d7f8a393ed9106da7b07416f2337b55c85f9db0175c873ee0827be5429a24ec381b49940f342b9ac3
 
+  checksum: 77048263f309167a1e6a1e1b896bfb5ddd1d3859b2e2abbd9c32c432aee13d610d46e6820b1ca81b37fba437cf423a404bc6649be64ace9148a3062d1886a678
 
   languageName: node
 
   linkType: hard
 
 
@@ -19549,25 +19539,25 @@ __metadata:
 
   linkType: hard
 
 
 "eslint-plugin-import@npm:^2.22.1, eslint-plugin-import@npm:^2.25.2":
 
-  version: 2.25.3
 
-  resolution: "eslint-plugin-import@npm:2.25.3"
 
+  version: 2.26.0
 
+  resolution: "eslint-plugin-import@npm:2.26.0"
 
   dependencies:
 
     array-includes: ^3.1.4
 
     array.prototype.flat: ^1.2.5
 
     debug: ^2.6.9
 
     doctrine: ^2.1.0
 
     eslint-import-resolver-node: ^0.3.6
 
-    eslint-module-utils: ^2.7.1
 
+    eslint-module-utils: ^2.7.3
 
     has: ^1.0.3
 
-    is-core-module: ^2.8.0
 
+    is-core-module: ^2.8.1
 
     is-glob: ^4.0.3
 
-    minimatch: ^3.0.4
 
+    minimatch: ^3.1.2
 
     object.values: ^1.1.5
 
-    resolve: ^1.20.0
 
-    tsconfig-paths: ^3.11.0
 
+    resolve: ^1.22.0
 
+    tsconfig-paths: ^3.14.1
 
   peerDependencies:
 
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
 
-  checksum: 8bdf4b1fafb0e5c8f57a1673f72d84307d32c06a23942990d198c8b32a85a5ae0098872d1ef5bf80d7dfe8ec542f6a671e3c5e706731a80b493c9015f7a147f5
 
+  checksum: 0bf77ad80339554481eafa2b1967449e1f816b94c7a6f9614ce33fb4083c4e6c050f10d241dd50b4975d47922880a34de1e42ea9d8e6fd663ebb768baa67e655
 
   languageName: node
 
   linkType: hard
 
 
@@ -19792,10 +19782,10 @@ __metadata:
 
   languageName: node
 
   linkType: hard
 
 
-"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.1.0":
 
-  version: 3.1.0
 
-  resolution: "eslint-visitor-keys@npm:3.1.0"
 
-  checksum: fd2d613bb315bc549068ca97771d868437fb60c8f13ef8d6d54669773ff53f814b759fa9e57966f15e4c50a5f5e11c6ba47060b8f201f9776311f6c5d5c11b70
 
+"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.1.0, eslint-visitor-keys@npm:^3.3.0":
 
+  version: 3.3.0
 
+  resolution: "eslint-visitor-keys@npm:3.3.0"
 
+  checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808
 
   languageName: node
 
   linkType: hard
 
 
@@ -19848,13 +19838,13 @@ __metadata:
 
   linkType: hard
 
 
 "espree@npm:^9.2.0":
 
-  version: 9.2.0
 
-  resolution: "espree@npm:9.2.0"
 
+  version: 9.3.1
 
+  resolution: "espree@npm:9.3.1"
 
   dependencies:
 
-    acorn: ^8.6.0
 
+    acorn: ^8.7.0
 
     acorn-jsx: ^5.3.1
 
-    eslint-visitor-keys: ^3.1.0
 
-  checksum: ae533a058036e3efeeac43a0ee39c74ab347e2a73bbe2946fba33cc0d84aca657e675bc317ed9afd95338f79d5d5a862afec2f717d2539ae13fa9f1638371761
 
+    eslint-visitor-keys: ^3.3.0
 
+  checksum: d7161db30b65427e0799383699ac4c441533a38faee005153694b68b933ba7a24666680edfc490fa77e3a84a22dbd955768034a6f811af5049774eead83063a5
 
   languageName: node
 
   linkType: hard
 
 
@@ -24376,7 +24366,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
 
   languageName: node
 
   linkType: hard
 
 
-"is-core-module@npm:^2.2.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.0":
 
+"is-core-module@npm:^2.2.0, is-core-module@npm:^2.5.0":
 
   version: 2.8.0
 
   resolution: "is-core-module@npm:2.8.0"
 
   dependencies:
 
@@ -29444,7 +29434,16 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
 
   languageName: node
 
   linkType: hard
 
 
-"minimatch@npm:2 || 3, minimatch@npm:3.0.4, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:~3.0.2, minimatch@npm:~3.0.4":
 
+"minimatch@npm:2 || 3, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.1.2":
 
+  version: 3.1.2
 
+  resolution: "minimatch@npm:3.1.2"
 
+  dependencies:
 
+    brace-expansion: ^1.1.7
 
+  checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a
 
+  languageName: node
 
+  linkType: hard
 
+
 
+"minimatch@npm:3.0.4, minimatch@npm:~3.0.2, minimatch@npm:~3.0.4":
 
   version: 3.0.4
 
   resolution: "minimatch@npm:3.0.4"
 
   dependencies:
 
@@ -29474,10 +29473,10 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
 
   languageName: node
 
   linkType: hard
 
 
-"minimist@npm:^1.0.0, minimist@npm:^1.1.0, minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.5":
 
-  version: 1.2.5
 
-  resolution: "minimist@npm:1.2.5"
 
-  checksum: 86706ce5b36c16bfc35c5fe3dbb01d5acdc9a22f2b6cc810b6680656a1d2c0e44a0159c9a3ba51fb072bb5c203e49e10b51dcd0eec39c481f4c42086719bae52
 
+"minimist@npm:^1.0.0, minimist@npm:^1.1.0, minimist@npm:^1.1.1, minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
 
+  version: 1.2.6
 
+  resolution: "minimist@npm:1.2.6"
 
+  checksum: d15428cd1e11eb14e1233bcfb88ae07ed7a147de251441d61158619dfb32c4d7e9061d09cab4825fdee18ecd6fce323228c8c47b5ba7cd20af378ca4048fb3fb
 
   languageName: node
 
   linkType: hard
 
 
@@ -32293,15 +32292,6 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
 
   languageName: node
 
   linkType: hard
 
 
-"pkg-dir@npm:^2.0.0":
 
-  version: 2.0.0
 
-  resolution: "pkg-dir@npm:2.0.0"
 
-  dependencies:
 
-    find-up: ^2.1.0
 
-  checksum: 8c72b712305b51e1108f0ffda5ec1525a8307e54a5855db8fb1dcf77561a5ae98e2ba3b4814c9806a679f76b2f7e5dd98bde18d07e594ddd9fdd25e9cf242ea1
 
-  languageName: node
 
-  linkType: hard
 
-
 
 "pkg-dir@npm:^3.0.0":
 
   version: 3.0.0
 
   resolution: "pkg-dir@npm:3.0.0"
 
@@ -36550,7 +36540,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
 
   languageName: node
 
   linkType: hard
 
 
-"resolve@npm:^1.1.5, resolve@npm:^1.12.0":
 
+"resolve@npm:^1.1.5, resolve@npm:^1.12.0, resolve@npm:^1.22.0":
 
   version: 1.22.0
 
   resolution: "resolve@npm:1.22.0"
 
   dependencies:
 
@@ -36590,7 +36580,7 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
 
   languageName: node
 
   linkType: hard
 
 
-"resolve@patch:resolve@^1.1.5#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>":
 
+"resolve@patch:resolve@^1.1.5#~builtin<compat/resolve>, resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>":
 
   version: 1.22.0
 
   resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin<compat/resolve>::version=1.22.0&hash=07638b"
 
   dependencies:
 
@@ -40827,15 +40817,15 @@ hexo-filter-github-emojis@arturi/hexo-filter-github-emojis:
 
   languageName: node
 
   linkType: hard
 
 
-"tsconfig-paths@npm:^3.11.0, tsconfig-paths@npm:^3.9.0":
 
-  version: 3.12.0
 
-  resolution: "tsconfig-paths@npm:3.12.0"
 
+"tsconfig-paths@npm:^3.14.1, tsconfig-paths@npm:^3.9.0":
 
+  version: 3.14.1
 
+  resolution: "tsconfig-paths@npm:3.14.1"
 
   dependencies:
 
     "@types/json5": ^0.0.29
 
     json5: ^1.0.1
 
-    minimist: ^1.2.0
 
+    minimist: ^1.2.6
 
     strip-bom: ^3.0.0
 
-  checksum: 4999ec6cd1c7cc06750a460dbc0d39fe3595a4308cb5f1d0d0a8283009cf9c0a30d5a156508c28fe3a47760508af5263ab288fc23d71e9762779674257a95d3b
 
+  checksum: 8afa01c673ebb4782ba53d3a12df97fa837ce524f8ad38ee4e2b2fd57f5ac79abc21c574e9e9eb014d93efe7fe8214001b96233b5c6ea75bd1ea82afe17a4c6d
 
   languageName: node
 
   linkType: hard