From 60005668c6fc2351f18438a6471fecf78725f404 Mon Sep 17 00:00:00 2001
From: leezng <leezng@apache.org>
Date: Fri, 19 Aug 2022 20:51:15 +0800
Subject: [PATCH] fix: handle optional-chaining & nullish-coalescing-operator
 on babel.

---
 .babelrc                   | 19 +++++++++++++------
 build/webpack.base.conf.js |  2 +-
 package-lock.json          |  2 +-
 package.json               |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.babelrc b/.babelrc
index 647100c..508cc38 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,12 +1,19 @@
 {
   "presets": [
-    ["@babel/preset-env", {
-      "modules": false,
-      "targets": {
-        "browsers": ["> 1%", "last 10 versions", "not ie <= 11"]
+    [
+      "@babel/preset-env",
+      {
+        "modules": false,
+        "targets": {
+          "browsers": ["> 1%", "last 10 versions", "not ie <= 11"]
+        },
+        "include": [
+          "@babel/plugin-proposal-optional-chaining",
+          "@babel/plugin-proposal-nullish-coalescing-operator"
+        ]
       }
-    }],
-    '@vue/babel-preset-jsx'
+    ],
+    "@vue/babel-preset-jsx"
   ],
   "plugins": ["@babel/plugin-transform-runtime"],
   "env": {
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index aa5c127..295c020 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -57,7 +57,7 @@ module.exports = {
         },
       },
       {
-        test: /\.js[x]$/,
+        test: /\.(jsx?)$/,
         loader: 'babel-loader',
         include: [resolve('src'), resolve('example'), resolve('test')],
       },
diff --git a/package-lock.json b/package-lock.json
index ca06930..715ec36 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-json-pretty",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 65e3e60..75e9718 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-json-pretty",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "A JSON tree view component that is easy to use and also supports data selection.",
   "author": "leezng <im.leezng@gmail.com>",
   "main": "lib/vue-json-pretty.js",