Merge branch 'master' into pgonzal/rushx

pgonzal · web-flow · commit d047287f072b · 2018-06-06T17:49:44.000-07:00
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.json b/webpack/loader-load-themed-styles/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
   "entries": [
+    {
+      "version": "1.7.43",
+      "tag": "@microsoft/loader-load-themed-styles_v1.7.43",
+      "date": "Tue, 05 Jun 2018 21:04:43 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Updated getter comment"
+          }
+        ]
+      }
+    },
     {
       "version": "1.7.42",
       "tag": "@microsoft/loader-load-themed-styles_v1.7.42",
diff --git a/webpack/loader-load-themed-styles/CHANGELOG.md b/webpack/loader-load-themed-styles/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @microsoft/loader-load-themed-styles
 
-This log was last generated on Thu, 31 May 2018 01:39:33 GMT and should not be manually modified.
+This log was last generated on Tue, 05 Jun 2018 21:04:43 GMT and should not be manually modified.
+
+## 1.7.43
+Tue, 05 Jun 2018 21:04:43 GMT
+
+### Patches
+
+- Updated getter comment
 
 ## 1.7.42
 Thu, 31 May 2018 01:39:33 GMT
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/loader-load-themed-styles",
-  "version": "1.7.42",
+  "version": "1.7.43",
   "description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
diff --git a/webpack/loader-load-themed-styles/src/LoadThemedStylesLoader.ts b/webpack/loader-load-themed-styles/src/LoadThemedStylesLoader.ts
@@ -48,7 +48,7 @@ export class LoadThemedStylesLoader {
   }
 
   /**
-   * Use this property to override the path to the @microsoft/load-themed-styles package.
+   * Use this property to get the path to the loader package (defaults to the path to @microsoft/load-themed-styles).
    */
   public static get loadedThemedStylesPath(): string {
     return LoadThemedStylesLoader._loadedThemedStylesPath;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@microsoft/loader-load-themed-styles",`
`3`		`- "version": "1.7.42",`
	`3`	`+ "version": "1.7.43",`
`4`	`4`	"description": "This simple loader wraps the loading of CSS in script equivalent to `require('load-themed-styles').loadStyles( /* css text */ )`. It is designed to be a replacement for style-loader.",
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"typings": "lib/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export class LoadThemedStylesLoader {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * Use this property to override the path to the @microsoft/load-themed-styles package.`
	`51`	`+ * Use this property to get the path to the loader package (defaults to the path to @microsoft/load-themed-styles).`
`52`	`52`	`*/`
`53`	`53`	`public static get loadedThemedStylesPath(): string {`
`54`	`54`	`return LoadThemedStylesLoader._loadedThemedStylesPath;`