@microsoft/generator-sharepoint 1.17.2 → 1.17.3

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 (5) hide show
  1. package/lib/common/BaseGenerator.d.ts +1 -0
  2. package/lib/common/BaseGenerator.d.ts.map +1 -1
  3. package/lib/common/BaseGenerator.js +14 -0
  4. package/lib/common/dependencies.json +58 -58
  5. package/package.json +2 -2
package/lib/common/BaseGenerator.d.ts CHANGED
@@ -51,6 +51,7 @@ export declare abstract class BaseGenerator<IOptions extends IBaseOptions, ICont
51
51
  protected ensureDependencyGroup(group: DependencyGroups): void;
52
52
  protected nameIsDependencyGroup(name: string): name is DependencyGroups;
53
53
  private _ensureDependenciesByDependencyGroup;
54
+ private _dedupeDependencies;
54
55
  private _addResolutionsIfApplicable;
55
56
  private _doPnpmInstall;
56
57
  private _untokenizedCopier;
package/lib/common/BaseGenerator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseGenerator.d.ts","sourceRoot":"","sources":["../../src/common/BaseGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,YAAY,EAAY,MAAM,8BAA8B,CAAC;AAGtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAG1E,oBAAY,kBAAkB,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9D,oBAAY,gBAAgB,GAAG,MAAM,cAAc,qBAAqB,CAAC,CAAC;AAC1E,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAOD,8BAAsB,aAAa,CACjC,QAAQ,SAAS,YAAY,EAC7B,QAAQ,SAAS,MAAM,CACvB,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACxB,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAoD;IACvG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAkB;IAEtD;;OAEG;IACI,OAAO,EAAE,QAAQ,CAAC;IAEzB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,qBAAqB,EAAE,OAAO,CAAS;IAEjD,OAAO,CAAC,8BAA8B,CAAqD;IAE3F,SAAS,KAAK,kBAAkB,IAAI,kBAAkB,CAQrD;IAED,SAAS,KAAK,UAAU,IAAI,iBAAiB,CAK5C;IAED,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAK1C;IAED,SAAS,KAAK,mBAAmB,IAAI,0BAA0B,CAK9D;IAED,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAa/B;;;;OAIG;IAEH,yFAAyF;aACzE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEpD,0EAA0E;aAC1D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEjD,gFAAgF;aAChE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE5C,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAEjC;IAEF,8EAA8E;IACvE,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAkBhE,8CAA8C;aAC9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE/C,8CAA8C;aAC9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE3C,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ;IAmChE,SAAS,CAAC,UAAU,IAAI,OAAO;IAQ/B,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAMrC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAiB9D,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,gBAAgB;IAMvE,OAAO,CAAC,oCAAoC;IAsB5C,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,kBAAkB;CAS3B"}
1
+ {"version":3,"file":"BaseGenerator.d.ts","sourceRoot":"","sources":["../../src/common/BaseGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,YAAY,EAAY,MAAM,8BAA8B,CAAC;AAGtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAG1E,oBAAY,kBAAkB,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAE9D,oBAAY,gBAAgB,GAAG,MAAM,cAAc,qBAAqB,CAAC,CAAC;AAC1E,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAOD,8BAAsB,aAAa,CACjC,QAAQ,SAAS,YAAY,EAC7B,QAAQ,SAAS,MAAM,CACvB,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACxB,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAoD;IACvG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAkB;IAEtD;;OAEG;IACI,OAAO,EAAE,QAAQ,CAAC;IAEzB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,qBAAqB,EAAE,OAAO,CAAS;IAEjD,OAAO,CAAC,8BAA8B,CAAqD;IAE3F,SAAS,KAAK,kBAAkB,IAAI,kBAAkB,CAQrD;IAED,SAAS,KAAK,UAAU,IAAI,iBAAiB,CAK5C;IAED,SAAS,KAAK,SAAS,IAAI,gBAAgB,CAK1C;IAED,SAAS,KAAK,mBAAmB,IAAI,0BAA0B,CAK9D;IAED,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAa/B;;;;OAIG;IAEH,yFAAyF;aACzE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEpD,0EAA0E;aAC1D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAEjD,gFAAgF;aAChE,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE5C,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAEjC;IAEF,8EAA8E;IACvE,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAkBhE,8CAA8C;aAC9B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE/C,8CAA8C;aAC9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAE3C,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ;IAmChE,SAAS,CAAC,UAAU,IAAI,OAAO;IAQ/B,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAMrC,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAoB9D,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,IAAI,gBAAgB;IAMvE,OAAO,CAAC,oCAAoC;IAsB5C,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,kBAAkB;CAS3B"}
package/lib/common/BaseGenerator.js CHANGED
@@ -143,6 +143,8 @@ class BaseGenerator extends yeoman_generator_1.default {
143
143
  for (const [name, version] of Object.entries(dependencies.dependencies)) {
144
144
  this.packageJsonManager.addDependency(name, version);
145
145
  }
146
+ // before applying devDependencies, dedupe them
147
+ this._dedupeDependencies(dependencies.devDependencies);
146
148
  for (const [name, version] of Object.entries(dependencies.devDependencies)) {
147
149
  this.packageJsonManager.addDevDependency(name, version);
148
150
  }
@@ -171,6 +173,18 @@ class BaseGenerator extends yeoman_generator_1.default {
171
173
  }
172
174
  return this._dependenciesByDependencyGroup;
173
175
  }
176
+ _dedupeDependencies(devDependencies) {
177
+ // if there is already a dependency and the same devDependency - leave dependency only
178
+ if (!this.packageJsonManager.data.dependencies || !devDependencies) {
179
+ return;
180
+ }
181
+ const { dependencies } = this.packageJsonManager.data;
182
+ Object.keys(devDependencies).forEach((packageName) => {
183
+ if (dependencies[packageName]) {
184
+ delete devDependencies[packageName];
185
+ }
186
+ });
187
+ }
174
188
  _addResolutionsIfApplicable(packages) {
175
189
  if (this.packageJsonManager.data.dependencies) {
176
190
  for (const packageName of packages) {
package/lib/common/dependencies.json CHANGED
@@ -2,30 +2,30 @@
2
2
  "adaptiveCardExtension": {
3
3
  "standard": {
4
4
  "dependencies": {
5
- "@microsoft/sp-core-library": "1.17.2",
6
- "@microsoft/sp-property-pane": "1.17.2",
7
- "@microsoft/sp-adaptive-card-extension-base": "1.17.2"
5
+ "@microsoft/sp-core-library": "1.17.3",
6
+ "@microsoft/sp-property-pane": "1.17.3",
7
+ "@microsoft/sp-adaptive-card-extension-base": "1.17.3"
8
8
  },
9
9
  "devDependencies": {
10
- "@microsoft/sp-module-interfaces": "1.17.2"
10
+ "@microsoft/sp-module-interfaces": "1.17.3"
11
11
  }
12
12
  },
13
13
  "plusBeta": {
14
14
  "dependencies": {
15
- "@microsoft/sp-core-library": "1.17.2",
16
- "@microsoft/sp-property-pane": "1.17.2",
17
- "@microsoft/sp-adaptive-card-extension-base": "1.17.2"
15
+ "@microsoft/sp-core-library": "1.17.3",
16
+ "@microsoft/sp-property-pane": "1.17.3",
17
+ "@microsoft/sp-adaptive-card-extension-base": "1.17.3"
18
18
  },
19
19
  "devDependencies": {
20
- "@microsoft/sp-module-interfaces": "1.17.2"
20
+ "@microsoft/sp-module-interfaces": "1.17.3"
21
21
  }
22
22
  }
23
23
  },
24
24
  "applicationCustomizer": {
25
25
  "standard": {
26
26
  "dependencies": {
27
- "@microsoft/sp-dialog": "1.17.2",
28
- "@microsoft/sp-application-base": "1.17.2"
27
+ "@microsoft/sp-dialog": "1.17.3",
28
+ "@microsoft/sp-application-base": "1.17.3"
29
29
  }
30
30
  },
31
31
  "plusBeta": null
@@ -33,8 +33,8 @@
33
33
  "applicationCustomizerPlusBeta": {
34
34
  "standard": {
35
35
  "dependencies": {
36
- "@microsoft/sp-dialog": "1.17.2",
37
- "@microsoft/sp-application-base": "1.17.2"
36
+ "@microsoft/sp-dialog": "1.17.3",
37
+ "@microsoft/sp-application-base": "1.17.3"
38
38
  }
39
39
  },
40
40
  "plusBeta": null
@@ -42,8 +42,8 @@
42
42
  "commandSet": {
43
43
  "standard": {
44
44
  "dependencies": {
45
- "@microsoft/sp-listview-extensibility": "1.17.2",
46
- "@microsoft/sp-dialog": "1.17.2"
45
+ "@microsoft/sp-listview-extensibility": "1.17.3",
46
+ "@microsoft/sp-dialog": "1.17.3"
47
47
  }
48
48
  },
49
49
  "plusBeta": null
@@ -51,8 +51,8 @@
51
51
  "commandSetPlusBeta": {
52
52
  "standard": {
53
53
  "dependencies": {
54
- "@microsoft/sp-listview-extensibility": "1.17.2",
55
- "@microsoft/sp-dialog": "1.17.2"
54
+ "@microsoft/sp-listview-extensibility": "1.17.3",
55
+ "@microsoft/sp-dialog": "1.17.3"
56
56
  }
57
57
  },
58
58
  "plusBeta": null
@@ -60,27 +60,27 @@
60
60
  "extension": {
61
61
  "standard": {
62
62
  "dependencies": {
63
- "@microsoft/sp-core-library": "1.17.2",
64
- "@microsoft/decorators": "1.17.2"
63
+ "@microsoft/sp-core-library": "1.17.3",
64
+ "@microsoft/decorators": "1.17.3"
65
65
  },
66
66
  "devDependencies": {
67
- "@microsoft/sp-module-interfaces": "1.17.2"
67
+ "@microsoft/sp-module-interfaces": "1.17.3"
68
68
  }
69
69
  },
70
70
  "plusBeta": {
71
71
  "dependencies": {
72
- "@microsoft/sp-core-library": "1.17.2",
73
- "@microsoft/decorators": "1.17.2"
72
+ "@microsoft/sp-core-library": "1.17.3",
73
+ "@microsoft/decorators": "1.17.3"
74
74
  },
75
75
  "devDependencies": {
76
- "@microsoft/sp-module-interfaces": "1.17.2"
76
+ "@microsoft/sp-module-interfaces": "1.17.3"
77
77
  }
78
78
  }
79
79
  },
80
80
  "fieldCustomizer": {
81
81
  "standard": {
82
82
  "dependencies": {
83
- "@microsoft/sp-listview-extensibility": "1.17.2"
83
+ "@microsoft/sp-listview-extensibility": "1.17.3"
84
84
  }
85
85
  },
86
86
  "plusBeta": null
@@ -88,7 +88,7 @@
88
88
  "fieldCustomizerPlusBeta": {
89
89
  "standard": {
90
90
  "dependencies": {
91
- "@microsoft/sp-listview-extensibility": "1.17.2"
91
+ "@microsoft/sp-listview-extensibility": "1.17.3"
92
92
  }
93
93
  },
94
94
  "plusBeta": null
@@ -97,13 +97,13 @@
97
97
  "standard": {
98
98
  "dependencies": {},
99
99
  "devDependencies": {
100
- "@microsoft/sp-module-interfaces": "1.17.2"
100
+ "@microsoft/sp-module-interfaces": "1.17.3"
101
101
  }
102
102
  },
103
103
  "plusBeta": {
104
104
  "dependencies": {},
105
105
  "devDependencies": {
106
- "@microsoft/sp-module-interfaces": "1.17.2"
106
+ "@microsoft/sp-module-interfaces": "1.17.3"
107
107
  }
108
108
  }
109
109
  },
@@ -126,7 +126,7 @@
126
126
  "searchQueryModifier": {
127
127
  "standard": {
128
128
  "dependencies": {
129
- "@microsoft/sp-search-extensibility": "1.17.2"
129
+ "@microsoft/sp-search-extensibility": "1.17.3"
130
130
  }
131
131
  },
132
132
  "plusBeta": null
@@ -134,7 +134,7 @@
134
134
  "searchQueryModifierPlusBeta": {
135
135
  "standard": {
136
136
  "dependencies": {
137
- "@microsoft/sp-search-extensibility": "1.17.2"
137
+ "@microsoft/sp-search-extensibility": "1.17.3"
138
138
  }
139
139
  },
140
140
  "plusBeta": null
@@ -142,29 +142,29 @@
142
142
  "webpart": {
143
143
  "standard": {
144
144
  "dependencies": {
145
- "@microsoft/sp-core-library": "1.17.2",
146
- "@microsoft/sp-component-base": "1.17.2",
147
- "@microsoft/sp-property-pane": "1.17.2",
148
- "@microsoft/sp-webpart-base": "1.17.2",
149
- "@microsoft/sp-lodash-subset": "1.17.2",
150
- "@microsoft/sp-office-ui-fabric-core": "1.17.2"
145
+ "@microsoft/sp-core-library": "1.17.3",
146
+ "@microsoft/sp-component-base": "1.17.3",
147
+ "@microsoft/sp-property-pane": "1.17.3",
148
+ "@microsoft/sp-webpart-base": "1.17.3",
149
+ "@microsoft/sp-lodash-subset": "1.17.3",
150
+ "@microsoft/sp-office-ui-fabric-core": "1.17.3"
151
151
  },
152
152
  "devDependencies": {
153
- "@microsoft/sp-module-interfaces": "1.17.2",
153
+ "@microsoft/sp-module-interfaces": "1.17.3",
154
154
  "@fluentui/react": "^7.199.1"
155
155
  }
156
156
  },
157
157
  "plusBeta": {
158
158
  "dependencies": {
159
- "@microsoft/sp-core-library": "1.17.2",
160
- "@microsoft/sp-component-base": "1.17.2",
161
- "@microsoft/sp-property-pane": "1.17.2",
162
- "@microsoft/sp-webpart-base": "1.17.2",
163
- "@microsoft/sp-lodash-subset": "1.17.2",
164
- "@microsoft/sp-office-ui-fabric-core": "1.17.2"
159
+ "@microsoft/sp-core-library": "1.17.3",
160
+ "@microsoft/sp-component-base": "1.17.3",
161
+ "@microsoft/sp-property-pane": "1.17.3",
162
+ "@microsoft/sp-webpart-base": "1.17.3",
163
+ "@microsoft/sp-lodash-subset": "1.17.3",
164
+ "@microsoft/sp-office-ui-fabric-core": "1.17.3"
165
165
  },
166
166
  "devDependencies": {
167
- "@microsoft/sp-module-interfaces": "1.17.2"
167
+ "@microsoft/sp-module-interfaces": "1.17.3"
168
168
  }
169
169
  }
170
170
  },
@@ -176,9 +176,9 @@
176
176
  "devDependencies": {
177
177
  "@microsoft/rush-stack-compiler-4.5": "0.5.0",
178
178
  "@rushstack/eslint-config": "2.5.1",
179
- "@microsoft/eslint-plugin-spfx": "1.17.2",
180
- "@microsoft/eslint-config-spfx": "1.17.2",
181
- "@microsoft/spfx-web-build-rig": "1.17.2",
179
+ "@microsoft/eslint-plugin-spfx": "1.17.3",
180
+ "@microsoft/eslint-config-spfx": "1.17.3",
181
+ "@microsoft/spfx-web-build-rig": "1.17.3",
182
182
  "@rushstack/heft": "0.49.7",
183
183
  "@types/webpack-env": "~1.15.2",
184
184
  "eslint": "8.7.0"
@@ -194,9 +194,9 @@
194
194
  "devDependencies": {
195
195
  "@microsoft/rush-stack-compiler-4.5": "0.5.0",
196
196
  "@rushstack/eslint-config": "2.5.1",
197
- "@microsoft/eslint-plugin-spfx": "1.17.2",
198
- "@microsoft/eslint-config-spfx": "1.17.2",
199
- "@microsoft/sp-build-web": "1.17.2",
197
+ "@microsoft/eslint-plugin-spfx": "1.17.3",
198
+ "@microsoft/eslint-config-spfx": "1.17.3",
199
+ "@microsoft/sp-build-web": "1.17.3",
200
200
  "@types/webpack-env": "~1.15.2",
201
201
  "ajv": "^6.12.5",
202
202
  "eslint": "8.7.0",
@@ -212,24 +212,24 @@
212
212
  "formCustomizer": {
213
213
  "standard": {
214
214
  "dependencies": {
215
- "@microsoft/sp-core-library": "1.17.2",
216
- "@microsoft/sp-listview-extensibility": "1.17.2",
217
- "@microsoft/sp-lodash-subset": "1.17.2",
218
- "@microsoft/sp-office-ui-fabric-core": "1.17.2"
215
+ "@microsoft/sp-core-library": "1.17.3",
216
+ "@microsoft/sp-listview-extensibility": "1.17.3",
217
+ "@microsoft/sp-lodash-subset": "1.17.3",
218
+ "@microsoft/sp-office-ui-fabric-core": "1.17.3"
219
219
  },
220
220
  "devDependencies": {
221
- "@microsoft/sp-module-interfaces": "1.17.2"
221
+ "@microsoft/sp-module-interfaces": "1.17.3"
222
222
  }
223
223
  },
224
224
  "plusBeta": {
225
225
  "dependencies": {
226
- "@microsoft/sp-core-library": "1.17.2",
227
- "@microsoft/sp-listview-extensibility": "1.17.2",
228
- "@microsoft/sp-lodash-subset": "1.17.2",
229
- "@microsoft/sp-office-ui-fabric-core": "1.17.2"
226
+ "@microsoft/sp-core-library": "1.17.3",
227
+ "@microsoft/sp-listview-extensibility": "1.17.3",
228
+ "@microsoft/sp-lodash-subset": "1.17.3",
229
+ "@microsoft/sp-office-ui-fabric-core": "1.17.3"
230
230
  },
231
231
  "devDependencies": {
232
- "@microsoft/sp-module-interfaces": "1.17.2"
232
+ "@microsoft/sp-module-interfaces": "1.17.3"
233
233
  }
234
234
  }
235
235
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/generator-sharepoint",
3
- "version": "1.17.2",
3
+ "version": "1.17.3",
4
4
  "description": "Yeoman generator for the SharePoint Framework",
5
5
  "engines": {
6
6
  "node": ">=16.13.0 <17.0.0"
@@ -19,7 +19,7 @@
19
19
  "uuid": "~3.1.0",
20
20
  "yeoman-generator": "5.6.1",
21
21
  "yosay": "2.0.2",
22
- "@microsoft/spfx-heft-plugins": "1.17.2"
22
+ "@microsoft/spfx-heft-plugins": "1.17.3"
23
23
  },
24
24
  "devDependencies": {
25
25
  "@microsoft/rush-lib": "5.93.1",