File tree 3 files changed +18
-4
lines changed
private/smithy-rpcv2-cbor
smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen
smithy-typescript-protocol-test-codegen
3 files changed +18
-4
lines changed Original file line number Diff line number Diff line change 9
9
"build:types" : " tsc -p tsconfig.types.json" ,
10
10
"build:types:downlevel" : " downlevel-dts dist-types dist-types/ts3.4" ,
11
11
"clean" : " rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0" ,
12
- "prepack" : " yarn run clean && yarn run build"
12
+ "prepack" : " yarn run clean && yarn run build" ,
13
+ "merged" : " echo \" this is merged from user configuration.\" "
13
14
},
14
15
"main" : " ./dist-cjs/index.js" ,
15
16
"types" : " ./dist-types/index.d.ts" ,
Original file line number Diff line number Diff line change @@ -43,9 +43,19 @@ static void writePackageJson(
43
43
) {
44
44
// Write the package.json file.
45
45
InputStream resource = PackageJsonGenerator .class .getResourceAsStream ("base-package.json" );
46
- ObjectNode node = Node .parse (IoUtils .toUtf8String (resource ))
47
- .expectObjectNode ()
48
- .merge (settings .getPackageJson ());
46
+
47
+ ObjectNode userSuppliedPackageJson = settings .getPackageJson ();
48
+ ObjectNode defaultPackageJson = Node .parse (IoUtils .toUtf8String (resource ))
49
+ .expectObjectNode ();
50
+
51
+ ObjectNode mergedScripts = defaultPackageJson .expectObjectMember ("scripts" )
52
+ .merge (
53
+ userSuppliedPackageJson .getObjectMember ("scripts" )
54
+ .orElse (ObjectNode .builder ().build ())
55
+ );
56
+
57
+ ObjectNode node = defaultPackageJson .merge (userSuppliedPackageJson )
58
+ .withMember ("scripts" , mergedScripts );
49
59
50
60
// Merge TypeScript dependencies into the package.json file.
51
61
for (Map .Entry <String , Map <String , SymbolDependency >> depEntry : dependencies .entrySet ()) {
Original file line number Diff line number Diff line change 19
19
"name" : " Smithy team" ,
20
20
"url" : " https://smithy.io/"
21
21
},
22
+ "scripts" : {
23
+ "merged" : " echo \" this is merged from user configuration.\" "
24
+ },
22
25
"license" : " Apache-2.0"
23
26
},
24
27
"private" : true ,
You can’t perform that action at this time.
0 commit comments