@microsoft/generator-sharepoint 1.17.4 → 1.18.0-beta.2

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 (108) hide show
  1. package/lib/common/BaseGenerator.d.ts +3 -3
  2. package/lib/common/BaseGenerator.d.ts.map +1 -1
  3. package/lib/common/BaseGenerator.js +4 -4
  4. package/lib/common/ConfigJsonManager.d.ts +4 -4
  5. package/lib/common/ConfigJsonManager.d.ts.map +1 -1
  6. package/lib/common/ConfigJsonManager.js +1 -3
  7. package/lib/common/JsonManager.d.ts +2 -2
  8. package/lib/common/JsonManager.d.ts.map +1 -1
  9. package/lib/common/JsonManager.js +4 -4
  10. package/lib/common/PackageJsonManager.d.ts +2 -2
  11. package/lib/common/PackageJsonManager.d.ts.map +1 -1
  12. package/lib/common/PackageSolutionJsonManager.d.ts +3 -3
  13. package/lib/common/PackageSolutionJsonManager.d.ts.map +1 -1
  14. package/lib/common/ServeJsonManager.d.ts +2 -2
  15. package/lib/common/ServeJsonManager.d.ts.map +1 -1
  16. package/lib/common/TeamsManifestJsonManager.d.ts +1 -1
  17. package/lib/common/TeamsManifestJsonManager.d.ts.map +1 -1
  18. package/lib/common/YeomanConfiguration.d.ts +1 -1
  19. package/lib/common/YeomanConfiguration.d.ts.map +1 -1
  20. package/lib/common/YeomanConfiguration.js +1 -1
  21. package/lib/common/bundles-versions.json +1 -1
  22. package/lib/common/dependencies.json +61 -62
  23. package/lib/common/utilities.d.ts +2 -2
  24. package/lib/common/utilities.d.ts.map +1 -1
  25. package/lib/common/utilities.js +4 -2
  26. package/lib/generators/adaptiveCardExtension/BaseAdaptiveCardExtensionGenerator.d.ts +18 -0
  27. package/lib/generators/adaptiveCardExtension/BaseAdaptiveCardExtensionGenerator.d.ts.map +1 -0
  28. package/lib/generators/adaptiveCardExtension/BaseAdaptiveCardExtensionGenerator.js +57 -0
  29. package/lib/generators/adaptiveCardExtension/index.d.ts +7 -13
  30. package/lib/generators/adaptiveCardExtension/index.d.ts.map +1 -1
  31. package/lib/generators/adaptiveCardExtension/index.js +29 -52
  32. package/lib/generators/app/index.d.ts +1 -1
  33. package/lib/generators/app/index.d.ts.map +1 -1
  34. package/lib/generators/app/index.js +4 -0
  35. package/lib/generators/applicationCustomizer/index.d.ts +3 -3
  36. package/lib/generators/applicationCustomizer/index.d.ts.map +1 -1
  37. package/lib/generators/applicationCustomizer/index.js +5 -5
  38. package/lib/generators/commandSet/index.d.ts +2 -2
  39. package/lib/generators/commandSet/index.d.ts.map +1 -1
  40. package/lib/generators/commandSet/index.js +5 -5
  41. package/lib/generators/commandSet/templates/none/{componentClassName}.ts +3 -3
  42. package/lib/generators/component/BaseComponentGenerator.d.ts +3 -3
  43. package/lib/generators/component/BaseComponentGenerator.d.ts.map +1 -1
  44. package/lib/generators/component/BaseComponentGenerator.js +4 -2
  45. package/lib/generators/component/index.d.ts +2 -2
  46. package/lib/generators/component/index.d.ts.map +1 -1
  47. package/lib/generators/component/index.js +2 -2
  48. package/lib/generators/extension/BaseExtensionGenerator.d.ts +1 -1
  49. package/lib/generators/extension/BaseExtensionGenerator.d.ts.map +1 -1
  50. package/lib/generators/extension/index.d.ts +4 -4
  51. package/lib/generators/extension/index.d.ts.map +1 -1
  52. package/lib/generators/extension/index.js +2 -2
  53. package/lib/generators/fieldCustomizer/index.d.ts +2 -2
  54. package/lib/generators/fieldCustomizer/index.d.ts.map +1 -1
  55. package/lib/generators/fieldCustomizer/index.js +5 -5
  56. package/lib/generators/fieldCustomizer/templates/minimal/{componentClassName}.ts +1 -1
  57. package/lib/generators/fieldCustomizer/templates/none/{componentClassName}.ts +1 -1
  58. package/lib/generators/fieldCustomizer/templates/react/{componentClassName}.ts +1 -1
  59. package/lib/generators/formCustomizer/index.d.ts +2 -2
  60. package/lib/generators/formCustomizer/index.d.ts.map +1 -1
  61. package/lib/generators/formCustomizer/index.js +6 -6
  62. package/lib/generators/genericAdaptiveCardExtension/index.d.ts +21 -0
  63. package/lib/generators/genericAdaptiveCardExtension/index.d.ts.map +1 -0
  64. package/lib/generators/genericAdaptiveCardExtension/index.js +111 -0
  65. package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/basicCardView/CardView.ts +9 -2
  66. package/lib/generators/genericAdaptiveCardExtension/templates/genericCardView/CardView.ts +51 -0
  67. package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/imageCardView/CardView.ts +9 -2
  68. package/lib/generators/genericAdaptiveCardExtension/templates/manifestTemplate/componentsTemplate/{componentClassName}.manifest.json +27 -0
  69. package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/none/quickView/QuickView.ts +7 -4
  70. package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/none/{componentClassName}.ts +3 -1
  71. package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/primaryTextCardView/CardView.ts +9 -2
  72. package/lib/generators/library/index.d.ts +2 -2
  73. package/lib/generators/library/index.d.ts.map +1 -1
  74. package/lib/generators/library/index.js +5 -5
  75. package/lib/generators/searchAdaptiveCardExtension/index.d.ts +19 -0
  76. package/lib/generators/searchAdaptiveCardExtension/index.d.ts.map +1 -0
  77. package/lib/generators/searchAdaptiveCardExtension/index.js +83 -0
  78. package/lib/generators/searchAdaptiveCardExtension/templates/base/assets/MicrosoftLogo.png +0 -0
  79. package/lib/generators/searchAdaptiveCardExtension/templates/base/loc/en-us.js +12 -0
  80. package/lib/generators/searchAdaptiveCardExtension/templates/base/loc/mystring.d.ts +15 -0
  81. package/lib/generators/searchAdaptiveCardExtension/templates/none/cardView/CardView.ts +64 -0
  82. package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/ItemQuickView.ts +28 -0
  83. package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/SearchResultsQuickView.ts +30 -0
  84. package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/template/ItemQuickViewTemplate.json +28 -0
  85. package/lib/generators/searchAdaptiveCardExtension/templates/none/quickView/template/SearchResultsQuickViewTemplate.json +27 -0
  86. package/lib/generators/searchAdaptiveCardExtension/templates/none/{componentClassName}.manifest.json +27 -0
  87. package/lib/generators/searchAdaptiveCardExtension/templates/none/{componentClassName}.ts +83 -0
  88. package/lib/generators/searchAdaptiveCardExtension/templates/none/{componentName}PropertyPane.ts +23 -0
  89. package/lib/generators/searchQueryModifier/index.d.ts +2 -2
  90. package/lib/generators/searchQueryModifier/index.d.ts.map +1 -1
  91. package/lib/generators/searchQueryModifier/index.js +5 -5
  92. package/lib/generators/solution/index.d.ts +1 -1
  93. package/lib/generators/solution/index.d.ts.map +1 -1
  94. package/lib/generators/solution/index.js +8 -6
  95. package/lib/generators/webpart/index.d.ts +2 -2
  96. package/lib/generators/webpart/index.d.ts.map +1 -1
  97. package/lib/generators/webpart/index.js +5 -5
  98. package/lib/generators/webpart/templates/none/{componentClassName}.ts +2 -2
  99. package/lib/generators/webpart/templates/react/components/{componentName}.tsx +1 -1
  100. package/lib/generators/webpart/templates/react/{componentClassName}.ts +1 -1
  101. package/package.json +6 -5
  102. /package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/base/assets/MicrosoftLogo.png +0 -0
  103. /package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/base/loc/en-us.js +0 -0
  104. /package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/base/loc/mystring.d.ts +0 -0
  105. /package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/manifestTemplate/baseTemplate/{componentClassName}.manifest.json +0 -0
  106. /package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/manifestTemplate/imageTemplate/{componentClassName}.manifest.json +0 -0
  107. /package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/none/quickView/template/QuickViewTemplate.json +0 -0
  108. /package/lib/generators/{adaptiveCardExtension → genericAdaptiveCardExtension}/templates/none/{componentName}PropertyPane.ts +0 -0
@@ -1,6 +1,6 @@
1
1
  import yeoman from 'yeoman-generator';
2
- import { Editor } from 'mem-fs-editor';
3
- import { IPackageJson } from '@rushstack/node-core-library';
2
+ import type { Editor } from 'mem-fs-editor';
3
+ import { type IPackageJson } from '@rushstack/node-core-library';
4
4
  import { PackageJsonManager } from './PackageJsonManager';
5
5
  import { ConfigJsonManager } from './ConfigJsonManager';
6
6
  import { ServeJsonManager } from './ServeJsonManager';
@@ -40,7 +40,7 @@ export declare abstract class BaseGenerator<IOptions extends IBaseOptions, ICont
40
40
  abstract configuring(): Promise<void> | void;
41
41
  copyTemplate: Editor['copy'];
42
42
  /** Where you write the generator specific files (routes, controllers, etc) */
43
- writing(shouldCopy?: boolean): Promise<void> | void;
43
+ writing(shouldCopy?: boolean): void;
44
44
  /** Where installation are run (npm, bower) */
45
45
  abstract install(): Promise<void> | void;
46
46
  /** Called last, cleanup, say good bye, etc */
@@ -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;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"}
1
+ {"version":3,"file":"BaseGenerator.d.ts","sourceRoot":"","sources":["../../src/common/BaseGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,8BAA8B,CAAC;AAG3E,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,IAAI;IAkBhD,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"}
@@ -61,11 +61,11 @@ class BaseGenerator extends yeoman_generator_1.default {
61
61
  if (!errorMessage.trim()) {
62
62
  errorMessage = 'The operation was unsuccessful';
63
63
  }
64
+ // eslint-disable-next-line no-console
64
65
  console.error('\n' + colors_1.default.red('Error: ' + errorMessage));
65
66
  process.exitCode = 1;
66
67
  });
67
- // tslint:disable:no-string-literal
68
- YeomanConfiguration_1.YeomanConfiguration.setStore(this['config']);
68
+ YeomanConfiguration_1.YeomanConfiguration.setStore(this.config);
69
69
  BaseGenerator._checkForUpdates();
70
70
  this.option('skip-install', {
71
71
  type: Boolean,
@@ -201,12 +201,12 @@ class BaseGenerator extends yeoman_generator_1.default {
201
201
  const args = ['install'];
202
202
  // Follow the same pattern as runInstall(), which uses "once" to ensure only
203
203
  // one install for both the solution and the component generators.
204
- // tslint:disable-next-line:no-any
204
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
205
205
  this.env.runLoop.add('install', (done) => {
206
- // tslint:disable-line:no-any
207
206
  this.emit(installer + 'Install');
208
207
  this.spawnCommand(installer, args)
209
208
  .on('error', (err) => {
209
+ // eslint-disable-next-line no-console
210
210
  console.log(colors_1.default.red('Could not finish installation. \n') +
211
211
  'Please install ' +
212
212
  installer +
@@ -1,10 +1,10 @@
1
- import { Editor } from 'mem-fs-editor';
2
- import { IConfigBundle, IConfigJson } from '@microsoft/spfx-heft-plugins';
3
- import { IV1ConfigJson } from '@microsoft/spfx-heft-plugins/lib/spfxConfig/interfaces/config-v1';
1
+ import type { Editor } from 'mem-fs-editor';
2
+ import type { IConfigBundle, IConfigJson } from '@microsoft/spfx-heft-plugins';
3
+ import type { IV1ConfigJson } from '@microsoft/spfx-heft-plugins/lib/spfxConfig/interfaces/config-v1';
4
4
  import { JsonManager } from './JsonManager';
5
5
  export declare class ConfigJsonManager extends JsonManager<IConfigJson | IV1ConfigJson> {
6
- configJsonIsV1: boolean;
7
6
  private static _instance?;
7
+ readonly configJsonIsV1: boolean;
8
8
  static load(filepath: string, fs: Editor): void;
9
9
  static reset(): void;
10
10
  static get instance(): ConfigJsonManager;
@@ -1 +1 @@
1
- {"version":3,"file":"ConfigJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/ConfigJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAEL,aAAa,EACd,MAAM,kEAAkE,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,iBAAkB,SAAQ,WAAW,CAAC,WAAW,GAAG,aAAa,CAAC;IA2FpE,cAAc,EAAE,OAAO;IA1FhC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAoB;WAE/B,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAmBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,iBAAiB,CAE9C;IAEM,QAAQ,CAAC,WAAW,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAmCxD,oBAAoB,CAAC,oBAAoB,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAsB/F,OAAO;IASP,OAAO,CAAC,wBAAwB;CAWjC"}
1
+ {"version":3,"file":"ConfigJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/ConfigJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE/E,OAAO,KAAK,EAEV,aAAa,EACd,MAAM,kEAAkE,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,iBAAkB,SAAQ,WAAW,CAAC,WAAW,GAAG,aAAa,CAAC;IAC7E,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAoB;IAC7C,SAAgB,cAAc,EAAE,OAAO,CAAC;WAE1B,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAmBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,iBAAiB,CAE9C;IAEM,QAAQ,CAAC,WAAW,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAiCxD,oBAAoB,CAAC,oBAAoB,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAsB/F,OAAO;IAUP,OAAO,CAAC,wBAAwB;CAWjC"}
@@ -48,9 +48,7 @@ class ConfigJsonManager extends JsonManager_1.JsonManager {
48
48
  if (existingConfig.bundles[name]) {
49
49
  throw new Error('You cannot have two config bundles with the same output name.');
50
50
  }
51
- for (const configBundleName in existingConfig.bundles) {
52
- // tslint:disable-line:forin
53
- const configBundle = existingConfig.bundles[configBundleName];
51
+ for (const configBundle of Object.values(existingConfig.bundles)) {
54
52
  for (const component of configBundle.components) {
55
53
  for (const newComponent of bundleEntry.components) {
56
54
  if (component.manifest === newComponent.manifest) {
@@ -1,4 +1,4 @@
1
- import { Editor } from 'mem-fs-editor';
1
+ import type { Editor } from 'mem-fs-editor';
2
2
  export declare abstract class JsonManager<T> {
3
3
  protected _filepath: string;
4
4
  protected _fs: Editor;
@@ -7,6 +7,6 @@ export declare abstract class JsonManager<T> {
7
7
  merge(newData: Partial<T>): T;
8
8
  get data(): T;
9
9
  save(): void;
10
- protected constructor(_filepath: string, _fs: Editor, _data: T);
10
+ protected constructor(filepath: string, fs: Editor, data: T);
11
11
  }
12
12
  //# sourceMappingURL=JsonManager.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"JsonManager.d.ts","sourceRoot":"","sources":["../../src/common/JsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,8BAAsB,WAAW,CAAC,CAAC;IAsBX,SAAS,CAAC,SAAS,EAAE,MAAM;IAAE,SAAS,CAAC,GAAG,EAAE,MAAM;IAAE,SAAS,CAAC,KAAK,EAAE,CAAC;IArBrF,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC;IAQlB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAKpC,IAAW,IAAI,IAAI,CAAC,CAEnB;IAEM,IAAI,IAAI,IAAI;IAInB,SAAS,aAAuB,SAAS,EAAE,MAAM,EAAY,GAAG,EAAE,MAAM,EAAY,KAAK,EAAE,CAAC;CAC7F"}
1
+ {"version":3,"file":"JsonManager.d.ts","sourceRoot":"","sources":["../../src/common/JsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAG5C,8BAAsB,WAAW,CAAC,CAAC;IACjC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;IAEZ,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC;IAQlB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAKpC,IAAW,IAAI,IAAI,CAAC,CAEnB;IAEM,IAAI,IAAI,IAAI;IAInB,SAAS,aAAa,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;CAK5D"}
@@ -26,10 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.JsonManager = void 0;
27
27
  const _ = __importStar(require("lodash"));
28
28
  class JsonManager {
29
- constructor(_filepath, _fs, _data) {
30
- this._filepath = _filepath;
31
- this._fs = _fs;
32
- this._data = _data;
29
+ constructor(filepath, fs, data) {
30
+ this._filepath = filepath;
31
+ this._fs = fs;
32
+ this._data = data;
33
33
  }
34
34
  set(newData) {
35
35
  if (!newData) {
@@ -1,5 +1,5 @@
1
- import { IPackageJson } from '@rushstack/node-core-library';
2
- import { Editor } from 'mem-fs-editor';
1
+ import type { IPackageJson } from '@rushstack/node-core-library';
2
+ import type { Editor } from 'mem-fs-editor';
3
3
  import { JsonManager } from './JsonManager';
4
4
  export interface IExtendedPackageJson extends IPackageJson {
5
5
  resolutions?: {
@@ -1 +1 @@
1
- {"version":3,"file":"PackageJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/PackageJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IAGxD,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACzC;AAED,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,oBAAoB,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAiC;WAE3C,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAaxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,kBAAkB,CAE/C;IAEM,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IASxD,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAO3D,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAMnE"}
1
+ {"version":3,"file":"PackageJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/PackageJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IAGxD,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACzC;AAED,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,oBAAoB,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAiC;WAE3C,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAaxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,kBAAkB,CAE/C;IAEM,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IASxD,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAO3D,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAMnE"}
@@ -1,6 +1,6 @@
1
- import { IPackageSolution } from '@microsoft/spfx-heft-plugins';
2
- import { Editor } from 'mem-fs-editor';
3
- import { ISolutionContext } from '../generators/solution';
1
+ import type { IPackageSolution } from '@microsoft/spfx-heft-plugins';
2
+ import type { Editor } from 'mem-fs-editor';
3
+ import type { ISolutionContext } from '../generators/solution';
4
4
  import { JsonManager } from './JsonManager';
5
5
  export declare class PackageSolutionJsonManager extends JsonManager<Partial<IPackageSolution>> {
6
6
  private static _instance?;
@@ -1 +1 @@
1
- {"version":3,"file":"PackageSolutionJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/PackageSolutionJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAIjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,0BAA2B,SAAQ,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACpF,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAA6B;WAExC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAqBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,0BAA0B,CAEvD;IAEM,wBAAwB,IAAI,OAAO;IAQnC,aAAa,CAAC,eAAe,EAAE,gBAAgB,GAAG,IAAI;IA4CtD,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,yBAAyB,EAAE,OAAO,GAAG,IAAI;IAUhF,UAAU,CACf,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,yBAAyB,GAAE,OAAe,GACzC,IAAI;IAkDP;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAW9B"}
1
+ {"version":3,"file":"PackageSolutionJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/PackageSolutionJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAIjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,0BAA2B,SAAQ,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACpF,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAA6B;WAExC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAqBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,0BAA0B,CAEvD;IAEM,wBAAwB,IAAI,OAAO;IAQnC,aAAa,CAAC,eAAe,EAAE,gBAAgB,GAAG,IAAI;IA4CtD,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,yBAAyB,EAAE,OAAO,GAAG,IAAI;IAUhF,UAAU,CACf,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,yBAAyB,GAAE,OAAe,GACzC,IAAI;IAkDP;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAW9B"}
@@ -1,5 +1,5 @@
1
- import { Editor } from 'mem-fs-editor';
2
- import { _ISpfxServeSessionConfiguration as ISpfxServeSessionConfiguration, _ISpfxServe as ISpfxServe } from '@microsoft/spfx-heft-plugins';
1
+ import type { Editor } from 'mem-fs-editor';
2
+ import type { _ISpfxServeSessionConfiguration as ISpfxServeSessionConfiguration, _ISpfxServe as ISpfxServe } from '@microsoft/spfx-heft-plugins';
3
3
  import { JsonManager } from './JsonManager';
4
4
  export declare class ServeJsonManager extends JsonManager<ISpfxServe> {
5
5
  private static _instance?;
@@ -1 +1 @@
1
- {"version":3,"file":"ServeJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/ServeJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EACL,+BAA+B,IAAI,8BAA8B,EACjE,WAAW,IAAI,UAAU,EAC1B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,UAAU,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAmB;WAE9B,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAwBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,gBAAgB,CAE7C;IAEM,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,8BAA8B,GAAG,IAAI;IAWnF,gBAAgB,IAAI,IAAI;CAMhC"}
1
+ {"version":3,"file":"ServeJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/ServeJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EACV,+BAA+B,IAAI,8BAA8B,EACjE,WAAW,IAAI,UAAU,EAC1B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,UAAU,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAmB;WAE9B,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAwBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,gBAAgB,CAE7C;IAEM,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,8BAA8B,GAAG,IAAI;IAWnF,gBAAgB,IAAI,IAAI;CAMhC"}
@@ -1,4 +1,4 @@
1
- import { Editor } from 'mem-fs-editor';
1
+ import type { Editor } from 'mem-fs-editor';
2
2
  import { JsonManager } from './JsonManager';
3
3
  export interface ITeamsManifestData {
4
4
  componentId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"TeamsManifestJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/TeamsManifestJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,WAAW,EAAE;QACX,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;IACtC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kBAAkB,EAAE;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH;AAED,qBAAa,wBAAyB,SAAQ,WAAW,CAAC,cAAc,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAuC;WAEjD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAqBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,wBAAwB,GAAG,SAAS,CAEjE;IAEM,aAAa,CAAC,iBAAiB,EAAE,kBAAkB,GAAG,IAAI;CAuBlE"}
1
+ {"version":3,"file":"TeamsManifestJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/TeamsManifestJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAChC,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,OAAO,CAAC;IAChC,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,WAAW,EAAE;QACX,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;IACtC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kBAAkB,EAAE;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH;AAED,qBAAa,wBAAyB,SAAQ,WAAW,CAAC,cAAc,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAuC;WAEjD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;WAqBxC,KAAK,IAAI,IAAI;IAI3B,WAAkB,QAAQ,IAAI,wBAAwB,GAAG,SAAS,CAEjE;IAEM,aAAa,CAAC,iBAAiB,EAAE,kBAAkB,GAAG,IAAI;CAuBlE"}
@@ -1,5 +1,5 @@
1
1
  export interface IYeomanConfigurationData {
2
- set: (key: string, params: Object) => void;
2
+ set: (key: string, params: unknown) => void;
3
3
  get: <T>(key: string) => T;
4
4
  }
5
5
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"YeomanConfiguration.d.ts","sourceRoot":"","sources":["../../src/common/YeomanConfiguration.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;CAC5B;AAaD;;;GAGG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,CAA2B;WAElC,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,GAAG,IAAI;IAI3E,WAAkB,WAAW,IAAI,MAAM,CAEtC;IACD,WAAkB,WAAW,CAAC,KAAK,EAAE,MAAM,EAE1C;IAED,WAAkB,OAAO,IAAI,MAAM,CAElC;IACD,WAAkB,OAAO,CAAC,KAAK,EAAE,MAAM,EAEtC;IAED,WAAkB,SAAS,IAAI,MAAM,CAEpC;IACD,WAAkB,SAAS,CAAC,KAAK,EAAE,MAAM,EAExC;IAED,WAAkB,WAAW,IAAI,KAAK,CAErC;IAED,WAAkB,WAAW,CAAC,KAAK,EAAE,KAAK,EAEzC;IAED,WAAkB,cAAc,IAAI,KAAK,GAAG,MAAM,GAAG,MAAM,CAE1D;IAED,WAAkB,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAE9D;IAED,WAAkB,OAAO,IAAI,OAAO,CAEnC;IAED,WAAkB,OAAO,CAAC,KAAK,EAAE,OAAO,EAEvC;CACF"}
1
+ {"version":3,"file":"YeomanConfiguration.d.ts","sourceRoot":"","sources":["../../src/common/YeomanConfiguration.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5C,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,CAAC;CAC5B;AAaD;;;GAGG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,CAA2B;WAElC,QAAQ,CAAC,mBAAmB,EAAE,wBAAwB,GAAG,IAAI;IAI3E,WAAkB,WAAW,IAAI,MAAM,CAEtC;IACD,WAAkB,WAAW,CAAC,KAAK,EAAE,MAAM,EAE1C;IAED,WAAkB,OAAO,IAAI,MAAM,CAElC;IACD,WAAkB,OAAO,CAAC,KAAK,EAAE,MAAM,EAEtC;IAED,WAAkB,SAAS,IAAI,MAAM,CAEpC;IACD,WAAkB,SAAS,CAAC,KAAK,EAAE,MAAM,EAExC;IAED,WAAkB,WAAW,IAAI,KAAK,CAErC;IAED,WAAkB,WAAW,CAAC,KAAK,EAAE,KAAK,EAEzC;IAED,WAAkB,cAAc,IAAI,KAAK,GAAG,MAAM,GAAG,MAAM,CAE1D;IAED,WAAkB,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,EAE9D;IAED,WAAkB,OAAO,IAAI,OAAO,CAEnC;IAED,WAAkB,OAAO,CAAC,KAAK,EAAE,OAAO,EAEvC;CACF"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.YeomanConfiguration = void 0;
4
- // tslint:disable-next-line:typedef
4
+ // eslint-disable-next-line @typescript-eslint/typedef
5
5
  const _strings = {
6
6
  libraryName: 'libraryName',
7
7
  framework: 'framework',
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "@microsoft/microsoft-graph-client": "3.0.2",
3
- "@microsoft/teams-js": "2.9.1"
3
+ "@microsoft/teams-js": "2.12.0"
4
4
  }
@@ -2,30 +2,30 @@
2
2
  "adaptiveCardExtension": {
3
3
  "standard": {
4
4
  "dependencies": {
5
- "@microsoft/sp-core-library": "1.17.4",
6
- "@microsoft/sp-property-pane": "1.17.4",
7
- "@microsoft/sp-adaptive-card-extension-base": "1.17.4"
5
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
6
+ "@microsoft/sp-property-pane": "1.18.0-beta.2",
7
+ "@microsoft/sp-adaptive-card-extension-base": "1.18.0-beta.2"
8
8
  },
9
9
  "devDependencies": {
10
- "@microsoft/sp-module-interfaces": "1.17.4"
10
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
11
11
  }
12
12
  },
13
13
  "plusBeta": {
14
14
  "dependencies": {
15
- "@microsoft/sp-core-library": "1.17.4",
16
- "@microsoft/sp-property-pane": "1.17.4",
17
- "@microsoft/sp-adaptive-card-extension-base": "1.17.4"
15
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
16
+ "@microsoft/sp-property-pane": "1.18.0-beta.2",
17
+ "@microsoft/sp-adaptive-card-extension-base": "1.18.0-beta.2"
18
18
  },
19
19
  "devDependencies": {
20
- "@microsoft/sp-module-interfaces": "1.17.4"
20
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
21
21
  }
22
22
  }
23
23
  },
24
24
  "applicationCustomizer": {
25
25
  "standard": {
26
26
  "dependencies": {
27
- "@microsoft/sp-dialog": "1.17.4",
28
- "@microsoft/sp-application-base": "1.17.4"
27
+ "@microsoft/sp-dialog": "1.18.0-beta.2",
28
+ "@microsoft/sp-application-base": "1.18.0-beta.2"
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.4",
37
- "@microsoft/sp-application-base": "1.17.4"
36
+ "@microsoft/sp-dialog": "1.18.0-beta.2",
37
+ "@microsoft/sp-application-base": "1.18.0-beta.2"
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.4",
46
- "@microsoft/sp-dialog": "1.17.4"
45
+ "@microsoft/sp-listview-extensibility": "1.18.0-beta.2",
46
+ "@microsoft/sp-dialog": "1.18.0-beta.2"
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.4",
55
- "@microsoft/sp-dialog": "1.17.4"
54
+ "@microsoft/sp-listview-extensibility": "1.18.0-beta.2",
55
+ "@microsoft/sp-dialog": "1.18.0-beta.2"
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.4",
64
- "@microsoft/decorators": "1.17.4"
63
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
64
+ "@microsoft/decorators": "1.18.0-beta.2"
65
65
  },
66
66
  "devDependencies": {
67
- "@microsoft/sp-module-interfaces": "1.17.4"
67
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
68
68
  }
69
69
  },
70
70
  "plusBeta": {
71
71
  "dependencies": {
72
- "@microsoft/sp-core-library": "1.17.4",
73
- "@microsoft/decorators": "1.17.4"
72
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
73
+ "@microsoft/decorators": "1.18.0-beta.2"
74
74
  },
75
75
  "devDependencies": {
76
- "@microsoft/sp-module-interfaces": "1.17.4"
76
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
77
77
  }
78
78
  }
79
79
  },
80
80
  "fieldCustomizer": {
81
81
  "standard": {
82
82
  "dependencies": {
83
- "@microsoft/sp-listview-extensibility": "1.17.4"
83
+ "@microsoft/sp-listview-extensibility": "1.18.0-beta.2"
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.4"
91
+ "@microsoft/sp-listview-extensibility": "1.18.0-beta.2"
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.4"
100
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
101
101
  }
102
102
  },
103
103
  "plusBeta": {
104
104
  "dependencies": {},
105
105
  "devDependencies": {
106
- "@microsoft/sp-module-interfaces": "1.17.4"
106
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
107
107
  }
108
108
  }
109
109
  },
@@ -112,8 +112,7 @@
112
112
  "dependencies": {
113
113
  "react": "17.0.1",
114
114
  "react-dom": "17.0.1",
115
- "office-ui-fabric-react": "^7.199.1",
116
- "@fluentui/react": "^7.199.1"
115
+ "@fluentui/react": "^8.106.4"
117
116
  },
118
117
  "devDependencies": {
119
118
  "@types/react": "17.0.45",
@@ -126,7 +125,7 @@
126
125
  "searchQueryModifier": {
127
126
  "standard": {
128
127
  "dependencies": {
129
- "@microsoft/sp-search-extensibility": "1.17.4"
128
+ "@microsoft/sp-search-extensibility": "1.18.0-beta.2"
130
129
  }
131
130
  },
132
131
  "plusBeta": null
@@ -134,7 +133,7 @@
134
133
  "searchQueryModifierPlusBeta": {
135
134
  "standard": {
136
135
  "dependencies": {
137
- "@microsoft/sp-search-extensibility": "1.17.4"
136
+ "@microsoft/sp-search-extensibility": "1.18.0-beta.2"
138
137
  }
139
138
  },
140
139
  "plusBeta": null
@@ -142,29 +141,29 @@
142
141
  "webpart": {
143
142
  "standard": {
144
143
  "dependencies": {
145
- "@microsoft/sp-core-library": "1.17.4",
146
- "@microsoft/sp-component-base": "1.17.4",
147
- "@microsoft/sp-property-pane": "1.17.4",
148
- "@microsoft/sp-webpart-base": "1.17.4",
149
- "@microsoft/sp-lodash-subset": "1.17.4",
150
- "@microsoft/sp-office-ui-fabric-core": "1.17.4"
144
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
145
+ "@microsoft/sp-component-base": "1.18.0-beta.2",
146
+ "@microsoft/sp-property-pane": "1.18.0-beta.2",
147
+ "@microsoft/sp-webpart-base": "1.18.0-beta.2",
148
+ "@microsoft/sp-lodash-subset": "1.18.0-beta.2",
149
+ "@microsoft/sp-office-ui-fabric-core": "1.18.0-beta.2"
151
150
  },
152
151
  "devDependencies": {
153
- "@microsoft/sp-module-interfaces": "1.17.4",
154
- "@fluentui/react": "^7.199.1"
152
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2",
153
+ "@fluentui/react": "^8.106.4"
155
154
  }
156
155
  },
157
156
  "plusBeta": {
158
157
  "dependencies": {
159
- "@microsoft/sp-core-library": "1.17.4",
160
- "@microsoft/sp-component-base": "1.17.4",
161
- "@microsoft/sp-property-pane": "1.17.4",
162
- "@microsoft/sp-webpart-base": "1.17.4",
163
- "@microsoft/sp-lodash-subset": "1.17.4",
164
- "@microsoft/sp-office-ui-fabric-core": "1.17.4"
158
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
159
+ "@microsoft/sp-component-base": "1.18.0-beta.2",
160
+ "@microsoft/sp-property-pane": "1.18.0-beta.2",
161
+ "@microsoft/sp-webpart-base": "1.18.0-beta.2",
162
+ "@microsoft/sp-lodash-subset": "1.18.0-beta.2",
163
+ "@microsoft/sp-office-ui-fabric-core": "1.18.0-beta.2"
165
164
  },
166
165
  "devDependencies": {
167
- "@microsoft/sp-module-interfaces": "1.17.4"
166
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
168
167
  }
169
168
  }
170
169
  },
@@ -176,10 +175,10 @@
176
175
  "devDependencies": {
177
176
  "@microsoft/rush-stack-compiler-4.5": "0.5.0",
178
177
  "@rushstack/eslint-config": "2.5.1",
179
- "@microsoft/eslint-plugin-spfx": "1.17.4",
180
- "@microsoft/eslint-config-spfx": "1.17.4",
181
- "@microsoft/spfx-web-build-rig": "1.17.4",
182
- "@rushstack/heft": "0.49.7",
178
+ "@microsoft/eslint-plugin-spfx": "1.18.0-beta.2",
179
+ "@microsoft/eslint-config-spfx": "1.18.0-beta.2",
180
+ "@microsoft/spfx-web-build-rig": "1.18.0-beta.2",
181
+ "@rushstack/heft": "0.56.0",
183
182
  "@types/webpack-env": "~1.15.2",
184
183
  "eslint": "8.7.0"
185
184
  }
@@ -194,9 +193,9 @@
194
193
  "devDependencies": {
195
194
  "@microsoft/rush-stack-compiler-4.5": "0.5.0",
196
195
  "@rushstack/eslint-config": "2.5.1",
197
- "@microsoft/eslint-plugin-spfx": "1.17.4",
198
- "@microsoft/eslint-config-spfx": "1.17.4",
199
- "@microsoft/sp-build-web": "1.17.4",
196
+ "@microsoft/eslint-plugin-spfx": "1.18.0-beta.2",
197
+ "@microsoft/eslint-config-spfx": "1.18.0-beta.2",
198
+ "@microsoft/sp-build-web": "1.18.0-beta.2",
200
199
  "@types/webpack-env": "~1.15.2",
201
200
  "ajv": "^6.12.5",
202
201
  "eslint": "8.7.0",
@@ -212,24 +211,24 @@
212
211
  "formCustomizer": {
213
212
  "standard": {
214
213
  "dependencies": {
215
- "@microsoft/sp-core-library": "1.17.4",
216
- "@microsoft/sp-listview-extensibility": "1.17.4",
217
- "@microsoft/sp-lodash-subset": "1.17.4",
218
- "@microsoft/sp-office-ui-fabric-core": "1.17.4"
214
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
215
+ "@microsoft/sp-listview-extensibility": "1.18.0-beta.2",
216
+ "@microsoft/sp-lodash-subset": "1.18.0-beta.2",
217
+ "@microsoft/sp-office-ui-fabric-core": "1.18.0-beta.2"
219
218
  },
220
219
  "devDependencies": {
221
- "@microsoft/sp-module-interfaces": "1.17.4"
220
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
222
221
  }
223
222
  },
224
223
  "plusBeta": {
225
224
  "dependencies": {
226
- "@microsoft/sp-core-library": "1.17.4",
227
- "@microsoft/sp-listview-extensibility": "1.17.4",
228
- "@microsoft/sp-lodash-subset": "1.17.4",
229
- "@microsoft/sp-office-ui-fabric-core": "1.17.4"
225
+ "@microsoft/sp-core-library": "1.18.0-beta.2",
226
+ "@microsoft/sp-listview-extensibility": "1.18.0-beta.2",
227
+ "@microsoft/sp-lodash-subset": "1.18.0-beta.2",
228
+ "@microsoft/sp-office-ui-fabric-core": "1.18.0-beta.2"
230
229
  },
231
230
  "devDependencies": {
232
- "@microsoft/sp-module-interfaces": "1.17.4"
231
+ "@microsoft/sp-module-interfaces": "1.18.0-beta.2"
233
232
  }
234
233
  }
235
234
  }
@@ -1,7 +1,7 @@
1
1
  import yeoman = require('yeoman-generator');
2
- import { BaseGenerator, IBaseOptions } from './BaseGenerator';
2
+ import type { BaseGenerator, IBaseOptions } from './BaseGenerator';
3
3
  export declare function titleCase(str: string): string;
4
- export declare function untokenize(str: string, props: Object): string;
4
+ export declare function untokenize(str: string, props: object): string;
5
5
  export declare function filesIn(...args: string[]): string[];
6
6
  export declare function checkSolutionFolder(generator: yeoman, solutionName: string): Promise<string>;
7
7
  export declare function generateGuid(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../src/common/utilities.ts"],"names":[],"mappings":"AAMA,OAAO,MAAM,GAAG,QAAQ,kBAAkB,CAAC,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE9D,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAgB7D;AAED,wBAAgB,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAuBnD;AAED,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBlG;AAED,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAGD,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CAQrG"}
1
+ {"version":3,"file":"utilities.d.ts","sourceRoot":"","sources":["../../src/common/utilities.ts"],"names":[],"mappings":"AAMA,OAAO,MAAM,GAAG,QAAQ,kBAAkB,CAAC,CAAC;AAE5C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEnE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG7C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAiB7D;AAED,wBAAgB,OAAO,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAuBnD;AAED,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBlG;AAED,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAGD,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,IAAI,CASrG"}
@@ -41,6 +41,7 @@ exports.titleCase = titleCase;
41
41
  function untokenize(str, props) {
42
42
  for (const [prop, propValue] of Object.entries(props)) {
43
43
  if (typeof propValue === 'string') {
44
+ // eslint-disable-next-line @rushstack/security/no-unsafe-regexp
44
45
  str = str.replace(new RegExp(`{${prop}}`, 'g'), propValue);
45
46
  }
46
47
  }
@@ -100,11 +101,12 @@ function generateGuid() {
100
101
  return uuid.v4();
101
102
  }
102
103
  exports.generateGuid = generateGuid;
103
- // tslint:disable-next-line
104
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
104
105
  function compose(generator, base, options) {
105
106
  base.composeWith(node_core_library_1.Import.resolveModule({
106
107
  baseFolderPath: __dirname,
107
- modulePath: `@microsoft/generator-sharepoint/lib/generators/${generator}`
108
+ modulePath: `@microsoft/generator-sharepoint/lib/generators/${generator}`,
109
+ allowSelfReference: true
108
110
  }), options);
109
111
  }
110
112
  exports.compose = compose;
@@ -0,0 +1,18 @@
1
+ import type { AvailableTemplates, BaseGenerator, IBaseOptions } from '../../common/BaseGenerator';
2
+ import * as BaseComponent from '../component/BaseComponentGenerator';
3
+ export declare type IACETemplateType = 'Image' | 'PrimaryText' | 'Basic' | 'Generic' | 'Search';
4
+ export interface IBaseACEOptions extends BaseComponent.IBaseComponentOptions {
5
+ }
6
+ export interface IBaseACEContext extends BaseComponent.IBaseComponentContext {
7
+ }
8
+ export declare function defineOptions<TOptions extends IBaseOptions, TContext extends object>(generator: BaseGenerator<TOptions, TContext>, type?: string): void;
9
+ export declare abstract class BaseACEGenerator<IOptions extends IBaseACEOptions, IContext extends IBaseACEContext> extends BaseComponent.BaseComponentGenerator<IOptions, IContext> {
10
+ protected readonly friendlyName: string;
11
+ protected readonly codeName: string;
12
+ protected readonly allowedTemplates: AvailableTemplates[];
13
+ protected readonly folderName: string;
14
+ configuring(): void;
15
+ writing(shouldCopy?: boolean): void;
16
+ install(): void;
17
+ }
18
+ //# sourceMappingURL=BaseAdaptiveCardExtensionGenerator.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"BaseAdaptiveCardExtensionGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/adaptiveCardExtension/BaseAdaptiveCardExtensionGenerator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAClG,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAGrE,oBAAY,gBAAgB,GAAG,OAAO,GAAG,aAAa,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,CAAC;AAExF,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAC/E,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE/E,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,SAAS,MAAM,EAClF,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC5C,IAAI,GAAE,MAAgC,GACrC,IAAI,CAEN;AAED,8BAAsB,gBAAgB,CACpC,QAAQ,SAAS,eAAe,EAChC,QAAQ,SAAS,eAAe,CAChC,SAAQ,aAAa,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAChE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA6B;IACpE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC/D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,WAAW,IAAI,IAAI;IAanB,OAAO,CAAC,UAAU,GAAE,OAAc,GAAG,IAAI;IAIzC,OAAO,IAAI,IAAI;CAGvB"}