Merge branch 'main' into google-picker

transloadit · Nov 18, 2024 · aed3ecd · aed3ecd
2 parents 8abc480 + 8f97fd6
commit aed3ecd
Show file tree

Hide file tree

Showing 43 changed files with 475 additions and 118 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -443,7 +443,7 @@ module.exports = {
       rules: {
         'no-extra-semi': 'off',
         'no-restricted-syntax': ['error', {
-          selector: 'ImportDeclaration[importKind="type"][source.value=/^@uppy\\x2F[a-z-0-9]+\\x2F/]:not([source.value=/^@uppy\\x2Futils\\x2F/]):not([source.value=/\\.js$/])',
+          selector: 'ImportDeclaration[source.value=/^@uppy\\x2F[a-z-0-9]+\\x2F/]:not([source.value=/^@uppy\\x2Futils\\x2F/]):not([source.value=/\\.(js|css)$/])',
           message: 'Use ".js" file extension for import type declarations from a different package',
         }, {
           selector: 'ImportDeclaration[importKind="type"][source.value=/^\\.\\.?\\x2F.+\\.js$/]',