Skip to content

Commit 4775c8e

Browse files
pgonzalpgonzal
committed
Merge remote-tracking branch 'remotes/origin/master' into pgonzal/ae-tsdoc-1
# Conflicts: # common/config/rush/shrinkwrap.yaml
2 parents 7921fa1 + 1e81bf2 commit 4775c8e

File tree

20 files changed

+458
-252
lines changed

20 files changed

+458
-252
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ lib-es6
6262
dist
6363
temp
6464
*.scss.ts
65+
*.sass.ts
6566

6667
# Rush files
6768
common/temp/**

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,23 @@ export class ExtractorContext {
140140
if (sourceFile && start) {
141141
const lineAndCharacter: ts.LineAndCharacter = sourceFile.getLineAndCharacterOfPosition(start);
142142

143+
let filename2: string = sourceFile.fileName
144+
.replace(/\/lib\//g, '/src/')
145+
.replace(/\.d\.ts$/g, '.ts');
146+
147+
if (!FileSystem.exists(filename2)) {
148+
filename2 = sourceFile.fileName
149+
.replace(/\/lib\//g, '/src/')
150+
.replace(/\.d\.ts$/g, '.tsx');
151+
152+
if (!FileSystem.exists(filename2)) {
153+
filename2 = sourceFile.fileName;
154+
}
155+
}
156+
143157
// If the file is under the packageFolder, then show a relative path
144-
const relativePath: string = path.relative(this.packageFolder, sourceFile.fileName);
145-
const shownPath: string = relativePath.substr(0, 2) === '..' ? sourceFile.fileName : relativePath;
158+
const relativePath: string = path.relative(this.packageFolder, filename2);
159+
const shownPath: string = relativePath.substr(0, 2) === '..' ? filename2 : relativePath;
146160

147161
// Format the error so that VS Code can follow it. For example:
148162
// "src\MyClass.ts(15,1): The JSDoc tag "@blah" is not supported by AEDoc"

‎apps/rush-lib/src/api/VersionMismatchFinder.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,20 +149,22 @@ export class VersionMismatchFinder {
149149
];
150150

151151
dependencies.forEach((dependency: PackageJsonDependency) => {
152-
if (dependency.dependencyType !== DependencyType.Peer
153-
&& !project.cyclicDependencyProjects.has(dependency.name)) {
154-
152+
if (dependency.dependencyType !== DependencyType.Peer) {
155153
const version: string = dependency.version!;
156154

155+
const isCyclic: boolean = project.cyclicDependencyProjects.has(dependency.name);
156+
157157
if (this._isVersionAllowedAlternative(dependency.name, version)) {
158158
return;
159159
}
160160

161-
if (!this._mismatches.has(dependency.name)) {
162-
this._mismatches.set(dependency.name, new Map<string, string[]>());
161+
const name: string = dependency.name + (isCyclic ? ' (cyclic)' : '');
162+
163+
if (!this._mismatches.has(name)) {
164+
this._mismatches.set(name, new Map<string, string[]>());
163165
}
164166

165-
const dependencyVersions: Map<string, string[]> = this._mismatches.get(dependency.name)!;
167+
const dependencyVersions: Map<string, string[]> = this._mismatches.get(name)!;
166168

167169
if (!dependencyVersions.has(version)) {
168170
dependencyVersions.set(version, []);

‎apps/rush-lib/src/cli/actions/PublishAction.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,13 @@ export class PublishAction extends BaseRushAction {
252252
if (change.changeType && change.changeType > ChangeType.dependency) {
253253
const project: RushConfigurationProject | undefined = allPackages.get(change.packageName);
254254
if (project) {
255-
this._npmPublish(change.packageName, project.projectFolder);
255+
if (!this._packageExists(project)) {
256+
this._npmPublish(change.packageName, project.projectFolder);
257+
} else {
258+
console.log(`Skip ${change.packageName}. Package exists.`);
259+
}
260+
} else {
261+
console.log(`Skip ${change.packageName}. Failed to find its project.`);
256262
}
257263
}
258264
}

‎build-tests/web-library-build-test/src/test.sass

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
body
2+
background: red;
3+
4+
.foo
5+
border: 1px solid red;

‎build-tests/web-library-build-test/src/test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
22
// See LICENSE in the project root for license information.
33

4-
import test from './test.scss';
4+
import testScss from './test.scss';
5+
import testSass from './test.sass';
56
import testFunction from './preCopyTest';
67

78
/** @public */
@@ -16,7 +17,8 @@ export function add(num1: number, num2: number): number {
1617

1718
/** @public */
1819
export function logClass(): void {
19-
console.log(test.foo);
20+
console.log(testScss.foo);
21+
console.log(testSass.foo);
2022
}
2123

2224
testFunction();

‎common/changes/@microsoft/gulp-core-build-sass/ianc-sass-extension-support_2018-10-04-22-49.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-sass",
5+
"comment": "Refactor task to no longer use Gulp.",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@microsoft/gulp-core-build-sass",
10+
"email": "iclanton@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/gulp-core-build-sass/sass-extension-support_2018-09-29-03-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-sass",
5+
"comment": "Better support for indented syntax and, likewise, `.sass` extension.",
6+
"type": "patch"
7+
}
8+
],
9+
"packageName": "@microsoft/gulp-core-build-sass",
10+
"email": "jareha@gmail.com"
11+
}

‎common/changes/@microsoft/node-core-library/ianc-sass-extension-support_2018-10-05-23-39.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/node-core-library",
5+
"comment": "Introduce promiseify utility function.",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@microsoft/node-core-library",
10+
"email": "iclanton@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/rush/nickpape-check-cyclic_2018-10-05-00-48.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "Change \"rush check\" so that it considers \"cyclicDependencyProjects\" and ensures they are consistent or listed in \"allowedAlternateVersions\"",
5+
"packageName": "@microsoft/rush",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush",
10+
"email": "nickpape-msft@users.noreply.github.com"
11+
}

‎common/changes/@microsoft/rush/qz2017-check_publish_2018-05-12-00-36.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "Make sure npm package does not exist before publishing",
5+
"packageName": "@microsoft/rush",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush",
10+
"email": "qz2017@users.noreply.github.com"
11+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@
134134
"name": "chalk",
135135
"allowedCategories": [ "libraries" ]
136136
},
137+
{
138+
"name": "clean-css",
139+
"allowedCategories": [ "libraries" ]
140+
},
137141
{
138142
"name": "colors",
139143
"allowedCategories": [ "libraries" ]
@@ -382,6 +386,10 @@
382386
"name": "node-notifier",
383387
"allowedCategories": [ "libraries" ]
384388
},
389+
{
390+
"name": "node-sass",
391+
"allowedCategories": [ "libraries" ]
392+
},
385393
{
386394
"name": "npm-package-arg",
387395
"allowedCategories": [ "libraries" ]
@@ -402,6 +410,10 @@
402410
"name": "phantomjs-prebuilt",
403411
"allowedCategories": [ "libraries" ]
404412
},
413+
{
414+
"name": "postcss",
415+
"allowedCategories": [ "libraries" ]
416+
},
405417
{
406418
"name": "postcss-modules",
407419
"allowedCategories": [ "libraries" ]

‎common/config/rush/shrinkwrap.yaml

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
dependencies:
22
'@microsoft/node-library-build': 5.0.6
33
'@microsoft/rush-stack-compiler': 0.1.3
4-
'@microsoft/tsdoc': 0.8.0
54
'@pnpm/link-bins': 1.0.3
65
'@pnpm/logger': 1.0.2
76
'@rush-temp/api-documenter': 'file:projects/api-documenter.tgz'
@@ -43,6 +42,7 @@ dependencies:
4342
'@types/bluebird': 3.5.3
4443
'@types/chai': 3.4.34
4544
'@types/chalk': 0.4.31
45+
'@types/clean-css': 3.4.30
4646
'@types/express': 4.11.0
4747
'@types/express-serve-static-core': 4.11.0
4848
'@types/fs-extra': 5.0.1
@@ -64,6 +64,7 @@ dependencies:
6464
'@types/node-fetch': 1.6.9
6565
'@types/node-forge': 0.6.8
6666
'@types/node-notifier': 0.0.28
67+
'@types/node-sass': 3.10.32
6768
'@types/orchestrator': 0.0.30
6869
'@types/q': 0.0.32
6970
'@types/rimraf': 0.0.28
@@ -85,6 +86,7 @@ dependencies:
8586
autoprefixer: 9.1.5
8687
builtins: 1.0.3
8788
chai: 3.5.0
89+
clean-css: 4.2.1
8890
colors: 1.2.5
8991
deasync: 0.1.13
9092
decomment: 0.9.2
@@ -140,11 +142,13 @@ dependencies:
140142
node-fetch: 2.1.2
141143
node-forge: 0.7.6
142144
node-notifier: 5.0.2
145+
node-sass: 4.9.3
143146
npm-package-arg: 5.1.2
144147
object-assign: 4.1.1
145148
orchestrator: 0.3.8
146149
phantomjs-polyfill: 0.0.2
147150
phantomjs-prebuilt: 2.1.16
151+
postcss: 7.0.5
148152
postcss-modules: 1.3.2
149153
pretty-hrtime: 1.0.3
150154
read-package-tree: 5.1.6
@@ -345,10 +349,6 @@ packages:
345349
dev: false
346350
resolution:
347351
integrity: sha512-ciuIkbW/qKvn+MuktrtsSQweSR0wCM7GoqqgnaFv90KROz8lrWPmmZweZ9fdWH5tJXcudWiyOCkv0lQOg4IIcQ==
348-
/@microsoft/tsdoc/0.8.0:
349-
dev: false
350-
resolution:
351-
integrity: sha512-XMxOflIaP5LS3dgoNwqNh7SK6E3zRbHe+FmNEMQkrTA0QHI6Y7TUDnT3femXUuEfAEM8SCu8tzUjbENrsFnvtA==
352352
/@pnpm/link-bins/1.0.3:
353353
dependencies:
354354
'@pnpm/package-bins': 1.0.0
@@ -449,6 +449,10 @@ packages:
449449
dev: false
450450
resolution:
451451
integrity: sha1-ox10JBprHtu5c8822XooloNKUfk=
452+
/@types/clean-css/3.4.30:
453+
dev: false
454+
resolution:
455+
integrity: sha1-AFLBNvUkgAJCjjY4s33ko5gYZB0=
452456
/@types/connect/3.4.32:
453457
dependencies:
454458
'@types/node': 8.5.8
@@ -579,6 +583,12 @@ packages:
579583
dev: false
580584
resolution:
581585
integrity: sha1-hro9OqjZGDUswxkdiN4yiyDck8E=
586+
/@types/node-sass/3.10.32:
587+
dependencies:
588+
'@types/node': 8.5.8
589+
dev: false
590+
resolution:
591+
integrity: sha1-spbM5xRP+rd7hAkMqtTx5Lvqjgk=
582592
/@types/node/10.9.4:
583593
dev: false
584594
resolution:
@@ -7408,6 +7418,16 @@ packages:
74087418
node: '>=6.0.0'
74097419
resolution:
74107420
integrity: sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==
7421+
/postcss/7.0.5:
7422+
dependencies:
7423+
chalk: 2.4.1
7424+
source-map: 0.6.1
7425+
supports-color: 5.5.0
7426+
dev: false
7427+
engines:
7428+
node: '>=6.0.0'
7429+
resolution:
7430+
integrity: sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
74117431
/prelude-ls/1.1.2:
74127432
dev: false
74137433
engines:
@@ -10099,7 +10119,6 @@ packages:
1009910119
dependencies:
1010010120
'@microsoft/node-library-build': 5.0.6
1010110121
'@microsoft/rush-stack-compiler': 0.1.3
10102-
'@microsoft/tsdoc': 0.8.0
1010310122
'@types/jest': 21.1.10
1010410123
'@types/lodash': 4.14.116
1010510124
'@types/node': 8.5.8
@@ -10114,7 +10133,7 @@ packages:
1011410133
dev: false
1011510134
name: '@rush-temp/api-extractor'
1011610135
resolution:
10117-
integrity: sha512-K5Y+N3ITkgNgnr7Cmxp912XtsvLflQdW136f1h4LWLk5UA6nrKPDNxpEjQuyiakiVPIJmeL+hj2kv7NkDL6sIw==
10136+
integrity: sha512-S1xQbp5GM9pTW2/Pwf4+AER8vY/Z+lzoNpqGsvyI4bMs61wkn3UrwqS9fYGnSi0RHq8NItSMUzs2tdnoZMQLTQ==
1011810137
tarball: 'file:projects/api-extractor.tgz'
1011910138
version: 0.0.0
1012010139
'file:projects/gulp-core-build-karma.tgz':
@@ -10172,15 +10191,20 @@ packages:
1017210191
version: 0.0.0
1017310192
'file:projects/gulp-core-build-sass.tgz':
1017410193
dependencies:
10194+
'@types/clean-css': 3.4.30
10195+
'@types/glob': 5.0.30
1017510196
'@types/gulp': 3.8.32
1017610197
'@types/gulp-util': 3.0.30
1017710198
'@types/mime': 0.0.29
1017810199
'@types/node': 8.5.8
10200+
'@types/node-sass': 3.10.32
1017910201
'@types/orchestrator': 0.0.30
1018010202
'@types/q': 0.0.32
1018110203
'@types/through2': 2.0.32
1018210204
'@types/vinyl': 1.2.30
1018310205
autoprefixer: 9.1.5
10206+
clean-css: 4.2.1
10207+
glob: 7.0.6
1018410208
gulp: 3.9.1
1018510209
gulp-clean-css: 3.0.4
1018610210
gulp-clip-empty-files: 0.1.2
@@ -10190,12 +10214,14 @@ packages:
1019010214
gulp-sourcemaps: 2.6.4
1019110215
gulp-texttojs: 1.0.3
1019210216
merge2: 1.0.3
10217+
node-sass: 4.9.3
10218+
postcss: 7.0.5
1019310219
postcss-modules: 1.3.2
1019410220
through2: 2.0.3
1019510221
dev: false
1019610222
name: '@rush-temp/gulp-core-build-sass'
1019710223
resolution:
10198-
integrity: sha512-O+H2hjHuNa0BVs7AB0CFHWtxW3v7qco96wpCTDtZgYvBLH1/AOOzG5D1IZkxyVfPXY9xB7e7OFFtBHx0N/3IPQ==
10224+
integrity: sha512-2QMs4RbzDgxOe4BKgiO/KP+rZ0uiJDIp4t/yBKdUJkXdFTkRgu+Eq7hOemSXspL1ycKYth4EEDFjKY+nt8nEzg==
1019910225
tarball: 'file:projects/gulp-core-build-sass.tgz'
1020010226
version: 0.0.0
1020110227
'file:projects/gulp-core-build-serve.tgz':
@@ -10626,7 +10652,6 @@ shrinkwrapVersion: 3
1062610652
specifiers:
1062710653
'@microsoft/node-library-build': 5.0.6
1062810654
'@microsoft/rush-stack-compiler': 0.1.3
10629-
'@microsoft/tsdoc': 0.8.0
1063010655
'@pnpm/link-bins': ~1.0.1
1063110656
'@pnpm/logger': ~1.0.1
1063210657
'@rush-temp/api-documenter': 'file:./projects/api-documenter.tgz'
@@ -10668,6 +10693,7 @@ specifiers:
1066810693
'@types/bluebird': 3.5.3
1066910694
'@types/chai': 3.4.34
1067010695
'@types/chalk': 0.4.31
10696+
'@types/clean-css': 3.4.30
1067110697
'@types/express': 4.11.0
1067210698
'@types/express-serve-static-core': 4.11.0
1067310699
'@types/fs-extra': 5.0.1
@@ -10689,6 +10715,7 @@ specifiers:
1068910715
'@types/node-fetch': 1.6.9
1069010716
'@types/node-forge': 0.6.8
1069110717
'@types/node-notifier': 0.0.28
10718+
'@types/node-sass': 3.10.32
1069210719
'@types/orchestrator': 0.0.30
1069310720
'@types/q': 0.0.32
1069410721
'@types/rimraf': 0.0.28
@@ -10710,6 +10737,7 @@ specifiers:
1071010737
autoprefixer: ~9.1.3
1071110738
builtins: ~1.0.3
1071210739
chai: ~3.5.0
10740+
clean-css: 4.2.1
1071310741
colors: ~1.2.1
1071410742
deasync: ~0.1.7
1071510743
decomment: ~0.9.1
@@ -10765,11 +10793,13 @@ specifiers:
1076510793
node-fetch: ~2.1.2
1076610794
node-forge: ~0.7.1
1076710795
node-notifier: ~5.0.2
10796+
node-sass: 4.9.3
1076810797
npm-package-arg: ~5.1.2
1076910798
object-assign: ~4.1.0
1077010799
orchestrator: ~0.3.8
1077110800
phantomjs-polyfill: ~0.0.2
1077210801
phantomjs-prebuilt: ~2.1.6
10802+
postcss: 7.0.5
1077310803
postcss-modules: ~1.3.1
1077410804
pretty-hrtime: ~1.0.2
1077510805
read-package-tree: ~5.1.5

0 commit comments

Comments
 (0)