@microsoft/generator-sharepoint 1.13.0-beta.24 → 1.14.0-beta.4

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-beta.24",
-    "@microsoft/sp-property-pane": "1.13.0-beta.24",
-    "@microsoft/sp-adaptive-card-extension-base": "1.13.0-beta.24"
+    "@microsoft/sp-core-library": "1.14.0-beta.4",
+    "@microsoft/sp-property-pane": "1.14.0-beta.4",
+    "@microsoft/sp-adaptive-card-extension-base": "1.14.0-beta.4"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@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-beta.24",
-    "@microsoft/sp-property-pane": "1.13.0-beta.24",
-    "@microsoft/sp-adaptive-card-extension-base": "1.13.0-beta.24"
+    "@microsoft/sp-core-library": "1.14.0-beta.4",
+    "@microsoft/sp-property-pane": "1.14.0-beta.4",
+    "@microsoft/sp-adaptive-card-extension-base": "1.14.0-beta.4"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@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-beta.24",
-    "@microsoft/sp-application-base": "1.13.0-beta.24"
+    "@microsoft/sp-dialog": "1.14.0-beta.4",
+    "@microsoft/sp-application-base": "1.14.0-beta.4"
   }
 }

package/lib/common/dependency/applicationCustomizerPlusBeta.json

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

package/lib/common/dependency/commandSet.json

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

package/lib/common/dependency/commandSetPlusBeta.json

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

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

@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0-beta.24",
-    "@microsoft/decorators": "1.13.0-beta.24"
+    "@microsoft/sp-core-library": "1.14.0-beta.4",
+    "@microsoft/decorators": "1.14.0-beta.4"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@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-beta.24",
-    "@microsoft/decorators": "1.13.0-beta.24"
+    "@microsoft/sp-core-library": "1.14.0-beta.4",
+    "@microsoft/decorators": "1.14.0-beta.4"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@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-beta.24"
+    "@microsoft/sp-listview-extensibility": "1.14.0-beta.4"
   }
 }

package/lib/common/dependency/fieldCustomizerPlusBeta.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@microsoft/sp-listview-extensibility": "1.13.0-beta.24"
+    "@microsoft/sp-listview-extensibility": "1.14.0-beta.4"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "dependencies": {},
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@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-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@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-beta.24"
+    "@microsoft/sp-search-extensibility": "1.14.0-beta.4"
   }
 }

package/lib/common/dependency/searchQueryModifierPlusBeta.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@microsoft/sp-search-extensibility": "1.13.0-beta.24"
+    "@microsoft/sp-search-extensibility": "1.14.0-beta.4"
   }
 }

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

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@microsoft/sp-core-library": "1.13.0-beta.24",
-    "@microsoft/sp-property-pane": "1.13.0-beta.24",
-    "@microsoft/sp-webpart-base": "1.13.0-beta.24",
-    "@microsoft/sp-lodash-subset": "1.13.0-beta.24",
-    "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.24"
+    "@microsoft/sp-core-library": "1.14.0-beta.4",
+    "@microsoft/sp-property-pane": "1.14.0-beta.4",
+    "@microsoft/sp-webpart-base": "1.14.0-beta.4",
+    "@microsoft/sp-lodash-subset": "1.14.0-beta.4",
+    "@microsoft/sp-office-ui-fabric-core": "1.14.0-beta.4"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@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-beta.24",
-    "@microsoft/sp-property-pane": "1.13.0-beta.24",
-    "@microsoft/sp-webpart-base": "1.13.0-beta.24",
-    "@microsoft/sp-lodash-subset": "1.13.0-beta.24",
-    "@microsoft/sp-office-ui-fabric-core": "1.13.0-beta.24"
+    "@microsoft/sp-core-library": "1.14.0-beta.4",
+    "@microsoft/sp-property-pane": "1.14.0-beta.4",
+    "@microsoft/sp-webpart-base": "1.14.0-beta.4",
+    "@microsoft/sp-lodash-subset": "1.14.0-beta.4",
+    "@microsoft/sp-office-ui-fabric-core": "1.14.0-beta.4"
   },
   "devDependencies": {
-    "@microsoft/sp-build-web": "1.13.0-beta.24",
-    "@microsoft/sp-tslint-rules": "1.13.0-beta.24",
-    "@microsoft/sp-module-interfaces": "1.13.0-beta.24",
+    "@microsoft/sp-build-web": "1.14.0-beta.4",
+    "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
+    "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
     "@microsoft/rush-stack-compiler-3.9": "0.4.47"
   }
 }

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

@@ -1,6 +1,8 @@
-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 {
+    aceTemplateType: IACETemplateType;
 }
 export interface IACEContext extends BaseComponent.IBaseComponentContext {
 }
@@ -9,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>;
@@ -20,5 +22,7 @@ export declare class AdaptiveCardExtensionGenerator extends BaseComponent.BaseCo
     protected constructor(args: string | string[], options: IACEOptions);
     private shouldExecute;
     private _getTemplatePath;
+    private _getManifestTemplatePath;
 }
+export {};
 //# sourceMappingURL=index.d.ts.map

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,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"}
+{"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);
     }
@@ -69,19 +70,19 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
         return this.prompt([
             {
                 type: 'list',
-                name: 'templateType',
+                name: 'aceTemplateType',
                 default: 'PrimaryText',
-                when: () => !this.config.get('templateType'),
+                when: () => !this.config.get('aceTemplateType'),
                 message: 'Which template do you want to use?',
                 choices
             }
         ]).then((answers) => {
-            const templateType = answers.templateType || this.config.get('templateType');
+            const templateType = answers.aceTemplateType || this.config.get('aceTemplateType');
             if (!(templateType === 'Basic' || templateType === 'Image' || templateType === 'PrimaryText')) {
-                this.log(colors_1.default.red(`Invalid templateType: '${templateType}'`));
+                this.log(colors_1.default.red(`Invalid template type: '${templateType}'`));
             }
             else {
-                this.config.set('templateType', templateType);
+                this.config.set('aceTemplateType', templateType);
             }
             return super.prompting();
         });
@@ -90,12 +91,18 @@ 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();
         }
     }
     writing() {
         if (this.shouldExecute()) {
             super.writing(true);
-            this.copyTemplate(this._getTemplatePath(this.config.get('templateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}/cardView`));
+            // copy view template
+            this.copyTemplate(this._getTemplatePath(this.config.get('aceTemplateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}/cardView`));
+            // copy manifest.json path
+            this.copyTemplate(this._getManifestTemplatePath(this.config.get('aceTemplateType')), this.destinationPath(`src/adaptiveCardExtensions/${this.context.componentNameCamelCase}`));
         }
     }
     install() {
@@ -109,8 +116,7 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
     shouldExecute() {
         return (this.config.get('environment') === 'spo' &&
             this.config.get('componentType') === 'adaptiveCardExtension' &&
-            this.config.get('isDomainIsolated') === false &&
-            this.config.get('plusBeta') === true);
+            this.config.get('isDomainIsolated') === false);
     }
     _getTemplatePath(templateType) {
         switch (templateType) {
@@ -122,6 +128,14 @@ class AdaptiveCardExtensionGenerator extends BaseComponent.BaseComponentGenerato
                 return this.templatePath('./basicCardView/');
         }
     }
+    _getManifestTemplatePath(templateType) {
+        if (templateType === 'Image') {
+            return this.templatePath('./manifestTemplate/imageTemplate');
+        }
+        else {
+            return this.templatePath('./manifestTemplate/baseTemplate');
+        }
+    }
 }
 exports.AdaptiveCardExtensionGenerator = AdaptiveCardExtensionGenerator;
 // Yeoman expects exports of this type, which overrides the TS exports above

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

@@ -2,16 +2,35 @@ import {
   BaseImageCardView,
   IImageCardParameters,
   IExternalLinkCardAction,
-  IQuickViewCardAction
+  IQuickViewCardAction,
+  ICardButton
 } from '@microsoft/sp-adaptive-card-extension-base';
 import * as strings from '<%= componentStrings %>';
-import { I<%= componentClassName %>Props, I<%= componentClassName %>State } from '../<%= componentClassName %>';
+import { I<%= componentClassName %>Props, I<%= componentClassName %>State, QUICK_VIEW_REGISTRY_ID } from '../<%= componentClassName %>';
 
 export class CardView extends BaseImageCardView<I<%= componentClassName %>Props, I<%= componentClassName %>State> {
+  /**
+   * Buttons will not be visible if card size is 'Medium' with Image Card View.
+   * It will support up to two buttons for 'Large' card size.
+   */
+  public get cardButtons(): [ICardButton] | [ICardButton, ICardButton] | undefined {
+    return [
+      {
+        title: strings.QuickViewButton,
+        action: {
+          type: 'QuickView',
+          parameters: {
+            view: QUICK_VIEW_REGISTRY_ID
+          }
+        }
+      }
+    ];
+  }
+
   public get data(): IImageCardParameters {
     return {
       primaryText: strings.PrimaryText,
-      imageUrl: 'https://blogs.microsoft.com/uploads/2017/09/WR-Microsoft-logo.jpg'
+      imageUrl: require('../assets/MicrosoftLogo.png')
     };
   }
 

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

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/spfx/client-side-web-part-manifest.schema.json",
+  "id": "<%= componentId %>",
+  "alias": "<%= componentAlias %>",
+  "componentType": "AdaptiveCardExtension",
+
+  // The "*" signifies that the version should be taken from the package.json
+  "version": "*",
+  "manifestVersion": 2,
+
+  // If true, the component can only be installed on sites where Custom Script is allowed.
+  // Components that allow authors to embed arbitrary script code should set this to true.
+  // https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f
+  "requiresCustomScript": false,
+  "supportedHosts": ["Dashboard"],
+  "supportsThemeVariants": true,
+  "preconfiguredEntries": [{
+    "groupId": "bd067b1e-3ad5-4d5d-a5fe-505f07d7f59c", // Dashboard
+    "group": { "default": "Dashboard" },
+    "title": { "default": "<%= componentNameUnescaped %>" },
+    "description": { "default": "<%= componentDescription %>" },
+    "officeFabricIconFontName": "SharePointLogo",
+    "cardSize": "Large",
+    "properties": {
+      "title": "<%= componentNameUnescaped %>",
+      "description": "<%= componentDescription %>",
+      "iconProperty": "" // Default to sharepointlogo
+    }
+  }]
+}

package/lib/generators/app/index.js

@@ -61,9 +61,20 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
         this.log(yosay('Welcome to the ' + colors_1.default.blue(`SharePoint Client-side Solution Generator@${VERSION}`)));
         this._explainArguments();
         this.context.creatingSolution = !YeomanConfiguration_1.YeomanConfiguration.libraryName;
+        const shouldUseSubDir = this.options.solutionName !== undefined;
+        if (shouldUseSubDir) {
+            // changing destinationRoot to the subfolder
+            this.destinationRoot(this.destinationPath(this.options.solutionName));
+            // we need to manually update cwd to point to the subfolder as this.destinationRoot() will not do it
+            this.env.cwd = this.destinationRoot();
+            this.config.set('whichFolder', 'subdir');
+        }
         if (this.options.solutionName !== undefined) {
             this.config.set('solutionName', this.options.solutionName);
         }
+        if (this.options.solutionShortDescription !== undefined) {
+            this.config.set('solutionShortDescription', this.options.solutionShortDescription);
+        }
         if (this.options.environment !== undefined) {
             this.config.set('environment', this.options.environment);
         }
@@ -88,8 +99,17 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
         else {
             this.config.set('extensionType', undefined);
         }
+        if (this.options.aceTemplateType !== undefined) {
+            this.config.set('aceTemplateType', this.options.aceTemplateType);
+        }
+        else {
+            this.config.set('aceTemplateType', undefined);
+        }
         if (this.options.framework !== undefined) {
-            this.config.set('framework', this.options.framework);
+            this.config.set('template', this.options.framework);
+        }
+        if (this.options.template !== undefined) {
+            this.config.set('template', this.options.template);
         }
         if (this.options.componentName !== undefined) {
             this.config.set('componentName', this.options.componentName);
@@ -169,9 +189,16 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
         const componentTypeUpper = componentType.charAt(0).toUpperCase() + componentType.slice(1);
         if (this.options.componentName) {
             const webpartName = colors_1.default.cyan(this.options.componentName);
-            const frameworkWords = this.options.framework && this.options.framework !== 'none'
-                ? ' with ' + colors_1.default.cyan(this.options.framework) + ' framework'
-                : '';
+            let frameworkWords = this.options.template;
+            if (!frameworkWords) {
+                frameworkWords = this.options.framework;
+            }
+            if (frameworkWords) {
+                frameworkWords = ' with ' + colors_1.default.cyan(frameworkWords) + ' framework';
+            }
+            else {
+                frameworkWords = '';
+            }
             this.log(`${componentType === 'extension' ? 'An' : 'A'} ${componentType} with the name ${webpartName}` +
                 ` will be added to your solution${frameworkWords}.`);
         }