Merge pull request #1217 from Microsoft/octogonz/ae-relative-paths

[api-extractor] Improve relativity of config paths in api-extractor.json
microsoft · Apr 11, 2019 · 6e2448b · 6e2448b
2 parents 18b3485 + 68e0825
commit 6e2448b
Show file tree

Hide file tree

Showing 47 changed files with 558 additions and 254 deletions.
diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json
@@ -18,7 +18,7 @@
     "@microsoft/api-extractor-model": "7.0.28",
     "@microsoft/node-core-library": "3.13.0",
     "@microsoft/ts-command-line": "4.2.3",
-    "@microsoft/tsdoc": "0.12.8",
+    "@microsoft/tsdoc": "0.12.9",
     "colors": "~1.2.1",
     "js-yaml": "~3.9.1"
   },

diff --git a/apps/api-extractor-model/package.json b/apps/api-extractor-model/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@microsoft/node-core-library": "3.13.0",
-    "@microsoft/tsdoc": "0.12.8",
+    "@microsoft/tsdoc": "0.12.9",
     "@types/node": "8.5.8"
   },
   "devDependencies": {

diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json
@@ -38,7 +38,7 @@
     "@microsoft/api-extractor-model": "7.0.28",
     "@microsoft/node-core-library": "3.13.0",
     "@microsoft/ts-command-line": "4.2.3",
-    "@microsoft/tsdoc": "0.12.8",
+    "@microsoft/tsdoc": "0.12.9",
     "colors": "~1.2.1",
     "lodash": "~4.17.5",
     "resolve": "1.8.1",

diff --git a/apps/api-extractor/src/api/CompilerState.ts b/apps/api-extractor/src/api/CompilerState.ts
@@ -52,13 +52,13 @@ export class CompilerState {
     let tsconfig: {} | undefined = extractorConfig.overrideTsconfig;
     if (!tsconfig) {
       // If it wasn't overridden, then load it from disk
-      tsconfig = JsonFile.load(path.join(extractorConfig.rootFolder, 'tsconfig.json'));
+      tsconfig = JsonFile.load(path.join(extractorConfig.projectFolder, 'tsconfig.json'));
     }
 
     const commandLine: ts.ParsedCommandLine = ts.parseJsonConfigFileContent(
       tsconfig,
       ts.sys,
-      extractorConfig.rootFolder
+      extractorConfig.projectFolder
     );
 
     if (!commandLine.options.skipLibCheck && extractorConfig.skipLibCheck) {