eslint-plugin-mpx 0.2.20-3 → 0.2.21

package/README.md

@@ -24,12 +24,11 @@ https://mpx-ecology.github.io/eslint-plugin-mpx/
 
 Add `mpx` to the plugins section of your `.eslintrc` configuration file. You can omit the `eslint-plugin-` prefix:
 
-```json
-{
-    "extends": [
-       "plugin:mpx/mpx-essential"
-    ]
-}
+```js
+const eslintPluginMpx = require('eslint-plugin-mpx')
+module.exports = [
+    ...eslintPluginMpx.configs['flat/composition-api-essential']
+]
 ```
 
 

package/lib/configs/flat/base.js

@@ -14,10 +14,28 @@ module.exports = [
     files: ['*.mpx', '**/*.mpx'],
     languageOptions: {
       parser: require('mpx-eslint-parser'),
-      sourceType: 'module'
-    },
-    rules: {
-      'mpx/comment-directive': 'error'
+      sourceType: 'module',
+      globals: {
+        wx: 'readonly',
+        my: 'readonly',
+        swan: 'readonly',
+        qq: 'readonly',
+        tt: 'readonly',
+        jd: 'readonly',
+        qa: 'readonly',
+        dd: 'readonly',
+        getCurrentPages: 'readonly',
+        getRegExp: 'readonly',
+        getApp: 'readonly',
+        App: 'readonly',
+        Page: 'readonly',
+        Component: 'readonly',
+        Behavior: 'readonly',
+        requirePlugin: 'readonly',
+        requireMiniProgram: 'readonly',
+        __mpx_mode__: 'readonly',
+        __mpx_env__: 'readonly'
+      }
     },
     processor: 'mpx/mpx'
   }

package/lib/configs/flat/composition-api-essential.js

@@ -2,10 +2,11 @@
 const config = require('./base.js')
 
 module.exports = [
-  ...config,
   {
+    ...config[0],
     name: 'mpx/composition-api-essential/rules',
     rules: {
+      'mpx/comment-directive': 'error',
       'mpx/html-end-tags': 'error',
       'mpx/no-dupe-wx-elif': 'error',
       'mpx/no-duplicate-attributes': 'error',

package/lib/configs/flat/mpx-essential.js

@@ -2,10 +2,11 @@
 const config = require('./base.js')
 
 module.exports = [
-  ...config,
   {
+    ...config[0],
     name: 'mpx/mpx-essential/rules',
     rules: {
+      'mpx/comment-directive': 'error',
       'mpx/html-end-tags': 'error',
       'mpx/no-arrow-functions-in-watch': 'error',
       'mpx/no-async-in-computed-properties': 'error',

package/lib/index.d.ts

@@ -0,0 +1,20 @@
+import type { Linter } from 'eslint'
+
+declare const mpx: {
+  meta: any
+  configs: {
+    base: Linter.LegacyConfig
+    'mpx-essential': Linter.LegacyConfig
+    'composition-api-essential': Linter.LegacyConfig
+    'flat/base': Linter.FlatConfig[]
+    'flat/mpx-essential': Linter.FlatConfig[]
+    'flat/composition-api-essential': Linter.FlatConfig[]
+  }
+  rules: Record<string, any>
+  processors: {
+    '.vue': any
+    vue: any
+  }
+}
+
+export = mpx

package/lib/utils/index.js

@@ -1235,10 +1235,10 @@ module.exports = {
         }
       },
       onCodePathSegmentStart(segment) {
-        funcInfo?.currentSegments.push(segment)
+        funcInfo && funcInfo.currentSegments.push(segment)
       },
       onCodePathSegmentEnd() {
-        funcInfo?.currentSegments.pop()
+        funcInfo && funcInfo.currentSegments.pop()
       },
       onCodePathEnd() {
         funcInfo = funcInfo && funcInfo.funcInfo
@@ -1566,7 +1566,7 @@ function createRequire(filename) {
 
 /**
  * Register the given visitor to parser services.
- * If the parser service of `vue-eslint-parser` was not found,
+ * If the parser service of `mpx-eslint-parser` was not found,
  * this generates a warning.
  *
  * @param {RuleContext} context The rule context to use parser services.

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "eslint-plugin-mpx",
-  "version": "0.2.20-3",
+  "version": "0.2.21",
   "description": "Official ESLint plugin for Mpx.js",
   "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "scripts": {
     "start": "npm run test:base -- --watch --growl",
     "test": "mocha \"tests/lib/**/*.js\" --reporter dot",
@@ -49,10 +50,9 @@
   },
   "dependencies": {
     "eslint-utils": "^2.1.0",
-    "mpx-eslint-parser": "0.0.9",
+    "mpx-eslint-parser": "^0.0.13",
     "natural-compare": "^1.4.0",
-    "semver": "^7.3.2",
-    "vue-eslint-parser": "^7.1.0"
+    "semver": "^7.3.2"
   },
   "devDependencies": {
     "@types/eslint": "^8.4.2",