From 1d3f7ba5bf730ab4dec0a10fd55e87c1e882f6ae Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 23 Jul 2021 14:10:35 +0800
Subject: [PATCH] fix(cli): preprocess pages.json

---
 packages/uni-cli-shared/src/vite/plugins/jsonJs.ts | 3 +--
 packages/uni-h5-vite/dist/plugins/manifestJson.js  | 2 +-
 packages/uni-h5-vite/src/plugins/manifestJson.ts   | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/uni-cli-shared/src/vite/plugins/jsonJs.ts b/packages/uni-cli-shared/src/vite/plugins/jsonJs.ts
index f768e09ac..c001eed65 100644
--- a/packages/uni-cli-shared/src/vite/plugins/jsonJs.ts
+++ b/packages/uni-cli-shared/src/vite/plugins/jsonJs.ts
@@ -1,7 +1,6 @@
 import fs from 'fs'
 import path from 'path'
 import slash from 'slash'
-import { parse } from 'jsonc-parser'
 import {
   CreateUniViteFilterPlugin,
   UniViteFilterPluginOptions,
@@ -52,7 +51,7 @@ function createDefineJsonJsPlugin(name: 'pages.json' | 'manifest.json') {
       if (!opts.filter(id)) {
         return
       }
-      return JSON.stringify(parse(fs.readFileSync(jsonPath, 'utf8')))
+      return fs.readFileSync(jsonPath, 'utf8')
     }
     return plugin
   }
diff --git a/packages/uni-h5-vite/dist/plugins/manifestJson.js b/packages/uni-h5-vite/dist/plugins/manifestJson.js
index 3211e3abc..5da5c512c 100644
--- a/packages/uni-h5-vite/dist/plugins/manifestJson.js
+++ b/packages/uni-h5-vite/dist/plugins/manifestJson.js
@@ -23,7 +23,7 @@ function uniManifestJsonPlugin() {
                 if (!opts.filter(id)) {
                     return;
                 }
-                const manifest = JSON.parse(code);
+                const manifest = uni_cli_shared_1.parseJson(code);
                 const { debug, h5 } = manifest;
                 const appid = (manifest.appid || '').replace('__UNI__', '');
                 const router = Object.assign(Object.assign({}, defaultRouter), ((h5 && h5.router) || {}));
diff --git a/packages/uni-h5-vite/src/plugins/manifestJson.ts b/packages/uni-h5-vite/src/plugins/manifestJson.ts
index 34bcb013e..dddae089e 100644
--- a/packages/uni-h5-vite/src/plugins/manifestJson.ts
+++ b/packages/uni-h5-vite/src/plugins/manifestJson.ts
@@ -3,6 +3,7 @@ import { Plugin } from 'vite'
 import {
   defineUniManifestJsonPlugin,
   normalizeNetworkTimeout,
+  parseJson,
 } from '@dcloudio/uni-cli-shared'
 
 const defaultRouter = {
@@ -29,7 +30,7 @@ export function uniManifestJsonPlugin(): Plugin {
         if (!opts.filter(id)) {
           return
         }
-        const manifest = JSON.parse(code)
+        const manifest = parseJson(code)
         const { debug, h5 } = manifest
         const appid = (manifest.appid || '').replace('__UNI__', '')
         const router = { ...defaultRouter, ...((h5 && h5.router) || {}) }
-- 
GitLab