Skip to content

Commit 50af541

Browse files
authored
fix: use json-stringify-safe (#3174)
1 parent b65a3c9 commit 50af541

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
"expo": "^48.0.19",
8585
"expo-device": "^5.0.0",
8686
"fast-json-stable-stringify": "^2.1.0",
87-
"json-complete": "^2.0.1",
8887
"jsrsasign": "^10.7.1",
8988
"memoizee": "^0.4.15",
9089
"mime-types": "^2.1.35",
@@ -103,6 +102,7 @@
103102
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
104103
"@types/chrome": "^0.0.161",
105104
"@types/jest": "^29.2.3",
105+
"@types/json-stringify-safe": "^5",
106106
"@types/jsrsasign": "^10",
107107
"@types/memoizee": "^0.4.8",
108108
"@types/mime-types": "^2.1.1",
@@ -149,6 +149,7 @@
149149
"jest-environment-jsdom": "^29.3.1",
150150
"jest-expo": "^47.0.1",
151151
"jest-html-reporter": "^3.7.0",
152+
"json-stringify-safe": "^5.0.1",
152153
"lint-staged": "^11.2.6",
153154
"node-notifier": "^10.0.0",
154155
"patch-package": "^7.0.0",

packages/ext/development/devUtils.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const lodash = require('lodash');
44
const childProcess = require('child_process');
55
const path = require('path');
66
// const util = require('util');
7-
const jsonComplete = require('json-complete');
7+
const stringify = require('json-stringify-safe');
8+
const prettier = require('prettier');
89
const manifest = require('../src/manifest');
910

1011
// TODO move to developmentConsts.js
@@ -63,17 +64,10 @@ function writePreviewWebpackConfigJson(webpackConfig, filename) {
6364
// return `[ Function ${this.name}() ] ${this.toString()} `;
6465
return `[ Function ${this.name}() ]`;
6566
};
66-
try {
67-
fse.writeJsonSync(filename, webpackConfig, { spaces: 2 });
68-
} catch (error) {
69-
console.error(error);
70-
console.log('>>>>>>>> Fallback to jsonComplete.encode <<<<<<<<<');
71-
fse.writeJsonSync(filename, jsonComplete.encode(webpackConfig), {
72-
spaces: 2,
73-
});
74-
} finally {
75-
// noop
76-
}
67+
fse.writeFileSync(
68+
filename,
69+
prettier.format(stringify(webpackConfig), { parser: 'json' }),
70+
);
7771
// fs.writeFileSync(filename, util.inspect(webpackConfig), {
7872
// encoding: 'utf-8',
7973
// });

yarn.lock

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5197,6 +5197,7 @@ __metadata:
51975197
"@starcoin/starcoin": 2.1.5
51985198
"@types/chrome": ^0.0.161
51995199
"@types/jest": ^29.2.3
5200+
"@types/json-stringify-safe": ^5
52005201
"@types/jsrsasign": ^10
52015202
"@types/memoizee": ^0.4.8
52025203
"@types/mime-types": ^2.1.1
@@ -5255,7 +5256,7 @@ __metadata:
52555256
jest-environment-jsdom: ^29.3.1
52565257
jest-expo: ^47.0.1
52575258
jest-html-reporter: ^3.7.0
5258-
json-complete: ^2.0.1
5259+
json-stringify-safe: ^5.0.1
52595260
jsrsasign: ^10.7.1
52605261
lint-staged: ^11.2.6
52615262
memoizee: ^0.4.15
@@ -8717,6 +8718,13 @@ __metadata:
87178718
languageName: node
87188719
linkType: hard
87198720

8721+
"@types/json-stringify-safe@npm:^5":
8722+
version: 5.0.0
8723+
resolution: "@types/json-stringify-safe@npm:5.0.0"
8724+
checksum: 2822c9341119f53ded3b98b9686199bf13f9ff25ebeeab409ceb02167c2d5872455bdad2a2fcc0d88bd71b35696bf63d3378c7b9ab0e3f09ebbf9775e46cefdd
8725+
languageName: node
8726+
linkType: hard
8727+
87208728
"@types/json5@npm:^0.0.29":
87218729
version: 0.0.29
87228730
resolution: "@types/json5@npm:0.0.29"
@@ -22105,13 +22113,6 @@ __metadata:
2210522113
languageName: node
2210622114
linkType: hard
2210722115

22108-
"json-complete@npm:^2.0.1":
22109-
version: 2.0.1
22110-
resolution: "json-complete@npm:2.0.1"
22111-
checksum: b96269a916b85298416ea44fef3a93b5c8fccecfe51c5e3b2f2c1c280f7c897545127e801ae13ef00944968b8f461bf85fad8b591c8fdd6747d263193b34ecf6
22112-
languageName: node
22113-
linkType: hard
22114-
2211522116
"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2":
2211622117
version: 1.0.2
2211722118
resolution: "json-parse-better-errors@npm:1.0.2"

0 commit comments

Comments
 (0)