X Tutup
Skip to content

Commit de86b0f

Browse files
octogonzoctogonz
committed
Merge remote-tracking branch 'remotes/origin/master' into flattenNamespaces2
2 parents d15d6ca + ec88d5a commit de86b0f

File tree

14 files changed

+689
-400
lines changed

14 files changed

+689
-400
lines changed

‎apps/api-extractor/src/api/ExtractorConfig.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ interface IExtractorConfigParameters {
112112
omitTrimmingComments: boolean;
113113
tsdocMetadataEnabled: boolean;
114114
tsdocMetadataFilePath: string;
115-
newlineKind: string;
115+
newlineKind: NewlineKind;
116116
messages: IExtractorMessagesConfig;
117117
testMode: boolean;
118118
}
@@ -230,6 +230,7 @@ export class ExtractorConfig {
230230
this.omitTrimmingComments = parameters.omitTrimmingComments;
231231
this.tsdocMetadataEnabled = parameters.tsdocMetadataEnabled;
232232
this.tsdocMetadataFilePath = parameters.tsdocMetadataFilePath;
233+
this.newlineKind = parameters.newlineKind;
233234
this.messages = parameters.messages;
234235
this.testMode = parameters.testMode;
235236
}

‎common/changes/@microsoft/api-extractor/octogonz-ae-newlines-fix_2019-11-20-03-46.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/api-extractor",
5+
"comment": "Fix an issue where the newlineKind setting wasn't being applied correctly",
6+
"type": "patch"
7+
}
8+
],
9+
"packageName": "@microsoft/api-extractor",
10+
"email": "4673363+octogonz@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/gulp-core-build-webpack/octogonz-ae-newlines-fix_2019-11-20-04-21.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/gulp-core-build-webpack",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/gulp-core-build-webpack",
10+
"email": "4673363+octogonz@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/gulp-core-build-webpack/octogonz-ae-newlines-fix_2019-11-20-05-21.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/gulp-core-build-webpack",
5+
"comment": "Upgrade to Webpack 4.",
6+
"type": "major"
7+
}
8+
],
9+
"packageName": "@microsoft/gulp-core-build-webpack",
10+
"email": "iclanton@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/loader-load-themed-styles/octogonz-ae-newlines-fix_2019-11-20-04-21.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/loader-load-themed-styles",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/loader-load-themed-styles",
10+
"email": "4673363+octogonz@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/resolve-chunk-plugin/octogonz-ae-newlines-fix_2019-11-20-04-21.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/resolve-chunk-plugin",
5+
"comment": "Convert `@types/webpack` to a peer dependency",
6+
"type": "patch"
7+
}
8+
],
9+
"packageName": "@microsoft/resolve-chunk-plugin",
10+
"email": "4673363+octogonz@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/set-webpack-public-path-plugin/octogonz-ae-newlines-fix_2019-11-20-04-21.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/set-webpack-public-path-plugin",
5+
"comment": "Convert `@types/webpack` to a peer dependency",
6+
"type": "patch"
7+
}
8+
],
9+
"packageName": "@microsoft/set-webpack-public-path-plugin",
10+
"email": "4673363+octogonz@users.noreply.github.com"
11+
}

‎common/config/rush/common-versions.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
"typescript": "~3.4.3",
2626

2727
// Workaround for https://github.com/microsoft/rushstack/issues/1466
28-
"eslint": "~6.5.1"
28+
"eslint": "~6.5.1",
29+
30+
"@types/webpack": "4.39.8"
2931
},
3032

3133
/**

0 commit comments

Comments
 (0)
X Tutup