Merge pull request #191 from leezng/fix-optional-chaining

leezng · web-flow · commit 1f010e38573f · 2022-08-19T20:54:10.000+08:00
fix: handle optional-chaining &amp; nullish-coalescing-operator on babel.
diff --git 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
@@ -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
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ module.exports = {`
`57`	`57`	`},`
`58`	`58`	`},`
`59`	`59`	`{`
`60`		`- test: /\.js[x]$/,`
	`60`	`+ test: /\.(jsx?)$/,`
`61`	`61`	`loader: 'babel-loader',`
`62`	`62`	`include: [resolve('src'), resolve('example'), resolve('test')],`
`63`	`63`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-json-pretty",`
`3`		`- "version": "1.9.0",`
	`3`	`+ "version": "1.9.1",`
`4`	`4`	`"description": "A JSON tree view component that is easy to use and also supports data selection.",`
`5`	`5`	`"author": "leezng <[email protected]>",`
`6`	`6`	`"main": "lib/vue-json-pretty.js",`