@microsoft/generator-sharepoint 1.13.0-beta.24 → 1.13.0-rc.1

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 (27) hide show
  1. package/lib/common/dependency/adaptiveCardExtension/firstParty.json +6 -6
  2. package/lib/common/dependency/adaptiveCardExtension/firstPartyPlusBeta.json +6 -6
  3. package/lib/common/dependency/applicationCustomizer.json +2 -2
  4. package/lib/common/dependency/applicationCustomizerPlusBeta.json +2 -2
  5. package/lib/common/dependency/commandSet.json +2 -2
  6. package/lib/common/dependency/commandSetPlusBeta.json +2 -2
  7. package/lib/common/dependency/extension/firstParty.json +5 -5
  8. package/lib/common/dependency/extension/firstPartyPlusBeta.json +5 -5
  9. package/lib/common/dependency/fieldCustomizer.json +1 -1
  10. package/lib/common/dependency/fieldCustomizerPlusBeta.json +1 -1
  11. package/lib/common/dependency/library/firstParty.json +3 -3
  12. package/lib/common/dependency/library/firstPartyPlusBeta.json +3 -3
  13. package/lib/common/dependency/searchQueryModifier.json +1 -1
  14. package/lib/common/dependency/searchQueryModifierPlusBeta.json +1 -1
  15. package/lib/common/dependency/webpart/firstParty.json +8 -8
  16. package/lib/common/dependency/webpart/firstPartyPlusBeta.json +8 -8
  17. package/lib/generators/adaptiveCardExtension/index.d.ts +4 -0
  18. package/lib/generators/adaptiveCardExtension/index.d.ts.map +1 -1
  19. package/lib/generators/adaptiveCardExtension/index.js +19 -8
  20. package/lib/generators/adaptiveCardExtension/templates/imageCardView/CardView.ts +21 -2
  21. package/lib/generators/adaptiveCardExtension/templates/{base → manifestTemplate/baseTemplate}/{componentClassName}.manifest.json +0 -0
  22. package/lib/generators/adaptiveCardExtension/templates/manifestTemplate/imageTemplate/{componentClassName}.manifest.json +30 -0
  23. package/lib/generators/app/index.js +6 -0
  24. package/lib/generators/component/index.d.ts +2 -1
  25. package/lib/generators/component/index.d.ts.map +1 -1
  26. package/lib/generators/component/index.js +4 -6
  27. package/package.json +2 -2
package/lib/common/dependency/adaptiveCardExtension/firstParty.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.13.0-beta.24",
4
- "@microsoft/sp-property-pane": "1.13.0-beta.24",
5
- "@microsoft/sp-adaptive-card-extension-base": "1.13.0-beta.24"
3
+ "@microsoft/sp-core-library": "1.13.0-rc.1",
4
+ "@microsoft/sp-property-pane": "1.13.0-rc.1",
5
+ "@microsoft/sp-adaptive-card-extension-base": "1.13.0-rc.1"
6
6
  },
7
7
  "devDependencies": {
8
- "@microsoft/sp-build-web": "1.13.0-beta.24",
9
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
10
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
8
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
9
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
10
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
11
11
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
12
12
  }
13
13
  }
package/lib/common/dependency/adaptiveCardExtension/firstPartyPlusBeta.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.13.0-beta.24",
4
- "@microsoft/sp-property-pane": "1.13.0-beta.24",
5
- "@microsoft/sp-adaptive-card-extension-base": "1.13.0-beta.24"
3
+ "@microsoft/sp-core-library": "1.13.0-rc.1",
4
+ "@microsoft/sp-property-pane": "1.13.0-rc.1",
5
+ "@microsoft/sp-adaptive-card-extension-base": "1.13.0-rc.1"
6
6
  },
7
7
  "devDependencies": {
8
- "@microsoft/sp-build-web": "1.13.0-beta.24",
9
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
10
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
8
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
9
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
10
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
11
11
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
12
12
  }
13
13
  }
package/lib/common/dependency/applicationCustomizer.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-dialog": "1.13.0-beta.24",
4
- "@microsoft/sp-application-base": "1.13.0-beta.24"
3
+ "@microsoft/sp-dialog": "1.13.0-rc.1",
4
+ "@microsoft/sp-application-base": "1.13.0-rc.1"
5
5
  }
6
6
  }
package/lib/common/dependency/applicationCustomizerPlusBeta.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-dialog": "1.13.0-beta.24",
4
- "@microsoft/sp-application-base": "1.13.0-beta.24"
3
+ "@microsoft/sp-dialog": "1.13.0-rc.1",
4
+ "@microsoft/sp-application-base": "1.13.0-rc.1"
5
5
  }
6
6
  }
package/lib/common/dependency/commandSet.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.13.0-beta.24",
4
- "@microsoft/sp-dialog": "1.13.0-beta.24"
3
+ "@microsoft/sp-listview-extensibility": "1.13.0-rc.1",
4
+ "@microsoft/sp-dialog": "1.13.0-rc.1"
5
5
  }
6
6
  }
package/lib/common/dependency/commandSetPlusBeta.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.13.0-beta.24",
4
- "@microsoft/sp-dialog": "1.13.0-beta.24"
3
+ "@microsoft/sp-listview-extensibility": "1.13.0-rc.1",
4
+ "@microsoft/sp-dialog": "1.13.0-rc.1"
5
5
  }
6
6
  }
package/lib/common/dependency/extension/firstParty.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.13.0-beta.24",
4
- "@microsoft/decorators": "1.13.0-beta.24"
3
+ "@microsoft/sp-core-library": "1.13.0-rc.1",
4
+ "@microsoft/decorators": "1.13.0-rc.1"
5
5
  },
6
6
  "devDependencies": {
7
- "@microsoft/sp-build-web": "1.13.0-beta.24",
8
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
9
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
7
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
8
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
9
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
10
10
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
11
11
  }
12
12
  }
package/lib/common/dependency/extension/firstPartyPlusBeta.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.13.0-beta.24",
4
- "@microsoft/decorators": "1.13.0-beta.24"
3
+ "@microsoft/sp-core-library": "1.13.0-rc.1",
4
+ "@microsoft/decorators": "1.13.0-rc.1"
5
5
  },
6
6
  "devDependencies": {
7
- "@microsoft/sp-build-web": "1.13.0-beta.24",
8
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
9
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
7
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
8
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
9
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
10
10
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
11
11
  }
12
12
  }
package/lib/common/dependency/fieldCustomizer.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.13.0-beta.24"
3
+ "@microsoft/sp-listview-extensibility": "1.13.0-rc.1"
4
4
  }
5
5
  }
package/lib/common/dependency/fieldCustomizerPlusBeta.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.13.0-beta.24"
3
+ "@microsoft/sp-listview-extensibility": "1.13.0-rc.1"
4
4
  }
5
5
  }
package/lib/common/dependency/library/firstParty.json CHANGED
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "dependencies": {},
3
3
  "devDependencies": {
4
- "@microsoft/sp-build-web": "1.13.0-beta.24",
5
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
6
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
4
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
5
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
6
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
7
7
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
8
8
  }
9
9
  }
package/lib/common/dependency/library/firstPartyPlusBeta.json CHANGED
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "dependencies": {},
3
3
  "devDependencies": {
4
- "@microsoft/sp-build-web": "1.13.0-beta.24",
5
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
6
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
4
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
5
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
6
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
7
7
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
8
8
  }
9
9
  }
package/lib/common/dependency/searchQueryModifier.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-search-extensibility": "1.13.0-beta.24"
3
+ "@microsoft/sp-search-extensibility": "1.13.0-rc.1"
4
4
  }
5
5
  }
package/lib/common/dependency/searchQueryModifierPlusBeta.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-search-extensibility": "1.13.0-beta.24"
3
+ "@microsoft/sp-search-extensibility": "1.13.0-rc.1"
4
4
  }
5
5
  }
package/lib/common/dependency/webpart/firstParty.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.13.0-beta.24",
4
- "@microsoft/sp-property-pane": "1.13.0-beta.24",
5
- "@microsoft/sp-webpart-base": "1.13.0-beta.24",
6
- "@microsoft/sp-lodash-subset": "1.13.0-beta.24",
7
- "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.24"
3
+ "@microsoft/sp-core-library": "1.13.0-rc.1",
4
+ "@microsoft/sp-property-pane": "1.13.0-rc.1",
5
+ "@microsoft/sp-webpart-base": "1.13.0-rc.1",
6
+ "@microsoft/sp-lodash-subset": "1.13.0-rc.1",
7
+ "@microsoft/sp-office-ui-fabric-core": "1.13.0-rc.1"
8
8
  },
9
9
  "devDependencies": {
10
- "@microsoft/sp-build-web": "1.13.0-beta.24",
11
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
12
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
10
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
11
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
12
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
13
13
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
14
14
  }
15
15
  }
package/lib/common/dependency/webpart/firstPartyPlusBeta.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.13.0-beta.24",
4
- "@microsoft/sp-property-pane": "1.13.0-beta.24",
5
- "@microsoft/sp-webpart-base": "1.13.0-beta.24",
6
- "@microsoft/sp-lodash-subset": "1.13.0-beta.24",
7
- "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.24"
3
+ "@microsoft/sp-core-library": "1.13.0-rc.1",
4
+ "@microsoft/sp-property-pane": "1.13.0-rc.1",
5
+ "@microsoft/sp-webpart-base": "1.13.0-rc.1",
6
+ "@microsoft/sp-lodash-subset": "1.13.0-rc.1",
7
+ "@microsoft/sp-office-ui-fabric-core": "1.13.0-rc.1"
8
8
  },
9
9
  "devDependencies": {
10
- "@microsoft/sp-build-web": "1.13.0-beta.24",
11
- "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
12
- "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
10
+ "@microsoft/sp-build-web": "1.13.0-rc.1",
11
+ "@microsoft/sp-tslint-rules": "1.13.0-rc.1",
12
+ "@microsoft/sp-module-interfaces": "1.13.0-rc.1",
13
13
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
14
14
  }
15
15
  }
package/lib/generators/adaptiveCardExtension/index.d.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  import { IBaseOptions, BaseGenerator, AvailableFrameworks } from '../../common/BaseGenerator';
2
2
  import * as BaseComponent from '../component/BaseComponentGenerator';
3
+ declare type IACETemplateType = 'Image' | 'PrimaryText' | 'Basic';
3
4
  export interface IACEOptions extends BaseComponent.IBaseComponentOptions {
5
+ aceTemplateType: IACETemplateType;
4
6
  }
5
7
  export interface IACEContext extends BaseComponent.IBaseComponentContext {
6
8
  }
@@ -20,5 +22,7 @@ export declare class AdaptiveCardExtensionGenerator extends BaseComponent.BaseCo
20
22
  protected constructor(args: string | string[], options: IACEOptions);
21
23
  private shouldExecute;
22
24
  private _getTemplatePath;
25
+ private _getManifestTemplatePath;
23
26
  }
27
+ export {};
24
28
  //# sourceMappingURL=index.d.ts.map
package/lib/generators/adaptiveCardExtension/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/adaptiveCardExtension/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAE9F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3E,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3E,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,8BAA+B,SAAQ,aAAa,CAAC,sBAAsB,CACtF,WAAW,EACX,WAAW,CACZ;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA6B;IACpE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IACjE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC1B,WAAW,IAAI,IAAI;IAOnB,OAAO,IAAI,IAAI;IAWf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW;IAKnE,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,gBAAgB;CAUzB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/adaptiveCardExtension/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAE9F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAErE,aAAK,gBAAgB,GAAG,OAAO,GAAG,aAAa,GAAG,OAAO,CAAC;AAC1D,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;IACtE,eAAe,EAAE,gBAAgB,CAAC;CACnC;AAED,MAAM,WAAW,WAAY,SAAQ,aAAa,CAAC,qBAAqB;CAAG;AAE3E,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAEN;AAED,qBAAa,8BAA+B,SAAQ,aAAa,CAAC,sBAAsB,CACtF,WAAW,EACX,WAAW,CACZ;IACC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAA6B;IACpE,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAA2B;IAC9D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,CAAM;IACjE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC1B,WAAW,IAAI,IAAI;IAQnB,OAAO,IAAI,IAAI;IAkBf,OAAO,IAAI,IAAI;IAMf,GAAG,IAAI,IAAI;IAIlB,SAAS,aAAa,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,WAAW;IAKnE,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,wBAAwB;CAOjC"}
package/lib/generators/adaptiveCardExtension/index.js CHANGED
@@ -69,19 +69,19 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
69
69
  return this.prompt([
70
70
  {
71
71
  type: 'list',
72
- name: 'templateType',
72
+ name: 'aceTemplateType',
73
73
  default: 'PrimaryText',
74
- when: () => !this.config.get('templateType'),
74
+ when: () => !this.config.get('aceTemplateType'),
75
75
  message: 'Which template do you want to use?',
76
76
  choices
77
77
  }
78
78
  ]).then((answers) => {
79
- const templateType = answers.templateType || this.config.get('templateType');
79
+ const templateType = answers.aceTemplateType || this.config.get('aceTemplateType');
80
80
  if (!(templateType === 'Basic' || templateType === 'Image' || templateType === 'PrimaryText')) {
81
- this.log(colors_1.default.red(`Invalid templateType: '${templateType}'`));
81
+ this.log(colors_1.default.red(`Invalid template type: '${templateType}'`));
82
82
  }
83
83
  else {
84
- this.config.set('templateType', templateType);
84
+ this.config.set('aceTemplateType', templateType);
85
85
  }
86
86
  return super.prompting();
87
87
  });
@@ -90,12 +90,16 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
90
90
  if (this.shouldExecute()) {
91
91
  super.configuring();
92
92
  this.ensureDependencyGroup('adaptiveCardExtension');
93
+ this.serveJson.setUpForWebParts();
93
94
  }
94
95
  }
95
96
  writing() {
96
97
  if (this.shouldExecute()) {
97
98
  super.writing(true);
98
- this.copyTemplate(this._getTemplatePath(this.config.get('templateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}/cardView`));
99
+ // copy view template
100
+ this.copyTemplate(this._getTemplatePath(this.config.get('aceTemplateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}/cardView`));
101
+ // copy manifest.json path
102
+ this.copyTemplate(this._getManifestTemplatePath(this.config.get('aceTemplateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}`));
99
103
  }
100
104
  }
101
105
  install() {
@@ -109,8 +113,7 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
109
113
  shouldExecute() {
110
114
  return (this.config.get('environment') === 'spo' &&
111
115
  this.config.get('componentType') === 'adaptiveCardExtension' &&
112
- this.config.get('isDomainIsolated') === false &&
113
- this.config.get('plusBeta') === true);
116
+ this.config.get('isDomainIsolated') === false);
114
117
  }
115
118
  _getTemplatePath(templateType) {
116
119
  switch (templateType) {
@@ -122,6 +125,14 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
122
125
  return this.templatePath('./basicCardView/');
123
126
  }
124
127
  }
128
+ _getManifestTemplatePath(templateType) {
129
+ if (templateType === 'Image') {
130
+ return this.templatePath('./manifestTemplate/imageTemplate');
131
+ }
132
+ else {
133
+ return this.templatePath('./manifestTemplate/baseTemplate');
134
+ }
135
+ }
125
136
  }
126
137
  exports.AdaptiveCardExtensionGenerator = AdaptiveCardExtensionGenerator;
127
138
  // Yeoman expects exports of this type, which overrides the TS exports above
package/lib/generators/adaptiveCardExtension/templates/imageCardView/CardView.ts CHANGED
@@ -2,12 +2,31 @@ import {
2
2
  BaseImageCardView,
3
3
  IImageCardParameters,
4
4
  IExternalLinkCardAction,
5
- IQuickViewCardAction
5
+ IQuickViewCardAction,
6
+ ICardButton
6
7
  } from '@microsoft/sp-adaptive-card-extension-base';
7
8
  import * as strings from '<%= componentStrings %>';
8
- import { I<%= componentClassName %>Props, I<%= componentClassName %>State } from '../<%= componentClassName %>';
9
+ import { I<%= componentClassName %>Props, I<%= componentClassName %>State, QUICK_VIEW_REGISTRY_ID } from '../<%= componentClassName %>';
9
10
 
10
11
  export class CardView extends BaseImageCardView<I<%= componentClassName %>Props, I<%= componentClassName %>State> {
12
+ /**
13
+ * Buttons will not be visible if card size is 'Medium' with Image Card View.
14
+ * It will support up to two buttons for 'Large' card size.
15
+ */
16
+ public get cardButtons(): [ICardButton] | [ICardButton, ICardButton] | undefined {
17
+ return [
18
+ {
19
+ title: strings.QuickViewButton,
20
+ action: {
21
+ type: 'QuickView',
22
+ parameters: {
23
+ view: QUICK_VIEW_REGISTRY_ID
24
+ }
25
+ }
26
+ }
27
+ ];
28
+ }
29
+
11
30
  public get data(): IImageCardParameters {
12
31
  return {
13
32
  primaryText: strings.PrimaryText,
package/lib/generators/adaptiveCardExtension/templates/manifestTemplate/imageTemplate/{componentClassName}.manifest.json ADDED
@@ -0,0 +1,30 @@
1
+ {
2
+ "$schema": "https://developer.microsoft.com/json-schemas/spfx/client-side-web-part-manifest.schema.json",
3
+ "id": "<%= componentId %>",
4
+ "alias": "<%= componentAlias %>",
5
+ "componentType": "AdaptiveCardExtension",
6
+
7
+ // The "*" signifies that the version should be taken from the package.json
8
+ "version": "*",
9
+ "manifestVersion": 2,
10
+
11
+ // If true, the component can only be installed on sites where Custom Script is allowed.
12
+ // Components that allow authors to embed arbitrary script code should set this to true.
13
+ // https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
14
+ "requiresCustomScript": false,
15
+ "supportedHosts": ["Dashboard"],
16
+ "supportsThemeVariants": true,
17
+ "preconfiguredEntries": [{
18
+ "groupId": "bd067b1e-3ad5-4d5d-a5fe-505f07d7f59c", // Dashboard
19
+ "group": { "default": "Dashboard" },
20
+ "title": { "default": "<%= componentNameUnescaped %>" },
21
+ "description": { "default": "<%= componentDescription %>" },
22
+ "officeFabricIconFontName": "SharePointLogo",
23
+ "cardSize": "Large",
24
+ "properties": {
25
+ "title": "<%= componentNameUnescaped %>",
26
+ "description": "<%= componentDescription %>",
27
+ "iconProperty": "" // Default to sharepointlogo
28
+ }
29
+ }]
30
+ }
package/lib/generators/app/index.js CHANGED
@@ -88,6 +88,12 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
88
88
  else {
89
89
  this.config.set('extensionType', undefined);
90
90
  }
91
+ if (this.options.aceTemplateType !== undefined) {
92
+ this.config.set('aceTemplateType', this.options.aceTemplateType);
93
+ }
94
+ else {
95
+ this.config.set('aceTemplateType', undefined);
96
+ }
91
97
  if (this.options.framework !== undefined) {
92
98
  this.config.set('framework', this.options.framework);
93
99
  }
package/lib/generators/component/index.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import { IBaseOptions, BaseGenerator } from '../../common/BaseGenerator';
2
2
  import * as Webpart from '../webpart';
3
3
  import * as Extension from '../extension';
4
- export interface IComponentSelectorOptions extends Webpart.IWebpartOptions, Extension.IExtensionOptions {
4
+ import * as AdaptiveCardExtension from '../adaptiveCardExtension';
5
+ export interface IComponentSelectorOptions extends Webpart.IWebpartOptions, Extension.IExtensionOptions, AdaptiveCardExtension.IACEOptions {
5
6
  componentType: 'webpart' | 'extension' | 'library' | 'adaptiveCardExtension';
6
7
  }
7
8
  export declare function composeWith<TOptions extends IBaseOptions, TContext>(base: BaseGenerator<TOptions, TContext>, options: IBaseOptions): void;
package/lib/generators/component/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/component/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGzE,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAK1C,MAAM,WAAW,yBAA0B,SAAQ,OAAO,CAAC,eAAe,EAAE,SAAS,CAAC,iBAAiB;IACrG,aAAa,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,uBAAuB,CAAC;CAC9E;AAED,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAUN;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC1F,SAAgB,YAAY,EAAE,MAAM,CAAyB;IAEtD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmE1B,WAAW,IAAI,IAAI;IAGnB,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;IAGf,GAAG,IAAI,IAAI;IAIlB,OAAO,CAAC,aAAa;CAGtB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/component/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGzE,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,qBAAqB,MAAM,0BAA0B,CAAC;AAGlE,MAAM,WAAW,yBACf,SAAQ,OAAO,CAAC,eAAe,EAC7B,SAAS,CAAC,iBAAiB,EAC3B,qBAAqB,CAAC,WAAW;IACnC,aAAa,EAAE,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,uBAAuB,CAAC;CAC9E;AAED,wBAAgB,WAAW,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACjE,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,OAAO,EAAE,YAAY,GACpB,IAAI,CAEN;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAC3C,IAAI,CAUN;AAED;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,aAAa,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC1F,SAAgB,YAAY,EAAE,MAAM,CAAyB;IAEtD,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE1B,WAAW,IAAI,IAAI;IAGnB,OAAO,IAAI,IAAI;IAGf,OAAO,IAAI,IAAI;IAGf,GAAG,IAAI,IAAI;IAIlB,OAAO,CAAC,aAAa;CAGtB"}
package/lib/generators/component/index.js CHANGED
@@ -84,14 +84,12 @@ class ComponentSelectorGenerator extends BaseGenerator_1.BaseGenerator {
84
84
  {
85
85
  name: 'Library',
86
86
  value: 'library'
87
- }
88
- ];
89
- if (this.config.get('plusBeta') === true) {
90
- choices.push({
87
+ },
88
+ {
91
89
  name: 'Adaptive Card Extension',
92
90
  value: 'adaptiveCardExtension'
93
- });
94
- }
91
+ }
92
+ ];
95
93
  }
96
94
  return this.prompt([
97
95
  {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/generator-sharepoint",
3
- "version": "1.13.0-beta.24",
3
+ "version": "1.13.0-rc.1",
4
4
  "description": "Yeoman generator for the SharePoint Framework",
5
5
  "scripts": {},
6
6
  "engines": {
@@ -13,7 +13,7 @@
13
13
  "homepage": "http://aka.ms/spfx",
14
14
  "main": "lib/generators/app/index.js",
15
15
  "dependencies": {
16
- "@microsoft/spfx-heft-plugins": "1.13.0-beta.24",
16
+ "@microsoft/spfx-heft-plugins": "1.13.0-rc.1",
17
17
  "@rushstack/node-core-library": "3.40.0",
18
18
  "colors": "~1.2.1",
19
19
  "lodash": "4.17.21",