Skip to content

Commit

Permalink
Merge branch 'master' into ianc/improved-change-error
Browse files Browse the repository at this point in the history
  • Loading branch information
iclanton authored May 31, 2019
2 parents 59f1dbd + 5d49840 commit 42f3b3a
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build-tests/web-library-build-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@types/jest": "23.3.11",
"@microsoft/rush-stack-compiler-3.2": "0.3.14",
"@microsoft/load-themed-styles": "1.9.2",
"@microsoft/web-library-build": "7.0.39",
"@microsoft/web-library-build": "7.0.40",
"gulp": "~3.9.1"
}
}

This file was deleted.

12 changes: 12 additions & 0 deletions core-build/gulp-core-build-sass/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"name": "@microsoft/gulp-core-build-sass",
"entries": [
{
"version": "4.7.0",
"tag": "@microsoft/gulp-core-build-sass_v4.7.0",
"date": "Fri, 31 May 2019 01:13:07 GMT",
"comments": {
"minor": [
{
"comment": "Make css modules class hash names consistent relative to root path."
}
]
}
},
{
"version": "4.6.35",
"tag": "@microsoft/gulp-core-build-sass_v4.6.35",
Expand Down
9 changes: 8 additions & 1 deletion core-build/gulp-core-build-sass/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log - @microsoft/gulp-core-build-sass

This log was last generated on Mon, 27 May 2019 04:13:44 GMT and should not be manually modified.
This log was last generated on Fri, 31 May 2019 01:13:07 GMT and should not be manually modified.

## 4.7.0
Fri, 31 May 2019 01:13:07 GMT

### Minor changes

- Make css modules class hash names consistent relative to root path.

## 4.6.35
Mon, 27 May 2019 04:13:44 GMT
Expand Down
2 changes: 1 addition & 1 deletion core-build/gulp-core-build-sass/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/gulp-core-build-sass",
"version": "4.6.35",
"version": "4.7.0",
"description": "",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand Down
12 changes: 12 additions & 0 deletions core-build/web-library-build/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"name": "@microsoft/web-library-build",
"entries": [
{
"version": "7.0.40",
"tag": "@microsoft/web-library-build_v7.0.40",
"date": "Fri, 31 May 2019 01:13:07 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@microsoft/gulp-core-build-sass\" from `4.6.35` to `4.7.0`"
}
]
}
},
{
"version": "7.0.39",
"tag": "@microsoft/web-library-build_v7.0.39",
Expand Down
7 changes: 6 additions & 1 deletion core-build/web-library-build/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log - @microsoft/web-library-build

This log was last generated on Mon, 27 May 2019 04:13:44 GMT and should not be manually modified.
This log was last generated on Fri, 31 May 2019 01:13:07 GMT and should not be manually modified.

## 7.0.40
Fri, 31 May 2019 01:13:07 GMT

*Version update only*

## 7.0.39
Mon, 27 May 2019 04:13:44 GMT
Expand Down
4 changes: 2 additions & 2 deletions core-build/web-library-build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/web-library-build",
"version": "7.0.39",
"version": "7.0.40",
"description": "",
"engines": {
"npm": "3.10.8"
Expand All @@ -19,7 +19,7 @@
},
"dependencies": {
"@microsoft/gulp-core-build": "3.9.26",
"@microsoft/gulp-core-build-sass": "4.6.35",
"@microsoft/gulp-core-build-sass": "4.7.0",
"@microsoft/gulp-core-build-serve": "3.3.36",
"@microsoft/gulp-core-build-typescript": "8.1.12",
"@microsoft/gulp-core-build-webpack": "3.4.103",
Expand Down

0 comments on commit 42f3b3a

Please sign in to comment.