Skip to content

Commit f43022c

Browse files
iclantoniclanton
committed
Fixing some remaining issues with rush-stack-compiler packages.
1 parent d814ac0 commit f43022c

File tree

45 files changed

+196
-51
lines changed

Some content is hidden

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

45 files changed

+196
-51
lines changed

‎build-tests/rush-stack-compiler-2.9-library-test/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@microsoft/node-library-build": "6.0.12",
16-
"@microsoft/rush-stack-compiler-2.9": "0.0.0",
16+
"@microsoft/rush-stack-compiler-2.9": "0.1.0",
1717
"gulp": "~3.9.1"
1818
}
1919
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
"~2.7.2",
4545
"~2.9.2",
4646
"~3.0.3"
47-
],
48-
"@microsoft/rush-stack-compiler": [
49-
"~0.3.0"
50-
]
47+
]
5148
}
5249
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
},
7777
{
7878
"name": "@microsoft/rush-stack-compiler-2.7",
79-
"allowedCategories": [ "tests" ]
79+
"allowedCategories": [ "libraries", "tests" ]
8080
},
8181
{
8282
"name": "@microsoft/rush-stack-compiler-2.9",

‎core-build/gulp-core-build-mocha/gulpfile.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
'use strict';
22

33
let build = require('@microsoft/node-library-build');
4+
5+
// Remove these when node-library-build is published and bumped
6+
build.tscCmd.mergeConfig({
7+
allowBuiltinCompiler: true
8+
});
9+
10+
build.tslintCmd.mergeConfig({
11+
allowBuiltinCompiler: true
12+
});
13+
14+
build.apiExtractor.mergeConfig({
15+
allowBuiltinCompiler: true
16+
});
17+
418
build.mocha.enabled = false;
519
build.initialize(require('gulp'));

‎core-build/gulp-core-build-mocha/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"gulp-mocha": "~6.0.0"
2222
},
2323
"devDependencies": {
24-
"@microsoft/rush-stack-compiler": "0.5.4",
24+
"@microsoft/rush-stack-compiler-3.0": "0.0.0",
2525
"@microsoft/node-library-build": "6.0.12",
2626
"@types/glob": "5.0.30",
2727
"@types/gulp": "3.8.32",

‎core-build/gulp-core-build-mocha/tsconfig.json‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
11
{
2-
"extends": "./node_modules/@microsoft/rush-stack-compiler/includes/tsconfig-node.json"
2+
// Put this back and remove the rest when node-library-build is published and bumped
3+
// "extends": "./node_modules/@microsoft/rush-stack-compiler-3.0/includes/tsconfig-node.json"
4+
5+
"compilerOptions": {
6+
"outDir": "./lib",
7+
8+
"forceConsistentCasingInFileNames": true,
9+
"jsx": "react",
10+
"declaration": true,
11+
"sourceMap": true,
12+
"inlineSources": true,
13+
"experimentalDecorators": true,
14+
"strictNullChecks": true,
15+
"noUnusedLocals": true,
16+
"types": ["mocha"],
17+
18+
"module": "commonjs",
19+
"target": "es6",
20+
"lib": [
21+
"es5",
22+
"es2015.collection",
23+
"es2015.iterable",
24+
"es2015.promise"
25+
]
26+
},
27+
"include": [
28+
"./src/**/*.ts",
29+
"./src/**/*.tsx"
30+
],
31+
"exclude": [
32+
"./node_modules",
33+
"./lib"
34+
]
335
}

‎core-build/gulp-core-build-mocha/tslint.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
{
2-
"extends": "@microsoft/rush-stack-compiler/includes/tslint.json"
2+
"extends": "@microsoft/rush-stack-compiler-3.0/includes/tslint.json",
3+
4+
// Remove this override when node-core-library is published and updated
5+
"rules": {
6+
"no-string-literal": false
7+
}
38
}

‎core-build/gulp-core-build-typescript/gulpfile.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
const build = require('@microsoft/node-library-build');
44

5-
build.mocha.enabled = false;
5+
// Remove these when node-library-build is published and bumped
6+
build.tscCmd.mergeConfig({
7+
allowBuiltinCompiler: true
8+
});
9+
10+
build.tslintCmd.mergeConfig({
11+
allowBuiltinCompiler: true
12+
});
613

14+
build.apiExtractor.mergeConfig({
15+
allowBuiltinCompiler: true
16+
});
17+
18+
build.mocha.enabled = false;
719
build.initialize(require('gulp'));

‎core-build/gulp-core-build-typescript/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"build": "gulp --clean"
1414
},
1515
"dependencies": {
16-
"@microsoft/rush-stack-compiler": "0.5.4",
16+
"@microsoft/rush-stack-compiler-2.7": "0.0.0",
1717
"@microsoft/gulp-core-build": "3.8.47",
1818
"@microsoft/node-core-library": "3.6.0",
1919
"@types/node": "8.5.8",

‎core-build/gulp-core-build-typescript/src/ApiExtractorTask.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
JsonFile,
77
FileSystem
88
} from '@microsoft/node-core-library';
9-
import { ApiExtractorRunner as TApiExtractorRunner } from '@microsoft/rush-stack-compiler';
9+
import { ApiExtractorRunner as TApiExtractorRunner } from '@microsoft/rush-stack-compiler-2.7';
1010
import { IExtractorConfig, IExtractorOptions } from '@microsoft/api-extractor';
1111

1212
import { RSCTask, IRSCTaskConfig } from './RSCTask';

0 commit comments

Comments
 (0)