From a4b291e44c14d8aad087742e4f78b9c54f258f3d Mon Sep 17 00:00:00 2001
From: Rajiv Shah <rajivshah1@icloud.com>
Date: Tue, 9 Jun 2020 21:09:43 -0400
Subject: [PATCH] chore(tauri.js): Resolve eslint errors (#648)

---
 cli/tauri.js/src/api/info.ts     | 3 ++-
 cli/tauri.js/src/api/tauricon.ts | 3 ++-
 cli/tauri.js/tsconfig.json       | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cli/tauri.js/src/api/info.ts b/cli/tauri.js/src/api/info.ts
index cae4dff0e..f81e39f9e 100644
--- a/cli/tauri.js/src/api/info.ts
+++ b/cli/tauri.js/src/api/info.ts
@@ -8,6 +8,7 @@ import { appDir, tauriDir } from '../helpers/app-paths'
 import { TauriConfig } from './../types/config'
 import { CargoToml } from './../types/cargo'
 import nonWebpackRequire from '../helpers/non-webpack-require'
+import { version } from '../../package.json'
 
 interface DirInfo {
   path: string
@@ -160,7 +161,7 @@ module.exports = () => {
   printInfo({ key: '  Node.js', value: chalk.green(process.version.slice(1)) })
   printInfo({
     key: '  tauri.js',
-    value: chalk.green((require('../../package.json') as { version: string }).version)
+    value: chalk.green(version)
   })
   printInfo({ key: 'Rust environment', section: true })
   printInfo({
diff --git a/cli/tauri.js/src/api/tauricon.ts b/cli/tauri.js/src/api/tauricon.ts
index 262edfc90..9e36d2458 100644
--- a/cli/tauri.js/src/api/tauricon.ts
+++ b/cli/tauri.js/src/api/tauricon.ts
@@ -28,6 +28,7 @@ import { appDir, tauriDir } from '../helpers/app-paths'
 import logger from '../helpers/logger'
 import * as settings from '../helpers/tauricon.config'
 import chalk from 'chalk'
+import { version } from '../../package.json'
 
 const log = logger('app:spawn')
 const warn = logger('app:spawn', chalk.red)
@@ -182,7 +183,7 @@ const tauricon = (exports.tauricon = {
     return typeof image === 'object'
   },
   version: function() {
-    return require('../../package.json').version
+    return version
   },
   make: async function(
     src: string = path.resolve(appDir, 'app-icon.png'),
diff --git a/cli/tauri.js/tsconfig.json b/cli/tauri.js/tsconfig.json
index 244a745cc..3e737aa91 100644
--- a/cli/tauri.js/tsconfig.json
+++ b/cli/tauri.js/tsconfig.json
@@ -6,6 +6,7 @@
     "target": "es5",
     "allowJs": true,
     "esModuleInterop": true,
+    "resolveJsonModule": true,
     "moduleResolution": "node",
     "baseUrl": ".",
     "paths": {