@microsoft/generator-sharepoint 1.13.0-beta.20 → 1.13.0-beta.22

package/lib/generators/webpart/templates/react/{componentClassName}.ts

@@ -6,12 +6,6 @@ import {
   PropertyPaneTextField
 } from '@microsoft/sp-property-pane';
 import { BaseClientSideWebPart } from '@microsoft/sp-webpart-base';
-import {
-  ThemeProvider,
-  ThemeChangedEventArgs,
-  IReadonlyTheme,
-  ITheme
-} from '@microsoft/sp-component-base';
 
 import * as strings from '<%= componentStrings %>';
 import <%= componentName %> from './components/<%= componentName %>';
@@ -23,150 +17,19 @@ export interface I<%= componentClassName %>Props {
 
 export default class <%= componentClassName %> extends BaseClientSideWebPart<I<%= componentClassName %>Props> {
 
-  private _themeProvider: ThemeProvider;
-  private _themeVariant: IReadonlyTheme | undefined;
-  private _isDarkTheme: boolean = false;
-  private _environmentMessage: string = '';
-  private _hasTeamsContext: boolean = false;
-
-  protected onInit(): Promise<void> {
-    this._hasTeamsContext = !!this.context.sdks.microsoftTeams;
-
-    if (this._hasTeamsContext) {
-      // handling MS Teams theme
-      const teamsTheme = this.context.sdks.microsoftTeams.context.theme;
-      this._updateTheme(teamsTheme);
-
-      this.context.sdks.microsoftTeams.teamsJs.registerOnThemeChangeHandler(this._handleTeamsThemeChangedEvent);
-    }
-    else {
-      // Consume the new ThemeProvider service
-      this._themeProvider = this.context.serviceScope.consume(ThemeProvider.serviceKey);
-    
-      // If it exists, get the theme variant
-      this._themeVariant = this._themeProvider.tryGetTheme();
-      this._updateTheme(this._themeVariant);
-    
-      // Register a handler to be notified if the theme variant changes
-      this._themeProvider.themeChangedEvent.add(this, this._handleSPThemeChangedEvent);
-    }
-
-    this._environmentMessage = this._getEnvironmentMessage();
-  
-    return super.onInit();
-  }
-
   public render(): void {
     const element: React.ReactElement<I<%= componentName %>Props> = React.createElement(
       <%= componentName %>,
       {
-        description: this.properties.description,
-        isDarkTheme: this._isDarkTheme,
-        environmentMessage: this._environmentMessage,
-        hasTeamsContext: this._hasTeamsContext,
-        userDisplayName: this.context.pageContext.user.displayName
+        description: this.properties.description
       }
     );
 
     ReactDom.render(element, this.domElement);
   }
 
-  /**
-   * Update the current theme variant reference and re-render.
-   *
-   * @param args The new theme
-   */
-   private _handleSPThemeChangedEvent = (args: ThemeChangedEventArgs): void => {
-    this._themeVariant = args.theme;
-    this._updateTheme(this._themeVariant);
-    this.render();
-  }
-
-  /**
-   * Handle Teams theme change callback.
-   *
-   * @param args The new theme
-   */
-   private _handleTeamsThemeChangedEvent = (theme: string): void => {
-    this._updateTheme(theme);
-    this.render();
-  }
-
-  /**
-   * Updates fields based on the new theme
-   * @param currentTheme updated theme
-   */
-  private _updateTheme = (currentTheme: IReadonlyTheme | string) => {
-    this._setIsDarkTheme(currentTheme);
-    this._setCSSVariables();
-  }
-
-  /**
-   * Updates the _isDarkTheme based on current SharePoint or Teams theme
-   */
-  private _setIsDarkTheme = (currentTheme: IReadonlyTheme | string) => {
-    if (typeof currentTheme === 'string') { // Teams theme
-      this._isDarkTheme = currentTheme !== 'default'; // contrast theme is interpreted as dark
-    }
-    else { // SharePoint theme
-      const theme = currentTheme as ITheme;
-      this._isDarkTheme = !!theme && !!theme.isInverted;
-    }
-  }
-
-  private _setCSSVariables = () => {
-    let primaryText = '#323130'; // default
-    let linkText = '#03787c';
-    if (this._themeVariant) {
-      const {
-        semanticColors
-      } = this._themeVariant;
-      primaryText = semanticColors.bodyText;
-      linkText = semanticColors.link;
-    }
-    else if (this._hasTeamsContext) { // fallback for Teams
-      primaryText = this._isDarkTheme ? '#FFFFFF' : '#242424';
-      linkText = this._isDarkTheme ? '#FFFFFF' : '#494B83';
-    }
-    else { // fallback for single app page
-      primaryText = this._isDarkTheme ? '#3a96dd' : '#323130';
-      linkText = this._isDarkTheme ? '#3a96dd' : '#03787c';
-    }
-
-    this.domElement.style.setProperty('--primaryText', primaryText);
-    this.domElement.style.setProperty('--linkText', linkText);
-  }
-
-  private _getEnvironmentMessage = (): string => {
-    // checking for local environment
-    let isLocal: boolean = false;
-    const {
-      loaderConfig
-    } = this.manifest;
-
-    if (loaderConfig && loaderConfig.internalModuleBaseUrls && loaderConfig.internalModuleBaseUrls.length) {
-      isLocal = /^http(s)?\:\/\/localhost/gmi.test(loaderConfig.internalModuleBaseUrls[0]);
-    }
-
-    if (this._hasTeamsContext) { // running in Teams
-      return isLocal ? strings.AppLocalEnvironmentTeams : strings.AppTeamsTabEnvironment;
-    }
-
-    return isLocal ? strings.AppLocalEnvironmentSharePoint : strings.AppSharePointEnvironment;
-  }
-
   protected onDispose(): void {
     ReactDom.unmountComponentAtNode(this.domElement);
-
-    //
-    // unregistering theme changed handlers
-    //
-    if (this._hasTeamsContext) {
-      this.context.sdks.microsoftTeams.teamsJs.registerOnThemeChangeHandler(null);
-    }
-    else {
-      this._themeProvider.themeChangedEvent.remove(this, this._handleSPThemeChangedEvent);
-    }
   }
 
   protected get dataVersion(): Version {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/generator-sharepoint",
-  "version": "1.13.0-beta.20",
+  "version": "1.13.0-beta.22",
   "description": "Yeoman generator for the SharePoint Framework",
   "scripts": {},
   "engines": {
@@ -13,13 +13,13 @@
   "homepage": "http://aka.ms/spfx",
   "main": "lib/generators/app/index.js",
   "dependencies": {
-    "@microsoft/spfx-heft-plugins": "1.13.0-beta.20",
+    "@microsoft/spfx-heft-plugins": "1.13.0-beta.22",
     "@rushstack/node-core-library": "3.40.0",
     "colors": "~1.2.1",
     "lodash": "4.17.21",
     "update-notifier": "5.1.0",
     "uuid": "~3.1.0",
-    "yeoman-generator": "5.0.0",
+    "yeoman-generator": "5.4.2",
     "yosay": "2.0.2"
   }
 }

package/lib/generators/solution/templates/base/config/copy-assets.json

@@ -1,4 +0,0 @@
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/spfx-build/copy-assets.schema.json",
-  "deployCdnPath": "./release/assets/"
-}