@forge/cli 13.1.0-next.4-experimental-9423de1 → 13.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/CHANGELOG.md +127 -6
  2. package/npm-shrinkwrap.json +112 -112
  3. package/out/command-line/controller/module-add-controller.d.ts +1 -0
  4. package/out/command-line/controller/module-add-controller.d.ts.map +1 -1
  5. package/out/command-line/controller/module-add-controller.js +67 -3
  6. package/out/command-line/controller/module-add-controller.js.map +1 -1
  7. package/out/command-line/register-module-commands.d.ts.map +1 -1
  8. package/out/command-line/register-module-commands.js +2 -0
  9. package/out/command-line/register-module-commands.js.map +1 -1
  10. package/out/module-add/manifest-merger.d.ts.map +1 -1
  11. package/out/module-add/manifest-merger.js +181 -74
  12. package/out/module-add/manifest-merger.js.map +1 -1
  13. package/out/service/module-file-service.js +2 -2
  14. package/out/service/module-file-service.js.map +1 -1
  15. package/out/service/module-service.d.ts +2 -1
  16. package/out/service/module-service.d.ts.map +1 -1
  17. package/out/service/module-service.js.map +1 -1
  18. package/package.json +11 -8
package/CHANGELOG.md CHANGED
@@ -1,24 +1,145 @@
1
1
  # @forge/cli
2
2
 
3
- ## 13.1.0-next.4-experimental-9423de1
3
+ ## 13.1.0
4
4
 
5
5
  ### Minor Changes
6
6
 
7
+ - 4f18feb: Added the non interactive function for module add
7
8
  - 5b7db55: Upgrade package dependency `archiver`.
9
+ - c3dbc58: Manifest Merge Logics changed
8
10
 
9
11
  ### Patch Changes
10
12
 
13
+ - 863f6f7: Fix resource limit on commits and installation fails with adding custom-ui
11
14
  - 6471b1d: Allow --app-id-override for install and uninstall commands
12
15
  - 81b57b3: Allow global ui templates to appear under Global
16
+ - 7c850b4: Add checks for unsupported node versions
17
+ - 3bccafa: Remove jest-fixtures dev dependecy
18
+ - Updated dependencies [4f18feb]
13
19
  - Updated dependencies [ee36de0]
14
20
  - Updated dependencies [4cd2242]
21
+ - Updated dependencies [5d2cd6c]
22
+ - Updated dependencies [e744c59]
23
+ - Updated dependencies [c3dbc58]
15
24
  - Updated dependencies [c60a7a5]
16
25
  - Updated dependencies [caa7518]
17
- - @forge/tunnel@7.0.1-next.3-experimental-9423de1
18
- - @forge/manifest@13.1.0-next.2-experimental-9423de1
19
- - @forge/bundler@7.0.1-next.2-experimental-9423de1
20
- - @forge/cli-shared@9.0.1-next.2-experimental-9423de1
21
- - @forge/lint@6.0.1-next.2-experimental-9423de1
26
+ - Updated dependencies [78097a6]
27
+ - Updated dependencies [a60362e]
28
+ - Updated dependencies [13e49d8]
29
+ - Updated dependencies [3bccafa]
30
+ - @forge/cli-shared@9.1.0
31
+ - @forge/tunnel@7.0.1
32
+ - @forge/manifest@13.1.0
33
+ - @forge/bundler@7.0.1
34
+ - @forge/lint@6.0.1
35
+
36
+ ## 13.1.0-next.14
37
+
38
+ ### Minor Changes
39
+
40
+ - c3dbc58: Manifest Merge Logics changed
41
+
42
+ ### Patch Changes
43
+
44
+ - Updated dependencies [c3dbc58]
45
+ - @forge/cli-shared@9.1.0-next.10
46
+ - @forge/bundler@7.0.1-next.11
47
+ - @forge/lint@6.0.1-next.11
48
+ - @forge/tunnel@7.0.1-next.12
49
+
50
+ ## 13.1.0-next.13
51
+
52
+ ### Minor Changes
53
+
54
+ - 4f18feb: Added the non interactive function for module add
55
+
56
+ ### Patch Changes
57
+
58
+ - Updated dependencies [4f18feb]
59
+ - @forge/cli-shared@9.1.0-next.9
60
+ - @forge/bundler@7.0.1-next.10
61
+ - @forge/lint@6.0.1-next.10
62
+ - @forge/tunnel@7.0.1-next.11
63
+
64
+ ## 13.1.0-next.12
65
+
66
+ ### Patch Changes
67
+
68
+ - @forge/lint@6.0.1-next.9
69
+ - @forge/tunnel@7.0.1-next.10
70
+ - @forge/bundler@7.0.1-next.9
71
+
72
+ ## 13.1.0-next.11
73
+
74
+ ### Patch Changes
75
+
76
+ - Updated dependencies [a60362e]
77
+ - @forge/manifest@13.1.0-next.6
78
+ - @forge/bundler@7.0.1-next.8
79
+ - @forge/cli-shared@9.0.1-next.8
80
+ - @forge/lint@6.0.1-next.8
81
+ - @forge/tunnel@7.0.1-next.9
82
+
83
+ ## 13.1.0-next.10
84
+
85
+ ### Patch Changes
86
+
87
+ - Updated dependencies [78097a6]
88
+ - @forge/manifest@13.1.0-next.5
89
+ - @forge/bundler@7.0.1-next.7
90
+ - @forge/cli-shared@9.0.1-next.7
91
+ - @forge/lint@6.0.1-next.7
92
+ - @forge/tunnel@7.0.1-next.8
93
+
94
+ ## 13.1.0-next.9
95
+
96
+ ### Patch Changes
97
+
98
+ - 863f6f7: Fix resource limit on commits and installation fails with adding custom-ui
99
+
100
+ ## 13.1.0-next.8
101
+
102
+ ### Patch Changes
103
+
104
+ - 7c850b4: Add checks for unsupported node versions
105
+ - 3bccafa: Remove jest-fixtures dev dependecy
106
+ - Updated dependencies [3bccafa]
107
+ - @forge/cli-shared@9.0.1-next.6
108
+ - @forge/bundler@7.0.1-next.6
109
+ - @forge/lint@6.0.1-next.6
110
+ - @forge/tunnel@7.0.1-next.7
111
+
112
+ ## 13.1.0-next.7
113
+
114
+ ### Patch Changes
115
+
116
+ - Updated dependencies [13e49d8]
117
+ - @forge/manifest@13.1.0-next.4
118
+ - @forge/bundler@7.0.1-next.5
119
+ - @forge/cli-shared@9.0.1-next.5
120
+ - @forge/lint@6.0.1-next.5
121
+ - @forge/tunnel@7.0.1-next.6
122
+
123
+ ## 13.1.0-next.6
124
+
125
+ ### Patch Changes
126
+
127
+ - Updated dependencies [e744c59]
128
+ - @forge/manifest@13.1.0-next.3
129
+ - @forge/bundler@7.0.1-next.4
130
+ - @forge/cli-shared@9.0.1-next.4
131
+ - @forge/lint@6.0.1-next.4
132
+ - @forge/tunnel@7.0.1-next.5
133
+
134
+ ## 13.1.0-next.5
135
+
136
+ ### Patch Changes
137
+
138
+ - Updated dependencies [5d2cd6c]
139
+ - @forge/cli-shared@9.0.1-next.3
140
+ - @forge/bundler@7.0.1-next.3
141
+ - @forge/lint@6.0.1-next.3
142
+ - @forge/tunnel@7.0.1-next.4
22
143
 
23
144
  ## 13.1.0-next.4
24
145
 
package/npm-shrinkwrap.json CHANGED
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "13.1.0-next.4-experimental-9423de1",
3
+ "version": "13.1.0",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "@forge/cli",
9
- "version": "13.1.0-next.4-experimental-9423de1",
9
+ "version": "13.1.0",
10
10
  "hasInstallScript": true,
11
11
  "license": "SEE LICENSE IN LICENSE.txt",
12
12
  "dependencies": {
13
- "@forge/bundler": "7.0.1-next.2-experimental-9423de1",
14
- "@forge/cli-shared": "9.0.1-next.2-experimental-9423de1",
13
+ "@forge/bundler": "7.0.1",
14
+ "@forge/cli-shared": "9.1.0",
15
15
  "@forge/egress": "3.0.0",
16
16
  "@forge/i18n": "1.0.0",
17
- "@forge/lint": "6.0.1-next.2-experimental-9423de1",
18
- "@forge/manifest": "13.1.0-next.2-experimental-9423de1",
17
+ "@forge/lint": "6.0.1",
18
+ "@forge/manifest": "13.1.0",
19
19
  "@forge/runtime": "7.0.0",
20
- "@forge/tunnel": "7.0.1-next.3-experimental-9423de1",
20
+ "@forge/tunnel": "7.0.1",
21
21
  "@forge/util": "3.0.0",
22
22
  "@sentry/node": "7.106.0",
23
23
  "ajv": "^8.18.0",
@@ -75,7 +75,6 @@
75
75
  "adm-zip": "^0.5.10",
76
76
  "chokidar": "^3.6.0",
77
77
  "jest": "^29.7.0",
78
- "jest-fixtures": "^0.6.0",
79
78
  "jest-matcher-specific-error": "^1.0.0",
80
79
  "jest-when": "^3.6.0",
81
80
  "json-schema-to-typescript": "^10.1.5",
@@ -87,7 +86,7 @@
87
86
  "yaml": "^2.3.4"
88
87
  },
89
88
  "engines": {
90
- "node": ">=20.18.1"
89
+ "node": ">=20.18.1 <22.23.1 || >22.23.1 <24.17.0 || >24.17.0"
91
90
  },
92
91
  "peerDependenciesMeta": {
93
92
  "typescript": {
@@ -556,9 +555,9 @@
556
555
  }
557
556
  },
558
557
  "node_modules/@forge/bundler": {
559
- "version": "7.0.1-next.2-experimental-9423de1",
560
- "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.0.1-next.2-experimental-9423de1.tgz",
561
- "integrity": "sha512-Mu40OiKC8ujI27JOILkE5GZVg5ohvVtNRTFd8vW2EhbubEwKt/80psJ7oZ3HmDF4dDyzmtzKNJogJBd+fCYq1g==",
558
+ "version": "7.0.1",
559
+ "resolved": "https://registry.npmjs.org/@forge/bundler/-/bundler-7.0.1.tgz",
560
+ "integrity": "sha512-+2LBff9qawGfbK6xmeiqE4Pa59pHmkKPpZT91VAIBfdvPxVqjkXHcPbE2eOJGDTYlMFl6AbmM+pgPg60I4scjw==",
562
561
  "license": "SEE LICENSE IN LICENSE.txt",
563
562
  "dependencies": {
564
563
  "@babel/core": "^7.24.0",
@@ -570,10 +569,10 @@
570
569
  "@babel/plugin-transform-react-jsx": "^7.23.4",
571
570
  "@babel/traverse": "^7.24.0",
572
571
  "@babel/types": "^7.24.0",
573
- "@forge/cli-shared": "9.0.1-next.2-experimental-9423de1",
572
+ "@forge/cli-shared": "9.1.0",
574
573
  "@forge/i18n": "1.0.0",
575
- "@forge/lint": "6.0.1-next.2-experimental-9423de1",
576
- "@forge/manifest": "13.1.0-next.2-experimental-9423de1",
574
+ "@forge/lint": "6.0.1",
575
+ "@forge/manifest": "13.1.0",
577
576
  "babel-loader": "^8.3.0",
578
577
  "cheerio": "^1.2.0",
579
578
  "cross-spawn": "^7.0.6",
@@ -601,13 +600,13 @@
601
600
  }
602
601
  },
603
602
  "node_modules/@forge/cli-shared": {
604
- "version": "9.0.1-next.2-experimental-9423de1",
605
- "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.0.1-next.2-experimental-9423de1.tgz",
606
- "integrity": "sha512-mOvH5PZGQzmUGZbEze2UknG0hkzC4f7dFAC0PS4X3HdJe8PE4Sf2mPQUoth2D5EwFp8AG6zhCO7FbgGfHeXUwg==",
603
+ "version": "9.1.0",
604
+ "resolved": "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-9.1.0.tgz",
605
+ "integrity": "sha512-+34gQHBAQSbCGqlj7fa9ckxCrUg9WH01mkjlSC/joN5sC67NGLGartb4xdGM7GRZmEuQF2txEqnqPgZnWiJK8g==",
607
606
  "license": "SEE LICENSE IN LICENSE.txt",
608
607
  "dependencies": {
609
608
  "@forge/i18n": "1.0.0",
610
- "@forge/manifest": "13.1.0-next.2-experimental-9423de1",
609
+ "@forge/manifest": "13.1.0",
611
610
  "@forge/util": "3.0.0",
612
611
  "@sentry/node": "7.106.0",
613
612
  "@vercel/detect-agent": "^1.2.3",
@@ -637,6 +636,7 @@
637
636
  "semver": "^7.6.0",
638
637
  "terminal-link": "^2.1.1",
639
638
  "tmp": "^0.2.3",
639
+ "tslib": "^2.6.2",
640
640
  "typescript": "5.9.2",
641
641
  "yaml": "^2.3.4"
642
642
  },
@@ -650,9 +650,9 @@
650
650
  }
651
651
  },
652
652
  "node_modules/@forge/csp": {
653
- "version": "6.0.0-experimental-9423de1",
654
- "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.0.0-experimental-9423de1.tgz",
655
- "integrity": "sha512-P4cbjZlYspkw4Z7LxJbyjZnIoaKNz3+iJwRYV6s44EDpB+fCQq4vU+hsstA7kY7Fi6JAaw9hsyyl5vrAPQHz4g==",
653
+ "version": "6.1.0",
654
+ "resolved": "https://registry.npmjs.org/@forge/csp/-/csp-6.1.0.tgz",
655
+ "integrity": "sha512-SqBZ5X4pO+6U6FRd/MAUG+b68mqQwRLFDQjxjyGCxgXVCFJgc7JJTpkLPsxtr3GHjy5Al69LzktdKMDcx2jMmg==",
656
656
  "license": "SEE LICENSE IN LICENSE.txt",
657
657
  "dependencies": {
658
658
  "content-security-policy-parser": "^0.6.0"
@@ -702,16 +702,16 @@
702
702
  }
703
703
  },
704
704
  "node_modules/@forge/lint": {
705
- "version": "6.0.1-next.2-experimental-9423de1",
706
- "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.0.1-next.2-experimental-9423de1.tgz",
707
- "integrity": "sha512-0slVTGFv+Qp6SGHnJLAMUg41Cq9IepnUNavNOj0MPT8cTZhO2jnXXctm7kqSOuvJpyiGc1GV0BpZZeHbwSuxcg==",
705
+ "version": "6.0.1",
706
+ "resolved": "https://registry.npmjs.org/@forge/lint/-/lint-6.0.1.tgz",
707
+ "integrity": "sha512-Z2LzxCCVopHjZvXOJBC+NnOXG90JXgV4ADDmnvRjuhNZEZJ41mU5LLDIagC2Epbq9y2avEwuBOPtRe9P9oTkrA==",
708
708
  "license": "SEE LICENSE IN LICENSE.txt",
709
709
  "dependencies": {
710
710
  "@atlassian/atlassian-openapi": "^1.0.6",
711
- "@forge/cli-shared": "9.0.1-next.2-experimental-9423de1",
712
- "@forge/csp": "6.0.0-experimental-9423de1",
711
+ "@forge/cli-shared": "9.1.0",
712
+ "@forge/csp": "6.1.0",
713
713
  "@forge/egress": "3.0.0",
714
- "@forge/manifest": "13.1.0-next.2-experimental-9423de1",
714
+ "@forge/manifest": "13.1.0",
715
715
  "@typescript-eslint/typescript-estree": "^5.62.0",
716
716
  "array.prototype.flatmap": "^1.3.3",
717
717
  "cross-spawn": "^7.0.6",
@@ -728,9 +728,9 @@
728
728
  }
729
729
  },
730
730
  "node_modules/@forge/manifest": {
731
- "version": "13.1.0-next.2-experimental-9423de1",
732
- "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.1.0-next.2-experimental-9423de1.tgz",
733
- "integrity": "sha512-0161470X76yWNvz+ZMpEHfapHZ/iq/+zhRrA7HlO29pWPCKiT7lqIoSXRkU26o80ZOFiO0c6AF2GWtI1B5U4LA==",
731
+ "version": "13.1.0",
732
+ "resolved": "https://registry.npmjs.org/@forge/manifest/-/manifest-13.1.0.tgz",
733
+ "integrity": "sha512-/i4rzJjrGwLTjBEWDKOFwWj6UL+YXeioka6dIqTdRSfW3lXkjdzVs690M+MdtP6BcqkJTZgmBW2L9FpTHaKdpg==",
734
734
  "license": "SEE LICENSE IN LICENSE.txt",
735
735
  "dependencies": {
736
736
  "@forge/i18n": "1.0.0",
@@ -767,14 +767,14 @@
767
767
  }
768
768
  },
769
769
  "node_modules/@forge/tunnel": {
770
- "version": "7.0.1-next.3-experimental-9423de1",
771
- "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.0.1-next.3-experimental-9423de1.tgz",
772
- "integrity": "sha512-rAzo85sBxGR2Oam1krEcv8VfiyXlB72Wef6l95iVizk2JA8TXHrmng6pVsK8+X8ANnBXmlMKlvsvG4QmaS+gkg==",
770
+ "version": "7.0.1",
771
+ "resolved": "https://registry.npmjs.org/@forge/tunnel/-/tunnel-7.0.1.tgz",
772
+ "integrity": "sha512-UCvoDX0FTK4Lu0OmtsunOUKBk3HK3BmPap/dEcHkmVgm5SPju4ASR4D45caW85mWQuMYewKKtcpXDE7CjxCx4g==",
773
773
  "license": "SEE LICENSE IN LICENSE.txt",
774
774
  "dependencies": {
775
- "@forge/bundler": "7.0.1-next.2-experimental-9423de1",
776
- "@forge/cli-shared": "9.0.1-next.2-experimental-9423de1",
777
- "@forge/csp": "6.0.0-experimental-9423de1",
775
+ "@forge/bundler": "7.0.1",
776
+ "@forge/cli-shared": "9.1.0",
777
+ "@forge/csp": "6.1.0",
778
778
  "@forge/runtime": "7.0.0",
779
779
  "@forge/util": "^3.0.0",
780
780
  "cheerio": "^1.2.0",
@@ -4549,6 +4549,26 @@
4549
4549
  "semver": "bin/semver.js"
4550
4550
  }
4551
4551
  },
4552
+ "node_modules/find-up": {
4553
+ "version": "4.1.0",
4554
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
4555
+ "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
4556
+ "dependencies": {
4557
+ "locate-path": "^5.0.0",
4558
+ "path-exists": "^4.0.0"
4559
+ },
4560
+ "engines": {
4561
+ "node": ">=8"
4562
+ }
4563
+ },
4564
+ "node_modules/find-up/node_modules/path-exists": {
4565
+ "version": "4.0.0",
4566
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
4567
+ "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
4568
+ "engines": {
4569
+ "node": ">=8"
4570
+ }
4571
+ },
4552
4572
  "node_modules/follow-redirects": {
4553
4573
  "version": "1.15.9",
4554
4574
  "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -4644,17 +4664,6 @@
4644
4664
  "node": ">=14.14"
4645
4665
  }
4646
4666
  },
4647
- "node_modules/fs-extra/node_modules/jsonfile": {
4648
- "version": "6.1.0",
4649
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
4650
- "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
4651
- "dependencies": {
4652
- "universalify": "^2.0.0"
4653
- },
4654
- "optionalDependencies": {
4655
- "graceful-fs": "^4.1.6"
4656
- }
4657
- },
4658
4667
  "node_modules/fswin": {
4659
4668
  "version": "3.24.829",
4660
4669
  "resolved": "https://registry.npmjs.org/fswin/-/fswin-3.24.829.tgz",
@@ -6003,6 +6012,17 @@
6003
6012
  "node": ">=6"
6004
6013
  }
6005
6014
  },
6015
+ "node_modules/jsonfile": {
6016
+ "version": "6.1.0",
6017
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
6018
+ "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
6019
+ "dependencies": {
6020
+ "universalify": "^2.0.0"
6021
+ },
6022
+ "optionalDependencies": {
6023
+ "graceful-fs": "^4.1.6"
6024
+ }
6025
+ },
6006
6026
  "node_modules/jsonpointer": {
6007
6027
  "version": "5.0.1",
6008
6028
  "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
@@ -6116,6 +6136,17 @@
6116
6136
  "node": ">=8.9.0"
6117
6137
  }
6118
6138
  },
6139
+ "node_modules/locate-path": {
6140
+ "version": "5.0.0",
6141
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
6142
+ "integrity": "sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
6143
+ "dependencies": {
6144
+ "p-locate": "^4.1.0"
6145
+ },
6146
+ "engines": {
6147
+ "node": ">=8"
6148
+ }
6149
+ },
6119
6150
  "node_modules/lodash": {
6120
6151
  "version": "4.17.21",
6121
6152
  "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -6647,6 +6678,39 @@
6647
6678
  "node": ">=12.20"
6648
6679
  }
6649
6680
  },
6681
+ "node_modules/p-locate": {
6682
+ "version": "4.1.0",
6683
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
6684
+ "integrity": "sha1-o0KLtwiLOmApL2aRkni3wpetTwc= sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
6685
+ "dependencies": {
6686
+ "p-limit": "^2.2.0"
6687
+ },
6688
+ "engines": {
6689
+ "node": ">=8"
6690
+ }
6691
+ },
6692
+ "node_modules/p-locate/node_modules/p-limit": {
6693
+ "version": "2.3.0",
6694
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
6695
+ "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
6696
+ "dependencies": {
6697
+ "p-try": "^2.0.0"
6698
+ },
6699
+ "engines": {
6700
+ "node": ">=6"
6701
+ },
6702
+ "funding": {
6703
+ "url": "https://github.com/sponsors/sindresorhus"
6704
+ }
6705
+ },
6706
+ "node_modules/p-locate/node_modules/p-try": {
6707
+ "version": "2.2.0",
6708
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
6709
+ "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
6710
+ "engines": {
6711
+ "node": ">=6"
6712
+ }
6713
+ },
6650
6714
  "node_modules/p-retry": {
6651
6715
  "version": "6.2.1",
6652
6716
  "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
@@ -6807,70 +6871,6 @@
6807
6871
  "node": ">=8"
6808
6872
  }
6809
6873
  },
6810
- "node_modules/pkg-dir/node_modules/find-up": {
6811
- "version": "4.1.0",
6812
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
6813
- "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
6814
- "dependencies": {
6815
- "locate-path": "^5.0.0",
6816
- "path-exists": "^4.0.0"
6817
- },
6818
- "engines": {
6819
- "node": ">=8"
6820
- }
6821
- },
6822
- "node_modules/pkg-dir/node_modules/locate-path": {
6823
- "version": "5.0.0",
6824
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
6825
- "integrity": "sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
6826
- "dependencies": {
6827
- "p-locate": "^4.1.0"
6828
- },
6829
- "engines": {
6830
- "node": ">=8"
6831
- }
6832
- },
6833
- "node_modules/pkg-dir/node_modules/p-limit": {
6834
- "version": "2.3.0",
6835
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
6836
- "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
6837
- "dependencies": {
6838
- "p-try": "^2.0.0"
6839
- },
6840
- "engines": {
6841
- "node": ">=6"
6842
- },
6843
- "funding": {
6844
- "url": "https://github.com/sponsors/sindresorhus"
6845
- }
6846
- },
6847
- "node_modules/pkg-dir/node_modules/p-locate": {
6848
- "version": "4.1.0",
6849
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
6850
- "integrity": "sha1-o0KLtwiLOmApL2aRkni3wpetTwc= sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
6851
- "dependencies": {
6852
- "p-limit": "^2.2.0"
6853
- },
6854
- "engines": {
6855
- "node": ">=8"
6856
- }
6857
- },
6858
- "node_modules/pkg-dir/node_modules/p-try": {
6859
- "version": "2.2.0",
6860
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
6861
- "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
6862
- "engines": {
6863
- "node": ">=6"
6864
- }
6865
- },
6866
- "node_modules/pkg-dir/node_modules/path-exists": {
6867
- "version": "4.0.0",
6868
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
6869
- "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
6870
- "engines": {
6871
- "node": ">=8"
6872
- }
6873
- },
6874
6874
  "node_modules/pkg-up": {
6875
6875
  "version": "3.1.0",
6876
6876
  "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
package/out/command-line/controller/module-add-controller.d.ts CHANGED
@@ -18,6 +18,7 @@ export declare class ModuleAddController {
18
18
  private renderConflicts;
19
19
  private resolveUIFramework;
20
20
  private collectVariables;
21
+ private resolveVariablesNonInteractive;
21
22
  private promptForVariable;
22
23
  }
23
24
  //# sourceMappingURL=module-add-controller.d.ts.map
package/out/command-line/controller/module-add-controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module-add-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/module-add-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAgB,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAa,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEpF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,eAAO,MAAM,eAAe,sGAIlB,CAAC;AAEX,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAFX,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,oBAAoB;IAGvC,GAAG,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;YAQ5C,YAAY;YAuCZ,cAAc;YAUd,2BAA2B;YAY3B,uBAAuB;IAcrC,OAAO,CAAC,2BAA2B;IAanC,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,eAAe;YAQT,kBAAkB;YAgBlB,gBAAgB;YA4BhB,iBAAiB;CAuChC"}
1
+ {"version":3,"file":"module-add-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/module-add-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAgB,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAa,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEpF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,eAAO,MAAM,eAAe,sGAIlB,CAAC;AAEX,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAFX,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,oBAAoB;IAGvC,GAAG,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;YAQ5C,YAAY;YA8CZ,cAAc;YAUd,2BAA2B;YAY3B,uBAAuB;IAcrC,OAAO,CAAC,2BAA2B;IAanC,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,eAAe;YAQT,kBAAkB;YAsBlB,gBAAgB;YA4BhB,8BAA8B;YAiF9B,iBAAiB;CAuChC"}
package/out/command-line/controller/module-add-controller.js CHANGED
@@ -29,10 +29,14 @@ class ModuleAddController {
29
29
  }
30
30
  }
31
31
  async runModuleAdd(options) {
32
+ const nonInteractive = options.nonInteractive === true || options.variables !== undefined;
33
+ if (nonInteractive && !options.moduleType) {
34
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.module.add.errorNonInteractiveMissingModuleType);
35
+ }
32
36
  const selectedTemplate = options.moduleType
33
37
  ? await this.resolveTemplateByModuleType(options.moduleType)
34
38
  : await this.resolveSelectedTemplate(await this.resolveProduct(options));
35
- const uiType = options.uiType ?? (await this.resolveUIFramework(selectedTemplate));
39
+ const uiType = options.uiType ?? (await this.resolveUIFramework(selectedTemplate, nonInteractive));
36
40
  const downloadedTemplate = await this.moduleService.prepareModuleMetadata(selectedTemplate, uiType);
37
41
  if (!downloadedTemplate) {
38
42
  throw new Error(cli_shared_1.Text.module.add.errorFailedToDownloadTemplate(selectedTemplate.moduleKey));
@@ -40,7 +44,9 @@ class ModuleAddController {
40
44
  const depChanges = this.fileService.checkDependencies(downloadedTemplate, options.force === true);
41
45
  const hasConflicts = depChanges.conflicts.length > 0;
42
46
  this.assertNotBlockedByConflicts(depChanges, hasConflicts, './package.json', options);
43
- const variables = await this.collectVariables(downloadedTemplate, uiType);
47
+ const variables = nonInteractive
48
+ ? await this.resolveVariablesNonInteractive(downloadedTemplate, uiType, options.variables)
49
+ : await this.collectVariables(downloadedTemplate, uiType);
44
50
  const frontendPlan = (0, dependencies_merger_1.planFrontendPackageJson)(process.cwd(), downloadedTemplate, variables, options.force === true);
45
51
  const frontendHasConflicts = frontendPlan.depChanges.conflicts.length > 0;
46
52
  const frontendScope = frontendPlan.frontendPackageJsonPath
@@ -115,12 +121,15 @@ class ModuleAddController {
115
121
  this.moduleView.renderDepConflictsResolved(changes, scope);
116
122
  }
117
123
  }
118
- async resolveUIFramework(template) {
124
+ async resolveUIFramework(template, nonInteractive) {
119
125
  if (!template.variants) {
120
126
  return undefined;
121
127
  }
122
128
  const variants = Object.keys(template.variants);
123
129
  if (variants.length > 1) {
130
+ if (nonInteractive) {
131
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.module.add.errorNonInteractiveMissingUiType(variants));
132
+ }
124
133
  return this.moduleView.promptForList(cli_shared_1.Text.module.add.promptSelectUIFramework, variants);
125
134
  }
126
135
  if (variants.length === 1) {
@@ -141,6 +150,61 @@ class ModuleAddController {
141
150
  }
142
151
  return variables;
143
152
  }
153
+ async resolveVariablesNonInteractive(template, uiFramework, rawVariables) {
154
+ let parsed;
155
+ try {
156
+ parsed = rawVariables ? JSON.parse(rawVariables) : {};
157
+ }
158
+ catch (e) {
159
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.module.add.errorNonInteractiveInvalidVariablesJson(e.message));
160
+ }
161
+ if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
162
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.module.add.errorNonInteractiveInvalidVariablesJson('expected a JSON object'));
163
+ }
164
+ const variableDefs = this.moduleService.getVariableDefinitions(template, uiFramework);
165
+ const validNames = new Set(variableDefs.map((v) => v.name));
166
+ const errors = [];
167
+ const unknownKeys = Object.keys(parsed).filter((key) => !validNames.has(key));
168
+ if (unknownKeys.length > 0) {
169
+ errors.push(cli_shared_1.Text.module.add.errorNonInteractiveUnknownVariables(unknownKeys, variableDefs));
170
+ }
171
+ if (variableDefs.length === 0) {
172
+ if (errors.length > 0) {
173
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.module.add.errorNonInteractiveSummary(errors));
174
+ }
175
+ return {};
176
+ }
177
+ const { manifestPath, existingKeys } = this.moduleService.loadManifestContext();
178
+ const fragmentContent = template.cacheDir ? this.moduleService.readManifestFragment(template.cacheDir) : undefined;
179
+ const variables = {};
180
+ const missing = [];
181
+ for (const varDef of variableDefs) {
182
+ const hasValue = Object.prototype.hasOwnProperty.call(parsed, varDef.name);
183
+ const provided = hasValue ? String(parsed[varDef.name]).trim() : '';
184
+ const effectiveDefault = this.moduleService.computeEffectiveDefault(varDef, variables);
185
+ const value = provided !== '' ? provided : effectiveDefault ?? '';
186
+ if (value === '') {
187
+ missing.push(varDef);
188
+ continue;
189
+ }
190
+ variables[varDef.name] = value;
191
+ }
192
+ if (missing.length > 0) {
193
+ errors.push(cli_shared_1.Text.module.add.errorNonInteractiveMissingVariables(missing));
194
+ }
195
+ for (const varDef of variableDefs) {
196
+ const value = variables[varDef.name];
197
+ if (value === undefined) {
198
+ continue;
199
+ }
200
+ const validationErrors = await this.moduleService.validateCandidateValue(varDef, value, existingKeys, template.moduleKey, fragmentContent, variables, manifestPath);
201
+ errors.push(...validationErrors);
202
+ }
203
+ if (errors.length > 0) {
204
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.module.add.errorNonInteractiveSummary(errors));
205
+ }
206
+ return variables;
207
+ }
144
208
  async promptForVariable(varDef, variables, existingKeys, moduleKey, fragmentContent, manifestPath) {
145
209
  while (true) {
146
210
  const effectiveDefault = this.moduleService.computeEffectiveDefault(varDef, variables);
package/out/command-line/controller/module-add-controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module-add-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/module-add-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"module-add-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/module-add-controller.ts"],"names":[],"mappings":"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"}
package/out/command-line/register-module-commands.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-module-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-module-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAwDtD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAMxE"}
1
+ {"version":3,"file":"register-module-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-module-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA0DtD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAMxE"}
package/out/command-line/register-module-commands.js CHANGED
@@ -12,7 +12,9 @@ function registerModuleAddCommand(parent, deps) {
12
12
  .option('-p, --product <product>', cli_shared_1.Text.module.add.optionProduct)
13
13
  .option('--dry-run', cli_shared_1.Text.module.add.optionDryRun)
14
14
  .option('--force', cli_shared_1.Text.module.add.optionForce)
15
+ .option('--variables <json>', cli_shared_1.Text.module.add.optionVariables)
15
16
  .option('--no-install', cli_shared_1.Text.module.add.optionNoInstall)
17
+ .nonInteractiveOption('-t, --module-type <type>')
16
18
  .requireManifestFile()
17
19
  .action(async (options) => {
18
20
  return await moduleAddController.run(options);
package/out/command-line/register-module-commands.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"register-module-commands.js","sourceRoot":"","sources":["../../src/command-line/register-module-commands.ts"],"names":[],"mappings":";;AA0DA,4CAMC;AA7DD,kDAAyC;AAIzC,SAAS,wBAAwB,CAAC,MAAe,EAAE,IAAkB;IACnE,MAAM,EACJ,WAAW,EAAE,EAAE,mBAAmB,EAAE,EACrC,GAAG,IAAI,CAAC;IACT,MAAM;SACH,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;SACxC,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;SACpE,MAAM,CAAC,kCAAkC,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;SACxE,MAAM,CAAC,yBAAyB,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;SAChE,MAAM,CAAC,WAAW,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;SACjD,MAAM,CAAC,SAAS,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;SAC9C,MAAM,CAAC,cAAc,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;SACvD,mBAAmB,EAAE;SACrB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,OAAO,MAAM,mBAAmB,CAAC,GAAG,CAAC,OAA2B,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAe,EAAE,IAAkB;IACpE,MAAM,EACJ,WAAW,EAAE,EAAE,oBAAoB,EAAE,EACtC,GAAG,IAAI,CAAC;IACT,MAAM;SACH,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SACzC,MAAM,CAAC,uBAAuB,EAAE,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;SAC9D,MAAM,CAAC,yBAAyB,EAAE,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;SACjE,MAAM,CAAC,kCAAkC,EAAE,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;SACzE,oBAAoB,EAAE;SACtB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,OAAO,MAAM,oBAAoB,CAAC,GAAG,CAAC,OAA4B,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAe,EAAE,IAAkB;IACpE,MAAM,EACJ,WAAW,EAAE,EAAE,oBAAoB,EAAE,EACtC,GAAG,IAAI,CAAC;IAET,MAAM;SACH,OAAO,CAAC,mBAAmB,CAAC;SAC5B,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SACzC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;QACpC,OAAO,MAAM,oBAAoB,CAAC,GAAG,CAAC;YACpC,GAAI,OAA6B;YACjC,UAAU;SACX,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,IAAkB;IACvD,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAE1F,wBAAwB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC9C,yBAAyB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC/C,yBAAyB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC"}
1
+ {"version":3,"file":"register-module-commands.js","sourceRoot":"","sources":["../../src/command-line/register-module-commands.ts"],"names":[],"mappings":";;AA4DA,4CAMC;AA/DD,kDAAyC;AAIzC,SAAS,wBAAwB,CAAC,MAAe,EAAE,IAAkB;IACnE,MAAM,EACJ,WAAW,EAAE,EAAE,mBAAmB,EAAE,EACrC,GAAG,IAAI,CAAC;IACT,MAAM;SACH,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;SACxC,MAAM,CAAC,0BAA0B,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;SACpE,MAAM,CAAC,kCAAkC,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;SACxE,MAAM,CAAC,yBAAyB,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;SAChE,MAAM,CAAC,WAAW,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;SACjD,MAAM,CAAC,SAAS,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC;SAC9C,MAAM,CAAC,oBAAoB,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;SAC7D,MAAM,CAAC,cAAc,EAAE,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;SACvD,oBAAoB,CAAC,0BAA0B,CAAC;SAChD,mBAAmB,EAAE;SACrB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,OAAO,MAAM,mBAAmB,CAAC,GAAG,CAAC,OAA2B,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAe,EAAE,IAAkB;IACpE,MAAM,EACJ,WAAW,EAAE,EAAE,oBAAoB,EAAE,EACtC,GAAG,IAAI,CAAC;IACT,MAAM;SACH,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SACzC,MAAM,CAAC,uBAAuB,EAAE,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;SAC9D,MAAM,CAAC,yBAAyB,EAAE,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;SACjE,MAAM,CAAC,kCAAkC,EAAE,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;SACzE,oBAAoB,EAAE;SACtB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,OAAO,MAAM,oBAAoB,CAAC,GAAG,CAAC,OAA4B,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAe,EAAE,IAAkB;IACpE,MAAM,EACJ,WAAW,EAAE,EAAE,oBAAoB,EAAE,EACtC,GAAG,IAAI,CAAC;IAET,MAAM;SACH,OAAO,CAAC,mBAAmB,CAAC;SAC5B,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SACzC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;QACpC,OAAO,MAAM,oBAAoB,CAAC,GAAG,CAAC;YACpC,GAAI,OAA6B;YACjC,UAAU;SACX,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,IAAkB;IACvD,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,iBAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAE1F,wBAAwB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC9C,yBAAyB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC/C,yBAAyB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC"}
package/out/module-add/manifest-merger.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"manifest-merger.d.ts","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAQ,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAGD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,QAAQ,EAAE,MAAM,EAAE,GACjB,UAAU,GAAG,SAAS,CAoCxB;AAGD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAI3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAElF"}
1
+ {"version":3,"file":"manifest-merger.d.ts","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAQ,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAQ5D,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAYD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,QAAQ,EAAE,MAAM,EAAE,GACjB,UAAU,GAAG,SAAS,CAqCxB;AAQD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAI3E;AASD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAElF"}
package/out/module-add/manifest-merger.js CHANGED
@@ -6,10 +6,15 @@ exports.substituteVars = substituteVars;
6
6
  const tslib_1 = require("tslib");
7
7
  const fs_1 = tslib_1.__importDefault(require("fs"));
8
8
  const path_1 = tslib_1.__importDefault(require("path"));
9
- const yaml_1 = tslib_1.__importDefault(require("yaml"));
9
+ const yaml_1 = tslib_1.__importStar(require("yaml"));
10
10
  const diff_1 = require("diff");
11
11
  const cli_shared_1 = require("@forge/cli-shared");
12
12
  const COMPATIBILITY_PRODUCTS = new Set(['jira', 'confluence', 'compass']);
13
+ const ROOT_SECTION_ORDER = ['modules', 'resources', 'permissions', 'app'];
14
+ const RESOURCE_FIELD_ORDER = ['key', 'path', 'entry'];
15
+ const ROOT_INSERT_OPTIONS = { orderedKeys: ROOT_SECTION_ORDER };
16
+ const MODULE_INSERT_OPTIONS = { appendBeforeKey: 'function' };
17
+ const RESOURCE_INSERT_OPTIONS = { orderedKeys: RESOURCE_FIELD_ORDER };
13
18
  function planManifestChange(cwd, template, variables, warnings) {
14
19
  if (!template.cacheDir) {
15
20
  warnings.push(cli_shared_1.Text.module.add.warnNoFragment);
@@ -32,12 +37,13 @@ function planManifestChange(cwd, template, variables, warnings) {
32
37
  const substituted = substituteVars(fragmentContent, resolvedVariables);
33
38
  const manifestFragment = (yaml_1.default.parse(substituted) ?? {});
34
39
  applyCrossProductCompatibility(existingManifest, manifestFragment, template, warnings);
35
- const merged = deepMergeObjects(existingManifest, manifestFragment);
36
- const after = yaml_1.default.stringify(merged);
37
- if (before === after) {
40
+ const document = yaml_1.default.parseDocument(before);
41
+ const changed = mergeManifestDocument(document, manifestFragment);
42
+ if (!changed) {
38
43
  warnings.push(cli_shared_1.Text.module.add.warnNoManifestDelta);
39
44
  return undefined;
40
45
  }
46
+ const after = document.toString();
41
47
  const patch = (0, diff_1.createTwoFilesPatch)(manifestPath, manifestPath, before, after, 'before', 'after');
42
48
  return { filePath: manifestPath, before, after, patch };
43
49
  }
@@ -85,79 +91,181 @@ function assignAutoKeys(base, placeholders, existingKeys, out) {
85
91
  existingKeys.push(next);
86
92
  }
87
93
  }
88
- function deepMergeObjects(target, source, key) {
89
- if (Array.isArray(target) && Array.isArray(source)) {
90
- return mergeArrayValues(target, source, key);
94
+ function mergeManifestDocument(document, fragment) {
95
+ const root = ensureYamlMap(document);
96
+ let changed = false;
97
+ for (const key of ROOT_SECTION_ORDER) {
98
+ const value = fragment[key];
99
+ if (value === undefined)
100
+ continue;
101
+ if (key === 'modules') {
102
+ if (!isObject(value))
103
+ continue;
104
+ const modules = ensureMapEntry(root, document, key, ROOT_INSERT_OPTIONS);
105
+ changed = mergeModulesMap(modules, document, value) || changed;
106
+ }
107
+ else {
108
+ changed = mergeMapValue(root, document, key, value, ROOT_INSERT_OPTIONS) || changed;
109
+ }
91
110
  }
92
- if (isObject(target) && isObject(source)) {
93
- return mergeRecordValues(target, source, key);
111
+ for (const [key, value] of Object.entries(fragment)) {
112
+ if (ROOT_SECTION_ORDER.includes(key))
113
+ continue;
114
+ changed = mergeMapValue(root, document, key, value) || changed;
94
115
  }
95
- return source;
116
+ return changed;
96
117
  }
97
- function mergeArrayValues(target, source, key) {
98
- if (key === 'resources') {
99
- return mergeResourcesByKey(target, source);
118
+ function mergeModulesMap(modules, document, source) {
119
+ const rank = (key) => (key === 'function' ? 1 : 0);
120
+ const ordered = Object.entries(source).sort(([left], [right]) => rank(left) - rank(right));
121
+ let changed = false;
122
+ for (const [key, value] of ordered) {
123
+ changed = mergeMapValue(modules, document, key, value, MODULE_INSERT_OPTIONS) || changed;
100
124
  }
101
- const merged = [...target, ...source];
102
- if (key === 'scopes') {
103
- return [...new Set(merged)];
125
+ return changed;
126
+ }
127
+ function mergeMapValue(map, document, key, value, insertOptions) {
128
+ const pair = map.items.find((item) => readScalar(item.key) === key);
129
+ if (!pair) {
130
+ insertPair(map, document, key, value, insertOptions);
131
+ return true;
104
132
  }
105
- return merged;
133
+ return mergeNode(pair.value, value, key, document);
106
134
  }
107
- function mergeRecordValues(target, source, key) {
108
- const result = { ...target };
109
- for (const k of Object.keys(source)) {
110
- result[k] = k in result ? deepMergeObjects(result[k], source[k], k) : source[k];
135
+ function mergeNode(existing, source, key, document) {
136
+ if (existing instanceof yaml_1.YAMLSeq && Array.isArray(source)) {
137
+ return key === 'resources' ? mergeResourceList(existing, source, document) : mergeArray(existing, source, document);
111
138
  }
112
- if (key === 'modules') {
113
- moveKeysToBottom(result, ['function', 'resource']);
139
+ if (existing instanceof yaml_1.YAMLMap && isObject(source)) {
140
+ let changed = false;
141
+ for (const [childKey, childValue] of Object.entries(source)) {
142
+ changed = mergeMapValue(existing, document, childKey, childValue) || changed;
143
+ }
144
+ return changed;
114
145
  }
115
- if (key === undefined) {
116
- moveKeysToBottom(result, ['resources', 'app']);
146
+ return false;
147
+ }
148
+ function mergeArray(seq, source, document) {
149
+ const existing = new Set(seq.toJSON().map((value) => JSON.stringify(value)));
150
+ let changed = false;
151
+ for (const value of source) {
152
+ const identity = JSON.stringify(value);
153
+ if (existing.has(identity))
154
+ continue;
155
+ seq.add(document.createNode(value));
156
+ existing.add(identity);
157
+ changed = true;
117
158
  }
118
- return result;
159
+ return changed;
119
160
  }
120
- function moveKeysToBottom(result, keys) {
121
- for (const k of keys) {
122
- if (k in result) {
123
- const v = result[k];
124
- delete result[k];
125
- result[k] = v;
161
+ function mergeResourceList(seq, source, document) {
162
+ let changed = false;
163
+ for (const resource of source) {
164
+ if (!isObject(resource) || typeof resource.key !== 'string')
165
+ continue;
166
+ const existing = seq.items.find((item) => item instanceof yaml_1.YAMLMap && readScalar(item.get('key', true)) === resource.key);
167
+ if (!existing) {
168
+ seq.add(document.createNode(resource));
169
+ changed = true;
170
+ continue;
126
171
  }
172
+ changed = mergeExistingResource(existing, resource, document) || changed;
127
173
  }
174
+ return changed;
128
175
  }
129
- function mergeResourcesByKey(target, source) {
130
- const byKey = new Map();
131
- for (const item of target) {
132
- if (isObject(item) && typeof item.key === 'string')
133
- byKey.set(item.key, item);
176
+ function mergeExistingResource(existing, incoming, document) {
177
+ const resourceKey = incoming.key;
178
+ const existingPath = readScalar(existing.get('path', true));
179
+ if (typeof existingPath === 'string' && typeof incoming.path === 'string' && existingPath !== incoming.path) {
180
+ throw new Error(cli_shared_1.Text.module.add.errorResourcePathConflict(resourceKey, existingPath, incoming.path));
181
+ }
182
+ let changed = false;
183
+ if (isObject(incoming.entry)) {
184
+ const entries = ensureMapEntry(existing, document, 'entry', RESOURCE_INSERT_OPTIONS);
185
+ changed = mergeEntryMap(entries, incoming.entry, document, resourceKey) || changed;
134
186
  }
135
- for (const incoming of source) {
136
- if (!isObject(incoming) || typeof incoming.key !== 'string')
187
+ for (const [field, value] of Object.entries(incoming)) {
188
+ if (field === 'key' || field === 'entry')
137
189
  continue;
138
- const existing = byKey.get(incoming.key);
139
- byKey.set(incoming.key, existing ? mergeResource(existing, incoming) : incoming);
140
- }
141
- return [...byKey.values()];
142
- }
143
- function mergeResource(existing, incoming) {
144
- const key = incoming.key;
145
- if (typeof existing.path === 'string' && typeof incoming.path === 'string' && existing.path !== incoming.path) {
146
- throw new Error(cli_shared_1.Text.module.add.errorResourcePathConflict(key, existing.path, incoming.path));
147
- }
148
- const existingEntry = isObject(existing.entry) ? existing.entry : {};
149
- const incomingEntry = isObject(incoming.entry) ? incoming.entry : {};
150
- const mergedEntry = { ...existingEntry };
151
- for (const [name, value] of Object.entries(incomingEntry)) {
152
- if (name in mergedEntry && mergedEntry[name] !== value) {
153
- throw new Error(cli_shared_1.Text.module.add.errorResourceEntryConflict(key, name, String(mergedEntry[name]), String(value)));
190
+ changed = mergeMapValue(existing, document, field, value, RESOURCE_INSERT_OPTIONS) || changed;
191
+ }
192
+ return changed;
193
+ }
194
+ function mergeEntryMap(map, source, document, resourceKey) {
195
+ let changed = false;
196
+ for (const [entryKey, value] of Object.entries(source)) {
197
+ const existingValue = readScalar(map.get(entryKey, true));
198
+ if (existingValue === undefined) {
199
+ insertPair(map, document, entryKey, value);
200
+ changed = true;
201
+ }
202
+ else if (existingValue !== value) {
203
+ throw new Error(cli_shared_1.Text.module.add.errorResourceEntryConflict(resourceKey ?? '', entryKey, String(existingValue), String(value)));
204
+ }
205
+ }
206
+ return changed;
207
+ }
208
+ function ensureYamlMap(document) {
209
+ if (document.contents instanceof yaml_1.YAMLMap) {
210
+ return document.contents;
211
+ }
212
+ if (document.contents != null) {
213
+ throw new Error(cli_shared_1.Text.module.add.errorManifestNotAMap);
214
+ }
215
+ const root = document.createNode({});
216
+ document.contents = root;
217
+ return root;
218
+ }
219
+ function ensureMapEntry(map, document, key, insertOptions) {
220
+ const pair = map.items.find((item) => readScalar(item.key) === key);
221
+ if (pair?.value instanceof yaml_1.YAMLMap) {
222
+ return pair.value;
223
+ }
224
+ const next = document.createNode({});
225
+ if (!(next instanceof yaml_1.YAMLMap)) {
226
+ throw new Error(`Expected ${key} to be a YAML map`);
227
+ }
228
+ if (pair) {
229
+ pair.value = next;
230
+ }
231
+ else {
232
+ insertPair(map, document, key, next, insertOptions);
233
+ }
234
+ return next;
235
+ }
236
+ function insertPair(map, document, key, value, options = {}) {
237
+ const pair = document.createPair(key, value);
238
+ if (options.appendBeforeKey && key !== options.appendBeforeKey) {
239
+ const beforeIndex = map.items.findIndex((item) => readScalar(item.key) === options.appendBeforeKey);
240
+ if (beforeIndex !== -1) {
241
+ map.items.splice(beforeIndex, 0, pair);
242
+ return;
243
+ }
244
+ }
245
+ if (options.orderedKeys) {
246
+ insertPairByOrder(map, pair, options.orderedKeys);
247
+ return;
248
+ }
249
+ map.items.push(pair);
250
+ }
251
+ function insertPairByOrder(map, pair, orderedKeys) {
252
+ const newIndex = orderedKeys.indexOf(readScalar(pair.key));
253
+ if (newIndex === -1) {
254
+ map.items.push(pair);
255
+ return;
256
+ }
257
+ let insertAt = map.items.length;
258
+ for (let idx = 0; idx < map.items.length; idx++) {
259
+ const existingIndex = orderedKeys.indexOf(readScalar(map.items[idx].key));
260
+ if (existingIndex > newIndex) {
261
+ insertAt = idx;
262
+ break;
154
263
  }
155
- mergedEntry[name] = value;
156
264
  }
157
- return {
158
- ...existing,
159
- entry: mergedEntry
160
- };
265
+ map.items.splice(insertAt, 0, pair);
266
+ }
267
+ function readScalar(value) {
268
+ return value instanceof yaml_1.Scalar ? value.value : value;
161
269
  }
162
270
  function isObject(value) {
163
271
  return value !== null && typeof value === 'object' && !Array.isArray(value);
@@ -168,17 +276,21 @@ function applyCrossProductCompatibility(existingManifest, manifestFragment, temp
168
276
  return;
169
277
  const existingProducts = collectProductPrefixes(existingManifest.modules);
170
278
  existingProducts.delete(newProduct);
171
- const existingProduct = [...existingProducts].find((p) => COMPATIBILITY_PRODUCTS.has(p));
172
- if (!existingProduct)
279
+ const compatProducts = [...existingProducts].filter((p) => COMPATIBILITY_PRODUCTS.has(p));
280
+ if (compatProducts.length === 0)
173
281
  return;
174
- const existingCompatibility = readCompatibility(existingManifest);
282
+ const existingApp = isObject(existingManifest.app) ? existingManifest.app : undefined;
283
+ const existingCompatibility = existingApp && isObject(existingApp.compatibility) ? existingApp.compatibility : {};
175
284
  const fragmentApp = isObject(manifestFragment.app) ? manifestFragment.app : {};
176
- const fragmentCompatibility = isObject(fragmentApp.compatibility)
177
- ? fragmentApp.compatibility
178
- : {};
285
+ const fragmentCompatibility = isObject(fragmentApp.compatibility) ? fragmentApp.compatibility : {};
286
+ const hasRequiredContext = Object.values(existingCompatibility).some((value) => isObject(value) && value.required === true);
179
287
  const nextCompatibility = { ...fragmentCompatibility };
180
- if (!isObject(existingCompatibility[existingProduct])) {
181
- nextCompatibility[existingProduct] = { required: true };
288
+ let primaryAssigned = hasRequiredContext;
289
+ for (const existingProduct of compatProducts) {
290
+ if (isObject(existingCompatibility[existingProduct]) || isObject(nextCompatibility[existingProduct]))
291
+ continue;
292
+ nextCompatibility[existingProduct] = { required: !primaryAssigned };
293
+ primaryAssigned = true;
182
294
  }
183
295
  if (!isObject(existingCompatibility[newProduct]) && !isObject(nextCompatibility[newProduct])) {
184
296
  nextCompatibility[newProduct] = { required: false };
@@ -186,12 +298,7 @@ function applyCrossProductCompatibility(existingManifest, manifestFragment, temp
186
298
  if (Object.keys(nextCompatibility).length === Object.keys(fragmentCompatibility).length)
187
299
  return;
188
300
  manifestFragment.app = { ...fragmentApp, compatibility: nextCompatibility };
189
- warnings.push(cli_shared_1.Text.module.add.warnAddedAppCompatibility(existingProduct, newProduct));
190
- }
191
- function readCompatibility(manifest) {
192
- const app = isObject(manifest.app) ? manifest.app : undefined;
193
- const compatibility = app && isObject(app.compatibility) ? app.compatibility : undefined;
194
- return compatibility ?? {};
301
+ warnings.push(cli_shared_1.Text.module.add.warnAddedAppCompatibility(compatProducts, newProduct));
195
302
  }
196
303
  function collectProductPrefixes(modules) {
197
304
  const prefixes = new Set();
package/out/module-add/manifest-merger.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"manifest-merger.js","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manifest-merger.js","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"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"}
package/out/service/module-file-service.js CHANGED
@@ -111,7 +111,7 @@ class ModuleAddFileService {
111
111
  async runInstalls(cwd, frontendPackageJsonChange, scaffoldChanges, options) {
112
112
  if (options.install === false)
113
113
  return;
114
- await (0, dependencies_merger_1.runPackageManager)(cwd, ['install']);
114
+ await (0, dependencies_merger_1.runPackageManager)(cwd, ['install', '--legacy-peer-deps']);
115
115
  const frontendDirs = new Set();
116
116
  if (frontendPackageJsonChange) {
117
117
  frontendDirs.add(path_1.default.dirname(frontendPackageJsonChange.filePath));
@@ -122,7 +122,7 @@ class ModuleAddFileService {
122
122
  }
123
123
  }
124
124
  for (const frontendDir of frontendDirs) {
125
- await (0, dependencies_merger_1.runPackageManager)(frontendDir, ['install']);
125
+ await (0, dependencies_merger_1.runPackageManager)(frontendDir, ['install', '--legacy-peer-deps']);
126
126
  await (0, dependencies_merger_1.runPackageManager)(frontendDir, ['run', 'build']);
127
127
  }
128
128
  }
package/out/service/module-file-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module-file-service.js","sourceRoot":"","sources":["../../src/service/module-file-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"module-file-service.js","sourceRoot":"","sources":["../../src/service/module-file-service.ts"],"names":[],"mappings":"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"}
package/out/service/module-service.d.ts CHANGED
@@ -5,7 +5,8 @@ export interface AddModuleOptions {
5
5
  product?: string;
6
6
  dryRun?: boolean;
7
7
  force?: boolean;
8
- variables?: Record<string, string>;
8
+ variables?: string;
9
+ nonInteractive?: boolean;
9
10
  install?: boolean;
10
11
  }
11
12
  export interface ManifestKeys {
package/out/service/module-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module-service.d.ts","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,sBAAsB,EACtB,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3B;AAwDD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;gBAE9B,gBAAgB,EAAE,sBAAsB;IAIvC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAgBpF,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IActF,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAaxE,qBAAqB,CAChC,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAW7B,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlG,OAAO,IAAI,IAAI;IASf,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IAsB5E,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS5D,gBAAgB,CAC3B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC;IA2Cb,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,WAAW;IAY9E,mBAAmB,IAAI;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,YAAY,CAAA;KAAE;IAO3E,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS;IAWrG,sBAAsB,CACjC,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;CAYrB"}
1
+ {"version":3,"file":"module-service.d.ts","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,sBAAsB,EACtB,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3B;AAwDD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;gBAE9B,gBAAgB,EAAE,sBAAsB;IAIvC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAgBpF,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IActF,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAaxE,qBAAqB,CAChC,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAW7B,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlG,OAAO,IAAI,IAAI;IASf,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IAsB5E,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS5D,gBAAgB,CAC3B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC;IA2Cb,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,WAAW;IAY9E,mBAAmB,IAAI;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,YAAY,CAAA;KAAE;IAO3E,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS;IAWrG,sBAAsB,CACjC,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;CAYrB"}
package/out/service/module-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module-service.js","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"module-service.js","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "13.1.0-next.4-experimental-9423de1",
3
+ "version": "13.1.0",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -21,14 +21,14 @@
21
21
  "generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
22
22
  },
23
23
  "dependencies": {
24
- "@forge/bundler": "7.0.1-next.2-experimental-9423de1",
25
- "@forge/cli-shared": "9.0.1-next.2-experimental-9423de1",
24
+ "@forge/bundler": "7.0.1",
25
+ "@forge/cli-shared": "9.1.0",
26
26
  "@forge/egress": "3.0.0",
27
- "@forge/lint": "6.0.1-next.2-experimental-9423de1",
28
- "@forge/manifest": "13.1.0-next.2-experimental-9423de1",
27
+ "@forge/lint": "6.0.1",
28
+ "@forge/manifest": "13.1.0",
29
29
  "@forge/i18n": "1.0.0",
30
30
  "@forge/runtime": "7.0.0",
31
- "@forge/tunnel": "7.0.1-next.3-experimental-9423de1",
31
+ "@forge/tunnel": "7.0.1",
32
32
  "@forge/util": "3.0.0",
33
33
  "@sentry/node": "7.106.0",
34
34
  "ajv": "^8.18.0",
@@ -83,7 +83,6 @@
83
83
  "adm-zip": "^0.5.10",
84
84
  "chokidar": "^3.6.0",
85
85
  "jest": "^29.7.0",
86
- "jest-fixtures": "^0.6.0",
87
86
  "jest-matcher-specific-error": "^1.0.0",
88
87
  "jest-when": "^3.6.0",
89
88
  "json-schema-to-typescript": "^10.1.5",
@@ -95,7 +94,11 @@
95
94
  "yaml": "^2.3.4"
96
95
  },
97
96
  "engines": {
98
- "node": ">=20.18.1"
97
+ "node": ">=20.18.1 <22.23.1 || >22.23.1 <24.17.0 || >24.17.0"
98
+ },
99
+ "engines_why": {
100
+ "22.23.1": "ECO-1586: Includes bug https://github.com/nodejs/node/issues/63989 triggering 'Premature close' on node-fetch",
101
+ "24.17.0": "ECO-1586: Includes bug https://github.com/nodejs/node/issues/63989 triggering 'Premature close' on node-fetch"
99
102
  },
100
103
  "publishConfig": {
101
104
  "registry": "https://packages.atlassian.com/api/npm/npm-public/"