Skip to content

Commit 788e12e

Browse files
iclantoniclanton
committed
Merge branch 'master' into ianc/fixing-gcb-package-json
2 parents 3d13308 + 645403a commit 788e12e

File tree

74 files changed

+1811
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1811
-141
lines changed

‎README.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,28 @@ engine.
158158

159159
[![npm version](https://badge.fury.io/js/%40microsoft%2Fts-command-line.svg)](https://badge.fury.io/js/%40microsoft%2Fts-command-line)
160160
[![Dependencies](https://david-dm.org/Microsoft/ts-command-line.svg)](https://david-dm.org/Microsoft/ts-command-line)
161+
162+
163+
## Webpack Loaders and Plugins
164+
165+
### [@microsoft/loader-set-webpack-public-path](./webpack/loader-set-webpack-public-path/README.md)
166+
167+
`loader-set-webpack-public-path` is a loader used to set the webpack public path variable.
168+
169+
[![npm version](https://badge.fury.io/js/%40microsoft%2Floader-set-webpack-public-path.svg)](https://badge.fury.io/js/%40microsoft%2Floader-set-webpack-public-path)
170+
[![Dependencies](https://david-dm.org/Microsoft/loader-set-webpack-public-path.svg)](https://david-dm.org/Microsoft/loader-set-webpack-public-path)
171+
172+
### [@microsoft/loader-load-themed-styles](./webpack/loader-load-themed-styles/README.md)
173+
174+
`loader-load-themed-styles` is a loader used for loading themed CSS styles.
175+
176+
[![npm version](https://badge.fury.io/js/%40microsoft%2Floader-load-themed-styles.svg)](https://badge.fury.io/js/%40microsoft%2Floader-load-themed-styles)
177+
[![Dependencies](https://david-dm.org/Microsoft/loader-load-themed-styles.svg)](https://david-dm.org/Microsoft/loader-load-themed-styles)
178+
179+
### [@microsoft/loader-raw-script](./webpack/loader-raw-script/README.md)
180+
181+
`loader-raw-script` is a loader used for loading scripts with an `eval` statement.
182+
183+
[![npm version](https://badge.fury.io/js/%40microsoft%2Floader-raw-script.svg)](https://badge.fury.io/js/%40microsoft%2Floader-raw-script)
184+
[![Dependencies](https://david-dm.org/Microsoft/loader-raw-script.svg)](https://david-dm.org/Microsoft/loader-raw-script)
185+

‎apps/rush-lib/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"z-schema": "~3.17.0"
2929
},
3030
"devDependencies": {
31-
"@microsoft/node-library-build": ">=3.0.1 <4.0.0",
31+
"@microsoft/node-library-build": "~3.0.1",
3232
"chai": "~3.5.0",
3333
"gulp": "~3.9.1",
34-
"mocha": "~2.5.3",
34+
"mocha": "~3.4.2",
3535
"sinon": "~1.17.3",
3636
"@types/sinon": "1.16.34",
3737
"@types/mocha": "2.2.38",

‎apps/rush/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"wordwrap": "~1.0.0"
4747
},
4848
"devDependencies": {
49-
"@microsoft/node-library-build": ">=3.0.1 <4.0.0",
49+
"@microsoft/node-library-build": "~3.0.1",
5050
"@types/chai": "3.4.34",
5151
"@types/es6-collections": "0.5.29",
5252
"@types/fs-extra": "0.0.37",

‎common/changes/@microsoft/api-extractor/ianc-moving-lts-to-wbt_2017-06-28-23-14.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎common/changes/@microsoft/gulp-core-build/ianc-moving-lts-to-wbt_2017-06-28-23-14.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎common/changes/@microsoft/gulp-core-build/nickpape-test_2017-06-27-23-16.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎common/changes/@microsoft/load-themed-styles/ianc-moving-lts-to-wbt_2017-06-28-23-14.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎common/changes/@microsoft/web-library-build/nickpape-test_2017-06-27-23-16.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎common/config/rush/nonbrowser-approved-packages.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,10 @@
261261
"name": "karma-webpack",
262262
"allowedCategories": [ "libraries" ]
263263
},
264+
{
265+
"name": "loader-utils",
266+
"allowedCategories": [ "libraries" ]
267+
},
264268
{
265269
"name": "lodash",
266270
"allowedCategories": [ "libraries" ]
@@ -357,6 +361,10 @@
357361
"name": "typescript",
358362
"allowedCategories": [ "libraries" ]
359363
},
364+
{
365+
"name": "uglify-js",
366+
"allowedCategories": [ "libraries" ]
367+
},
360368
{
361369
"name": "webpack",
362370
"allowedCategories": [ "libraries" ]

0 commit comments

Comments
 (0)