@microsoft/generator-sharepoint 1.13.0 → 1.14.0-rc.2

package/lib/common/BaseGenerator.d.ts

@@ -5,8 +5,8 @@ import { PackageJsonManager } from './PackageJsonManager';
 import { ConfigJsonManager } from './ConfigJsonManager';
 import { ServeJsonManager } from './ServeJsonManager';
 import { PackageSolutionJsonManager } from './PackageSolutionJsonManager';
-export declare type AvailableFrameworks = 'react' | 'none';
-export declare type DependencyGroups = 'react' | 'none' | 'extension' | 'webpart' | 'applicationCustomizer' | 'fieldCustomizer' | 'commandSet' | 'searchQueryModifier' | 'library' | 'adaptiveCardExtension';
+export declare type AvailableTemplates = 'react' | 'none' | 'minimal';
+export declare type DependencyGroups = 'react' | 'none' | 'minimal' | 'extension' | 'webpart' | 'applicationCustomizer' | 'fieldCustomizer' | 'commandSet' | 'searchQueryModifier' | 'library' | 'adaptiveCardExtension';
 export interface IBaseOptions {
     'skip-install': boolean;
     plusbeta: boolean;

package/lib/common/BaseGenerator.d.ts.map

@@ -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,EAAE,MAAM,8BAA8B,CAAC;AAG5D,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,mBAAmB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEnD,oBAAY,gBAAgB,GACxB,OAAO,GACP,MAAM,GACN,WAAW,GACX,SAAS,GACT,uBAAuB,GACvB,iBAAiB,GACjB,YAAY,GACZ,qBAAqB,GACrB,SAAS,GACT,uBAAuB,CAAC;AAE5B,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,8BAAsB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,CAAE,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACnG,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAiC;IACpF,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,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,mBAAmB,CAAyC;IAEpE,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;IAiD9D,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,mBAAmB;IAK3B,OAAO,KAAK,iBAAiB,GAgC5B;IAED,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;CAQ/B"}
+{"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,EAAE,MAAM,8BAA8B,CAAC;AAG5D,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,GACxB,OAAO,GACP,MAAM,GACN,SAAS,GACT,WAAW,GACX,SAAS,GACT,uBAAuB,GACvB,iBAAiB,GACjB,YAAY,GACZ,qBAAqB,GACrB,SAAS,GACT,uBAAuB,CAAC;AAE5B,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,8BAAsB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,CAAE,SAAQ,MAAM,CAAC,QAAQ,CAAC;IACnG,SAAS,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAiC;IACpF,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,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,mBAAmB,CAAyC;IAEpE,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;IAiD9D,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,cAAc;IAiCtB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,mBAAmB;IAK3B,OAAO,KAAK,iBAAiB,GAgC5B;IAED,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;CAQ/B"}

package/lib/common/PackageSolutionJsonManager.d.ts

@@ -10,5 +10,11 @@ export declare class PackageSolutionJsonManager extends JsonManager<IPackageSolu
     getSkipFeatureDeployment(): boolean;
     setUpSolution(solutionContext: ISolutionContext): void;
     addExtensionFeature(featureId: string, includeClientSideInstance: boolean): void;
+    addFeature(featureId: string, title: string, description: string, includeAssets: boolean, includeClientSideInstance?: boolean): void;
+    /**
+     * Returns the existing feature that doesn't have componentIds.
+     * We can use the same feature to add additional elements
+     */
+    private _tryGetFeatureToReuse;
 }
 //# sourceMappingURL=PackageSolutionJsonManager.d.ts.map

package/lib/common/PackageSolutionJsonManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PackageSolutionJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/PackageSolutionJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,8BAA8B,CAAC;AACrF,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,gBAAgB,CAAC;IAC3E,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;IAgCtD,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,yBAAyB,EAAE,OAAO,GAAG,IAAI;CA8BxF"}
+{"version":3,"file":"PackageSolutionJsonManager.d.ts","sourceRoot":"","sources":["../../src/common/PackageSolutionJsonManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,8BAA8B,CAAC;AACrF,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,gBAAgB,CAAC;IAC3E,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"}

package/lib/common/PackageSolutionJsonManager.js

@@ -63,31 +63,72 @@ class PackageSolutionJsonManager extends JsonManager_1.JsonManager {
         data.paths = {
             zippedPackage: `solution/${solutionContext.libraryName}.sppkg`
         };
+        data.solution.metadata = {
+            shortDescription: {
+                default: solutionContext.solutionShortDescription
+            },
+            longDescription: {
+                default: solutionContext.solutionShortDescription
+            },
+            screenshotPaths: [],
+            videoUrl: '',
+            categories: []
+        };
     }
     addExtensionFeature(featureId, includeClientSideInstance) {
+        this.addFeature(featureId, 'Application Extension - Deployment of custom action', 'Deploys a custom action with ClientSideComponentId association', true, includeClientSideInstance);
+    }
+    addFeature(featureId, title, description, includeAssets, includeClientSideInstance = false) {
         const solution = this.data.solution;
         if (!solution) {
             // This should never happened as the solution has been set up
             return;
         }
-        if (!solution.features) {
-            solution.features = [];
-        }
-        let feature;
-        const manifests = ['elements.xml'];
-        if (includeClientSideInstance) {
-            manifests.push('ClientSideInstance.xml');
+        let feature = this._tryGetFeatureToReuse(solution);
+        const isAddingFeature = !feature;
+        if (!feature) {
+            // we could use isAddingFeature flag but it leads to 'possibly undefined' error when using feature below
+            if (!solution.features) {
+                solution.features = [];
+            }
+            feature = {
+                title: title,
+                description: description,
+                id: featureId,
+                version: '1.0.0.0'
+            };
         }
-        feature = {
-            title: 'Application Extension - Deployment of custom action.',
-            description: 'Deploys a custom action with ClientSideComponentId association',
-            id: featureId,
-            version: '1.0.0.0',
-            assets: {
-                elementManifests: manifests
+        if (includeAssets) {
+            if (!feature.assets) {
+                feature.assets = {};
             }
-        };
-        solution.features.push(feature);
+            let manifests = feature.assets.elementManifests;
+            if (!manifests) {
+                manifests = feature.assets.elementManifests = ['elements.xml'];
+            }
+            else {
+                if (manifests.indexOf('elements.xml') === -1) {
+                    manifests.push('elements.xml');
+                }
+            }
+            if (includeClientSideInstance && manifests.indexOf('ClientSideInstance.xml') === -1) {
+                manifests.push('ClientSideInstance.xml');
+            }
+        }
+        if (isAddingFeature) {
+            solution.features.push(feature);
+        }
+    }
+    /**
+     * Returns the existing feature that doesn't have componentIds.
+     * We can use the same feature to add additional elements
+     */
+    _tryGetFeatureToReuse(solution) {
+        if (!solution.features) {
+            return undefined;
+        }
+        const noComponendIdsFeatures = solution.features.filter((feature) => !feature.componentIds || !feature.componentIds.length);
+        return noComponendIdsFeatures.length ? noComponendIdsFeatures[0] : undefined;
     }
 }
 exports.PackageSolutionJsonManager = PackageSolutionJsonManager;

package/lib/common/dependency/adaptiveCardExtension/firstParty.json

@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0",
-    "@microsoft/sp-property-pane": "1.13.0",
-    "@microsoft/sp-adaptive-card-extension-base": "1.13.0"
+    "@microsoft/sp-core-library": "1.14.0-rc.2",
+    "@microsoft/sp-property-pane": "1.14.0-rc.2",
+    "@microsoft/sp-adaptive-card-extension-base": "1.14.0-rc.2"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/adaptiveCardExtension/firstPartyPlusBeta.json

@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0",
-    "@microsoft/sp-property-pane": "1.13.0",
-    "@microsoft/sp-adaptive-card-extension-base": "1.13.0"
+    "@microsoft/sp-core-library": "1.14.0-rc.2",
+    "@microsoft/sp-property-pane": "1.14.0-rc.2",
+    "@microsoft/sp-adaptive-card-extension-base": "1.14.0-rc.2"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/applicationCustomizer.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@microsoft/sp-dialog": "1.13.0",
-    "@microsoft/sp-application-base": "1.13.0"
+    "@microsoft/sp-dialog": "1.14.0-rc.2",
+    "@microsoft/sp-application-base": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/applicationCustomizerPlusBeta.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@microsoft/sp-dialog": "1.13.0",
-    "@microsoft/sp-application-base": "1.13.0"
+    "@microsoft/sp-dialog": "1.14.0-rc.2",
+    "@microsoft/sp-application-base": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/commandSet.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@microsoft/sp-listview-extensibility": "1.13.0",
-    "@microsoft/sp-dialog": "1.13.0"
+    "@microsoft/sp-listview-extensibility": "1.14.0-rc.2",
+    "@microsoft/sp-dialog": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/commandSetPlusBeta.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@microsoft/sp-listview-extensibility": "1.13.0",
-    "@microsoft/sp-dialog": "1.13.0"
+    "@microsoft/sp-listview-extensibility": "1.14.0-rc.2",
+    "@microsoft/sp-dialog": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/extension/firstParty.json

@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0",
-    "@microsoft/decorators": "1.13.0"
+    "@microsoft/sp-core-library": "1.14.0-rc.2",
+    "@microsoft/decorators": "1.14.0-rc.2"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/extension/firstPartyPlusBeta.json

@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0",
-    "@microsoft/decorators": "1.13.0"
+    "@microsoft/sp-core-library": "1.14.0-rc.2",
+    "@microsoft/decorators": "1.14.0-rc.2"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/fieldCustomizer.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@microsoft/sp-listview-extensibility": "1.13.0"
+    "@microsoft/sp-listview-extensibility": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/fieldCustomizerPlusBeta.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@microsoft/sp-listview-extensibility": "1.13.0"
+    "@microsoft/sp-listview-extensibility": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/library/firstParty.json

@@ -1,9 +1,9 @@
 {
   "dependencies": {},
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/library/firstPartyPlusBeta.json

@@ -1,9 +1,9 @@
 {
   "dependencies": {},
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/searchQueryModifier.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@microsoft/sp-search-extensibility": "1.13.0"
+    "@microsoft/sp-search-extensibility": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/searchQueryModifierPlusBeta.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@microsoft/sp-search-extensibility": "1.13.0"
+    "@microsoft/sp-search-extensibility": "1.14.0-rc.2"
   }
 }

package/lib/common/dependency/webpart/firstParty.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0",
-    "@microsoft/sp-property-pane": "1.13.0",
-    "@microsoft/sp-webpart-base": "1.13.0",
-    "@microsoft/sp-lodash-subset": "1.13.0",
-    "@microsoft/sp-office-ui-fabric-core": "1.13.0"
+    "@microsoft/sp-core-library": "1.14.0-rc.2",
+    "@microsoft/sp-property-pane": "1.14.0-rc.2",
+    "@microsoft/sp-webpart-base": "1.14.0-rc.2",
+    "@microsoft/sp-lodash-subset": "1.14.0-rc.2",
+    "@microsoft/sp-office-ui-fabric-core": "1.14.0-rc.2"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/common/dependency/webpart/firstPartyPlusBeta.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0",
-    "@microsoft/sp-property-pane": "1.13.0",
-    "@microsoft/sp-webpart-base": "1.13.0",
-    "@microsoft/sp-lodash-subset": "1.13.0",
-    "@microsoft/sp-office-ui-fabric-core": "1.13.0"
+    "@microsoft/sp-core-library": "1.14.0-rc.2",
+    "@microsoft/sp-property-pane": "1.14.0-rc.2",
+    "@microsoft/sp-webpart-base": "1.14.0-rc.2",
+    "@microsoft/sp-lodash-subset": "1.14.0-rc.2",
+    "@microsoft/sp-office-ui-fabric-core": "1.14.0-rc.2"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0",
-    "@microsoft/sp-tslint-rules": "1.13.0",
-    "@microsoft/sp-module-interfaces": "1.13.0",
+    "@microsoft/sp-build-web": "1.14.0-rc.2",
+    "@microsoft/sp-tslint-rules": "1.14.0-rc.2",
+    "@microsoft/sp-module-interfaces": "1.14.0-rc.2",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

package/lib/generators/adaptiveCardExtension/index.d.ts

@@ -1,4 +1,4 @@
-import { IBaseOptions, BaseGenerator, AvailableFrameworks } from '../../common/BaseGenerator';
+import { IBaseOptions, BaseGenerator, AvailableTemplates } from '../../common/BaseGenerator';
 import * as BaseComponent from '../component/BaseComponentGenerator';
 declare type IACETemplateType = 'Image' | 'PrimaryText' | 'Basic';
 export interface IACEOptions extends BaseComponent.IBaseComponentOptions {
@@ -11,7 +11,7 @@ export declare function defineOptions<TOptions extends IBaseOptions, TContext>(g
 export declare class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerator<IACEOptions, IACEContext> {
     protected readonly friendlyName: string;
     protected readonly codeName: string;
-    protected readonly allowedFrameworks: AvailableFrameworks[];
+    protected readonly allowedTemplates: AvailableTemplates[];
     protected readonly folderName: string;
     initializing(): void;
     prompting(): Promise<void>;

package/lib/generators/adaptiveCardExtension/index.d.ts.map

@@ -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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/adaptiveCardExtension/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAE7F,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AAGrE,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,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC/D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IAE1D,YAAY,IAAI,IAAI;IAIpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC1B,WAAW,IAAI,IAAI;IAenB,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

@@ -27,6 +27,7 @@ const path = __importStar(require("path"));
 const colors_1 = __importDefault(require("colors"));
 const Utils = __importStar(require("../../common/utilities"));
 const BaseComponent = __importStar(require("../component/BaseComponentGenerator"));
+const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
 function composeWith(base, options) {
     Utils.compose(path.basename(__dirname), base, options);
 }
@@ -40,7 +41,7 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
         super(args, options);
         this.friendlyName = 'Adaptive Card Extension';
         this.codeName = 'AdaptiveCardExtension';
-        this.allowedFrameworks = [];
+        this.allowedTemplates = [];
         this.folderName = 'adaptiveCardExtensions';
         defineOptions(this);
     }
@@ -90,6 +91,8 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
         if (this.shouldExecute()) {
             super.configuring();
             this.ensureDependencyGroup('adaptiveCardExtension');
+            const solutionName = YeomanConfiguration_1.YeomanConfiguration.libraryName;
+            this.packageSolutionJson.addFeature(Utils.generateGuid(), `${solutionName} Feature`, `The feature that activates elements of the ${solutionName} solution.`, false);
             this.serveJson.setUpForWebParts();
         }
     }

package/lib/generators/adaptiveCardExtension/templates/base/loc/en-us.js

@@ -1,14 +1,11 @@
 define([], function() {
   return {
-    "PropertyPaneDescription": "Description",
-    "BasicGroupName": "Group Name",
-    "DescriptionFieldLabel": "Description Field",
-    "TitleFieldLabel": "Card Title",
-    "IconPropertyFieldLabel": "Card Icon",
+    "PropertyPaneDescription": "Write 1-3 sentences describing the functionality of this component.",
+    "TitleFieldLabel": "Card title",
     "Title": "Adaptive Card Extension",
-    "SubTitle": "Quick View",
-    "Description": "Create your SPFx Adaptive Card Extension solution!",
+    "SubTitle": "Quick view",
     "PrimaryText": "SPFx Adaptive Card Extension",
-    "QuickViewButton": "Quick View"
+    "Description": "Create your SPFx Adaptive Card Extension solution!",
+    "QuickViewButton": "Quick view"
   }
 });

package/lib/generators/adaptiveCardExtension/templates/base/loc/mystring.d.ts

@@ -1,13 +1,10 @@
 declare interface I<%= componentStrings %> {
   PropertyPaneDescription: string;
-  BasicGroupName: string;
-  DescriptionFieldLabel: string;
   TitleFieldLabel: string;
-  IconPropertyFieldLabel: string;
   Title: string;
   SubTitle: string;
-  Description: string;
   PrimaryText: string;
+  Description: string;
   QuickViewButton: string;
 }
 

package/lib/generators/adaptiveCardExtension/templates/basicCardView/CardView.ts

@@ -25,7 +25,8 @@ export class CardView extends BaseBasicCardView<I<%= componentClassName %>Props,
 
   public get data(): IBasicCardParameters {
     return {
-      primaryText: strings.PrimaryText
+      primaryText: strings.PrimaryText,
+      title: this.properties.title
     };
   }
 

package/lib/generators/adaptiveCardExtension/templates/imageCardView/CardView.ts

@@ -30,7 +30,8 @@ export class CardView extends BaseImageCardView<I<%= componentClassName %>Props,
   public get data(): IImageCardParameters {
     return {
       primaryText: strings.PrimaryText,
-      imageUrl: require('../assets/MicrosoftLogo.png')
+      imageUrl: require('../assets/MicrosoftLogo.png'),
+      title: this.properties.title
     };
   }
 

package/lib/generators/adaptiveCardExtension/templates/manifestTemplate/baseTemplate/{componentClassName}.manifest.json

@@ -21,9 +21,7 @@
     "description": { "default": "<%= componentDescription %>" },
     "officeFabricIconFontName": "SharePointLogo",
     "properties": {
-      "title": "<%= componentNameUnescaped %>",
-      "description": "<%= componentDescription %>",
-      "iconProperty": "" // Default to sharepointlogo
+      "title": "<%= componentNameUnescaped %>"
     }
   }]
 }

package/lib/generators/adaptiveCardExtension/templates/none/quickView/QuickView.ts

@@ -5,7 +5,6 @@ import { I<%= componentClassName %>Props, I<%= componentClassName %>State } from
 export interface IQuickViewData {
   subTitle: string;
   title: string;
-  description: string;
 }
 
 export class QuickView extends BaseAdaptiveCardView<
@@ -17,7 +16,6 @@ export class QuickView extends BaseAdaptiveCardView<
     return {
       subTitle: strings.SubTitle,
       title: strings.Title,
-      description: this.properties.description
     };
   }
 

package/lib/generators/adaptiveCardExtension/templates/none/quickView/template/QuickViewTemplate.json

@@ -23,11 +23,6 @@
           ]
         }
       ]
-    },
-    {
-      "type": "TextBlock",
-      "text": "${description}",
-      "wrap": true
     }
   ]
 }

package/lib/generators/adaptiveCardExtension/templates/none/{componentClassName}.ts

@@ -6,12 +6,9 @@ import { <%= componentName %>PropertyPane } from './<%= componentName %>Property
 
 export interface I<%= componentClassName %>Props {
   title: string;
-  description: string;
-  iconProperty: string;
 }
 
 export interface I<%= componentClassName %>State {
-  description: string;
 }
 
 const CARD_VIEW_REGISTRY_ID: string = '<%= componentName %>_CARD_VIEW';
@@ -24,9 +21,7 @@ export default class <%= componentClassName %> extends BaseAdaptiveCardExtension
   private _deferredPropertyPane: <%= componentName %>PropertyPane | undefined;
 
   public onInit(): Promise<void> {
-    this.state = {
-      description: this.properties.description
-    };
+    this.state = { };
 
     this.cardNavigator.register(CARD_VIEW_REGISTRY_ID, () => new CardView());
     this.quickViewNavigator.register(QUICK_VIEW_REGISTRY_ID, () => new QuickView());
@@ -34,14 +29,6 @@ export default class <%= componentClassName %> extends BaseAdaptiveCardExtension
     return Promise.resolve();
   }
 
-  public get title(): string {
-    return this.properties.title;
-  }
-
-  protected get iconProperty(): string {
-    return this.properties.iconProperty || require('./assets/SharePointLogo.svg');
-  }
-
   protected loadPropertyPaneResources(): Promise<void> {
     return import(
       /* webpackChunkName: '<%= componentName %>-property-pane'*/

package/lib/generators/adaptiveCardExtension/templates/none/{componentName}PropertyPane.ts

@@ -9,17 +9,9 @@ export class <%= componentName %>PropertyPane {
           header: { description: strings.PropertyPaneDescription },
           groups: [
             {
-              groupName: strings.BasicGroupName,
               groupFields: [
                 PropertyPaneTextField('title', {
                   label: strings.TitleFieldLabel
-                }),
-                PropertyPaneTextField('iconProperty', {
-                  label: strings.IconPropertyFieldLabel
-                }),
-                PropertyPaneTextField('description', {
-                  label: strings.DescriptionFieldLabel,
-                  multiline: true
                 })
               ]
             }

package/lib/generators/adaptiveCardExtension/templates/primaryTextCardView/CardView.ts

@@ -26,7 +26,8 @@ export class CardView extends BasePrimaryTextCardView<I<%= componentClassName %>
   public get data(): IPrimaryTextCardParameters {
     return {
       primaryText: strings.PrimaryText,
-      description: this.properties.description
+      description: strings.Description,
+      title: this.properties.title
     };
   }