@microsoft/generator-sharepoint 1.14.0-beta.4 → 1.14.0-beta.5

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 (25) 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/app/index.js +5 -1
  18. package/lib/generators/component/BaseComponentGenerator.d.ts.map +1 -1
  19. package/lib/generators/component/BaseComponentGenerator.js +4 -11
  20. package/lib/generators/solution/index.d.ts.map +1 -1
  21. package/lib/generators/solution/index.js +14 -60
  22. package/lib/generators/solution/templates/base/.vscode/launch.json +1 -5
  23. package/lib/generators/webpart/templates/react/components/{componentName}.tsx +1 -1
  24. package/package.json +3 -3
  25. package/lib/generators/solution/templates/base/.vscode/extensions.json +0 -5
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.14.0-beta.4",
4
- "@microsoft/sp-property-pane": "1.14.0-beta.4",
5
- "@microsoft/sp-adaptive-card-extension-base": "1.14.0-beta.4"
3
+ "@microsoft/sp-core-library": "1.14.0-beta.5",
4
+ "@microsoft/sp-property-pane": "1.14.0-beta.5",
5
+ "@microsoft/sp-adaptive-card-extension-base": "1.14.0-beta.5"
6
6
  },
7
7
  "devDependencies": {
8
- "@microsoft/sp-build-web": "1.14.0-beta.4",
9
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
10
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
8
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
9
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
10
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
11
11
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
12
12
  }
13
13
  }
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.14.0-beta.4",
4
- "@microsoft/sp-property-pane": "1.14.0-beta.4",
5
- "@microsoft/sp-adaptive-card-extension-base": "1.14.0-beta.4"
3
+ "@microsoft/sp-core-library": "1.14.0-beta.5",
4
+ "@microsoft/sp-property-pane": "1.14.0-beta.5",
5
+ "@microsoft/sp-adaptive-card-extension-base": "1.14.0-beta.5"
6
6
  },
7
7
  "devDependencies": {
8
- "@microsoft/sp-build-web": "1.14.0-beta.4",
9
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
10
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
8
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
9
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
10
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
11
11
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
12
12
  }
13
13
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-dialog": "1.14.0-beta.4",
4
- "@microsoft/sp-application-base": "1.14.0-beta.4"
3
+ "@microsoft/sp-dialog": "1.14.0-beta.5",
4
+ "@microsoft/sp-application-base": "1.14.0-beta.5"
5
5
  }
6
6
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-dialog": "1.14.0-beta.4",
4
- "@microsoft/sp-application-base": "1.14.0-beta.4"
3
+ "@microsoft/sp-dialog": "1.14.0-beta.5",
4
+ "@microsoft/sp-application-base": "1.14.0-beta.5"
5
5
  }
6
6
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.14.0-beta.4",
4
- "@microsoft/sp-dialog": "1.14.0-beta.4"
3
+ "@microsoft/sp-listview-extensibility": "1.14.0-beta.5",
4
+ "@microsoft/sp-dialog": "1.14.0-beta.5"
5
5
  }
6
6
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.14.0-beta.4",
4
- "@microsoft/sp-dialog": "1.14.0-beta.4"
3
+ "@microsoft/sp-listview-extensibility": "1.14.0-beta.5",
4
+ "@microsoft/sp-dialog": "1.14.0-beta.5"
5
5
  }
6
6
  }
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.14.0-beta.4",
4
- "@microsoft/decorators": "1.14.0-beta.4"
3
+ "@microsoft/sp-core-library": "1.14.0-beta.5",
4
+ "@microsoft/decorators": "1.14.0-beta.5"
5
5
  },
6
6
  "devDependencies": {
7
- "@microsoft/sp-build-web": "1.14.0-beta.4",
8
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
9
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
7
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
8
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
9
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
10
10
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
11
11
  }
12
12
  }
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.14.0-beta.4",
4
- "@microsoft/decorators": "1.14.0-beta.4"
3
+ "@microsoft/sp-core-library": "1.14.0-beta.5",
4
+ "@microsoft/decorators": "1.14.0-beta.5"
5
5
  },
6
6
  "devDependencies": {
7
- "@microsoft/sp-build-web": "1.14.0-beta.4",
8
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
9
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
7
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
8
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
9
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
10
10
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
11
11
  }
12
12
  }
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.14.0-beta.4"
3
+ "@microsoft/sp-listview-extensibility": "1.14.0-beta.5"
4
4
  }
5
5
  }
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-listview-extensibility": "1.14.0-beta.4"
3
+ "@microsoft/sp-listview-extensibility": "1.14.0-beta.5"
4
4
  }
5
5
  }
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "dependencies": {},
3
3
  "devDependencies": {
4
- "@microsoft/sp-build-web": "1.14.0-beta.4",
5
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
6
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
4
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
5
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
6
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
7
7
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
8
8
  }
9
9
  }
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "dependencies": {},
3
3
  "devDependencies": {
4
- "@microsoft/sp-build-web": "1.14.0-beta.4",
5
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
6
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
4
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
5
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
6
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
7
7
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
8
8
  }
9
9
  }
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-search-extensibility": "1.14.0-beta.4"
3
+ "@microsoft/sp-search-extensibility": "1.14.0-beta.5"
4
4
  }
5
5
  }
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-search-extensibility": "1.14.0-beta.4"
3
+ "@microsoft/sp-search-extensibility": "1.14.0-beta.5"
4
4
  }
5
5
  }
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.14.0-beta.4",
4
- "@microsoft/sp-property-pane": "1.14.0-beta.4",
5
- "@microsoft/sp-webpart-base": "1.14.0-beta.4",
6
- "@microsoft/sp-lodash-subset": "1.14.0-beta.4",
7
- "@microsoft/sp-office-ui-fabric-core": "1.14.0-beta.4"
3
+ "@microsoft/sp-core-library": "1.14.0-beta.5",
4
+ "@microsoft/sp-property-pane": "1.14.0-beta.5",
5
+ "@microsoft/sp-webpart-base": "1.14.0-beta.5",
6
+ "@microsoft/sp-lodash-subset": "1.14.0-beta.5",
7
+ "@microsoft/sp-office-ui-fabric-core": "1.14.0-beta.5"
8
8
  },
9
9
  "devDependencies": {
10
- "@microsoft/sp-build-web": "1.14.0-beta.4",
11
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
12
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
10
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
11
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
12
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
13
13
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
14
14
  }
15
15
  }
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "dependencies": {
3
- "@microsoft/sp-core-library": "1.14.0-beta.4",
4
- "@microsoft/sp-property-pane": "1.14.0-beta.4",
5
- "@microsoft/sp-webpart-base": "1.14.0-beta.4",
6
- "@microsoft/sp-lodash-subset": "1.14.0-beta.4",
7
- "@microsoft/sp-office-ui-fabric-core": "1.14.0-beta.4"
3
+ "@microsoft/sp-core-library": "1.14.0-beta.5",
4
+ "@microsoft/sp-property-pane": "1.14.0-beta.5",
5
+ "@microsoft/sp-webpart-base": "1.14.0-beta.5",
6
+ "@microsoft/sp-lodash-subset": "1.14.0-beta.5",
7
+ "@microsoft/sp-office-ui-fabric-core": "1.14.0-beta.5"
8
8
  },
9
9
  "devDependencies": {
10
- "@microsoft/sp-build-web": "1.14.0-beta.4",
11
- "@microsoft/sp-tslint-rules": "1.14.0-beta.4",
12
- "@microsoft/sp-module-interfaces": "1.14.0-beta.4",
10
+ "@microsoft/sp-build-web": "1.14.0-beta.5",
11
+ "@microsoft/sp-tslint-rules": "1.14.0-beta.5",
12
+ "@microsoft/sp-module-interfaces": "1.14.0-beta.5",
13
13
  "@microsoft/rush-stack-compiler-3.9": "0.4.47"
14
14
  }
15
15
  }
@@ -58,7 +58,8 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
58
58
  Solution.defineOptions(this);
59
59
  }
60
60
  initializing() {
61
- this.log(yosay('Welcome to the ' + colors_1.default.blue(`SharePoint Client-side Solution Generator@${VERSION}`)));
61
+ this.log(yosay('Welcome to the SharePoint Online ' + colors_1.default.blue(`SPFx Yeoman Generator@${VERSION}`)));
62
+ this._provideRetirementNote();
62
63
  this._explainArguments();
63
64
  this.context.creatingSolution = !YeomanConfiguration_1.YeomanConfiguration.libraryName;
64
65
  const shouldUseSubDir = this.options.solutionName !== undefined;
@@ -162,6 +163,9 @@ class AppGenerator extends BaseGenerator_1.BaseGenerator {
162
163
  const libraryName = YeomanConfiguration_1.YeomanConfiguration.libraryName;
163
164
  this.log(spsay_1.default(libraryName));
164
165
  }
166
+ _provideRetirementNote() {
167
+ this.log(colors_1.default.green("NOTE: some of the options have been retired in favor of their defaults. You can change these settings in ./config/package-solution.json and component's manifest."));
168
+ }
165
169
  _explainArguments() {
166
170
  // If the CLI argument is specified, the corresponding prompting in sub-generators will be skipped.
167
171
  // The following calls do similar jobs as prompting. Place them here instead of initializing step.
@@ -1 +1 @@
1
- {"version":3,"file":"BaseComponentGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/component/BaseComponentGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7D,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI7F,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,YAAY;IAC/E,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC5C,IAAI,EAAE,MAAM,GACX,IAAI,CAkBN;AAED,8BAAsB,sBAAsB,CAC1C,QAAQ,SAAS,qBAAqB,EACtC,QAAQ,SAAS,qBAAqB,CACtC,SAAQ,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACzC,mEAAmE;IACnE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACjD,0GAA0G;IAC1G,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC7C,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;IAE5D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyG1B,WAAW,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI;IAkC9C,OAAO,CAAC,WAAW,GAAE,OAAc,GAAG,IAAI;IAU1C,OAAO,IAAI,IAAI;IAOtB,SAAS,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM;IAIlE,OAAO,CAAC,aAAa;CAStB;AAED,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,uBAAuB,CACrC,sBAAsB,EAAE,MAAM,EAC9B,aAAa,EAAE,MAAM,GACpB,yBAAyB,CA0C3B"}
1
+ {"version":3,"file":"BaseComponentGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/component/BaseComponentGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7D,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI7F,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,YAAY;IAC/E,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,aAAa,CAAC,QAAQ,SAAS,YAAY,EAAE,QAAQ,EACnE,SAAS,EAAE,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC5C,IAAI,EAAE,MAAM,GACX,IAAI,CAkBN;AAED,8BAAsB,sBAAsB,CAC1C,QAAQ,SAAS,qBAAqB,EACtC,QAAQ,SAAS,qBAAqB,CACtC,SAAQ,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACzC,mEAAmE;IACnE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IACjD,0GAA0G;IAC1G,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC7C,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,CAAC;IAE5D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgG1B,WAAW,CAAC,WAAW,CAAC,EAAE,aAAa,GAAG,IAAI;IAkC9C,OAAO,CAAC,WAAW,GAAE,OAAc,GAAG,IAAI;IAU1C,OAAO,IAAI,IAAI;IAOtB,SAAS,CAAC,gBAAgB,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM;IAIlE,OAAO,CAAC,aAAa;CAStB;AAED,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,2BAA2B,EAAE,MAAM,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,uBAAuB,CACrC,sBAAsB,EAAE,MAAM,EAC9B,aAAa,EAAE,MAAM,GACpB,yBAAyB,CA0C3B"}
@@ -54,7 +54,7 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
54
54
  prompting() {
55
55
  return this.checkSolution().then(() => {
56
56
  const availableTemplates = [
57
- { name: 'No JavaScript framework', value: 'none' }
57
+ { name: 'No framework', value: 'none' }
58
58
  ];
59
59
  if (this.allowedTemplates.indexOf('react') !== -1) {
60
60
  availableTemplates.push({ name: 'React', value: 'react' });
@@ -86,14 +86,6 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
86
86
  }
87
87
  // required: true
88
88
  },
89
- {
90
- type: 'input',
91
- name: 'componentDescription',
92
- when: () => !this.config.get('componentDescription'),
93
- message: `What is your ${this.friendlyName} description?`,
94
- default: (answers) => `${this.config.get('componentName') || answers.componentName} description`
95
- // required: true
96
- },
97
89
  {
98
90
  type: 'list',
99
91
  name: 'template',
@@ -104,12 +96,13 @@ class BaseComponentGenerator extends BaseGenerator_1.BaseGenerator {
104
96
  choices: availableTemplates
105
97
  }
106
98
  ]).then((answers) => {
99
+ const componentName = this.config.get('componentName') || answers.componentName;
107
100
  this.context.template =
108
101
  this.config.get('framework') || this.config.get('template') || answers.template || 'none';
109
102
  this.context.componentDescription =
110
- this.config.get('componentDescription') || answers.componentDescription || '';
103
+ this.config.get('componentDescription') || `${componentName} description`;
111
104
  this.context.componentId = Utils.generateGuid();
112
- const normalizedNames = normalizeComponentNames(this.config.get('componentName') || answers.componentName, this.codeName);
105
+ const normalizedNames = normalizeComponentNames(componentName, this.codeName);
113
106
  this.context.componentNameUnescaped = normalizedNames.componentNameUnescaped;
114
107
  this.context.componentName = normalizedNames.componentName;
115
108
  this.context.componentNameCamelCase = normalizedNames.componentNameCamelCase;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/solution/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIzE,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,CAAC;IACjC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,KAAK,CAAC;IACnB,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,WAAW,EAAE,MAAM,CAAiD;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB;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,SAAS,EAAE,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,IAAI,CA8BhG"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generators/solution/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAIzE,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,CAAC;IACjC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,WAAW,EAAE,KAAK,CAAC;IACnB,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,WAAW,EAAE,MAAM,CAAiD;IACpE,SAAS,EAAE,MAAM,CAAC;CACnB;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,SAAS,EAAE,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,IAAI,CA8BhG"}
@@ -18,14 +18,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
18
18
  __setModuleDefault(result, mod);
19
19
  return result;
20
20
  };
21
- var __importDefault = (this && this.__importDefault) || function (mod) {
22
- return (mod && mod.__esModule) ? mod : { "default": mod };
23
- };
24
21
  Object.defineProperty(exports, "__esModule", { value: true });
25
22
  exports.defineOptions = exports.composeWith = void 0;
26
23
  const lodash = __importStar(require("lodash"));
27
24
  const path = __importStar(require("path"));
28
- const colors_1 = __importDefault(require("colors"));
29
25
  const Utils = __importStar(require("../../common/utilities"));
30
26
  const BaseGenerator_1 = require("../../common/BaseGenerator");
31
27
  const YeomanConfiguration_1 = require("../../common/YeomanConfiguration");
@@ -85,30 +81,11 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
85
81
  default: lodash.kebabCase(this.appname),
86
82
  when: () => !this.config.get('solutionName'),
87
83
  message: 'What is your solution name?'
88
- },
89
- {
90
- type: 'input',
91
- name: 'solutionShortDescription',
92
- when: () => !this.config.get('solutionShortDescription'),
93
- message: 'Enter a short description for your solution?',
94
- default: (answers) => `${this.config.get('solutionName') || answers.solutionName} description`
95
- },
96
- {
97
- type: 'list',
98
- name: 'environment',
99
- when: () => !this.config.get('environment'),
100
- message: 'Only SharePoint Online (latest) is supported. For earlier versions of SharePoint (2016 and 2019) please use the 1.4.1 version of the generator.',
101
- default: 'spo',
102
- choices: [{ name: 'SharePoint Online only (latest)', value: 'spo' }]
103
84
  }
104
- ])
105
- .then((answers) => {
106
- if (!this.config.get('environment')) {
107
- this.config.set('environment', answers.environment);
108
- }
109
- const environment = this.config.get('environment');
110
- const solutionName = this.config.get('solutionName');
111
- const solutionShortDescription = this.config.get('solutionShortDescription') || answers.solutionShortDescription;
85
+ ]).then((answers) => {
86
+ const environment = 'spo';
87
+ const solutionName = this.config.get('solutionName') || answers.solutionName;
88
+ const solutionShortDescription = this.config.get('solutionShortDescription') || `${solutionName} description`;
112
89
  // allows to set --skip-feature-deployment false
113
90
  let skipFeatureDeployment = undefined;
114
91
  const skipFeatureDeploymentConfig = this.config.get('skipFeatureDeployment');
@@ -120,6 +97,9 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
120
97
  skipFeatureDeployment = skipFeatureDeploymentConfig;
121
98
  }
122
99
  }
100
+ else {
101
+ skipFeatureDeployment = true;
102
+ }
123
103
  const componentType = this.config.get('componentType');
124
104
  const extensionType = this.config.get('extensionType');
125
105
  const template = this.config.get('framework') || this.config.get('template');
@@ -137,11 +117,16 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
137
117
  isDomainIsolated = isDomainIsolatedConfig;
138
118
  }
139
119
  }
120
+ else {
121
+ isDomainIsolated = false;
122
+ }
140
123
  const isPlusBeta = this.config.get('plusBeta');
141
- this.context.solutionName = this.config.get('solutionName') || answers.solutionName;
124
+ this.context.solutionName = solutionName;
142
125
  this.context.libraryName = lodash.kebabCase(this.context.solutionName);
143
126
  this.context.libraryId = Utils.generateGuid();
144
127
  this.context.solutionShortDescription = solutionShortDescription;
128
+ this.context.skipFeatureDeployment = skipFeatureDeployment;
129
+ this.context.isDomainIsolated = isDomainIsolated;
145
130
  // store some variables
146
131
  YeomanConfiguration_1.YeomanConfiguration.version = BaseGenerator_1.BaseGenerator.generatorPackageJson.version;
147
132
  YeomanConfiguration_1.YeomanConfiguration.libraryName = this.context.libraryName;
@@ -150,6 +135,7 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
150
135
  YeomanConfiguration_1.YeomanConfiguration.packageManager =
151
136
  this.config.get('packageManager') || YeomanConfiguration_1.YeomanConfiguration.packageManager || 'npm';
152
137
  this.config.set('solutionName', solutionName);
138
+ this.config.set('environment', environment);
153
139
  this.config.set('solutionShortDescription', solutionShortDescription);
154
140
  this.config.set('skipFeatureDeployment', skipFeatureDeployment);
155
141
  this.config.set('componentType', componentType);
@@ -160,38 +146,6 @@ class SolutionGenerator extends BaseGenerator_1.BaseGenerator {
160
146
  this.config.set('isCreatingSolution', isCreatingSolution);
161
147
  this.config.set('isDomainIsolated', isDomainIsolated);
162
148
  this.config.set('plusBeta', isPlusBeta);
163
- })
164
- .then(() => {
165
- if (this.config.get('skipFeatureDeployment') === undefined) {
166
- this.log(colors_1.default.green('The ability for the tenant admin to immediately deploy the solution to all sites' +
167
- ' without running any feature deployment (tenant-wide deployment) is enabled by default.' +
168
- ' You can change this by setting the skipFeatureDeployment property to false in ./config/package-solution.json.'));
169
- this.context.skipFeatureDeployment = true;
170
- }
171
- else {
172
- this.context.skipFeatureDeployment = this.config.get('skipFeatureDeployment');
173
- }
174
- })
175
- .then(() => {
176
- return this.prompt([
177
- {
178
- type: 'confirm',
179
- name: 'isDomainIsolated',
180
- default: false,
181
- when: () => YeomanConfiguration_1.YeomanConfiguration.environment === 'spo' && this.config.get('isDomainIsolated') === undefined,
182
- message: 'Will the components in the solution require permissions to access ' +
183
- 'web APIs that are unique and not shared with other components in the tenant?'
184
- }
185
- ]);
186
- })
187
- .then((answers) => {
188
- if (YeomanConfiguration_1.YeomanConfiguration.environment === 'spo') {
189
- if (this.config.get('isDomainIsolated') === undefined) {
190
- this.config.set('isDomainIsolated', answers.isDomainIsolated);
191
- }
192
- this.context.isDomainIsolated = this.config.get('isDomainIsolated');
193
- }
194
- // make sure we store the updated context values
195
149
  this.packageSolutionJson.setUpSolution(this.context);
196
150
  });
197
151
  }
@@ -1,13 +1,9 @@
1
1
  {
2
- /**
3
- * Install Chrome Debugger Extension for Visual Studio Code to debug your components with the
4
- * Chrome browser: https://aka.ms/spfx-debugger-extensions
5
- */
6
2
  "version": "0.2.0",
7
3
  "configurations": [
8
4
  {
9
5
  "name": "Hosted workbench",
10
- "type": "chrome",
6
+ "type": "pwa-chrome",
11
7
  "request": "launch",
12
8
  "url": "https://enter-your-SharePoint-site/_layouts/workbench.aspx",
13
9
  "webRoot": "${workspaceRoot}",
@@ -17,7 +17,7 @@ export default class <%= componentName %> extends React.Component<I<%= component
17
17
  <section className={`${styles.<%= componentNameCamelCase %>} ${hasTeamsContext ? styles.teams : ''}`}>
18
18
  <div className={styles.welcome}>
19
19
  <img alt="" src={isDarkTheme ? require('../assets/welcome-dark.png') : require('../assets/welcome-light.png')} className={styles.welcomeImage} />
20
- <h2>Well done, ${escape(userDisplayName)}!</h2>
20
+ <h2>Well done, {escape(userDisplayName)}!</h2>
21
21
  <div>{environmentMessage}</div>
22
22
  <div>Web part property value: <strong>{escape(description)}</strong></div>
23
23
  </div>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/generator-sharepoint",
3
- "version": "1.14.0-beta.4",
3
+ "version": "1.14.0-beta.5",
4
4
  "description": "Yeoman generator for the SharePoint Framework",
5
5
  "scripts": {},
6
6
  "engines": {
@@ -13,8 +13,8 @@
13
13
  "homepage": "http://aka.ms/spfx",
14
14
  "main": "lib/generators/app/index.js",
15
15
  "dependencies": {
16
- "@microsoft/spfx-heft-plugins": "1.14.0-beta.4",
17
- "@rushstack/node-core-library": "3.42.2",
16
+ "@microsoft/spfx-heft-plugins": "1.14.0-beta.5",
17
+ "@rushstack/node-core-library": "3.45.0",
18
18
  "colors": "~1.2.1",
19
19
  "lodash": "4.17.21",
20
20
  "update-notifier": "5.1.0",
@@ -1,5 +0,0 @@
1
- {
2
- "recommendations": [
3
- "msjsdiag.debugger-for-chrome"
4
- ]
5
- }