Bump cyclic dependencies

apps/api-extractor-model/config/api-extractor.json

@@ -1,21 +1,19 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/api-extractor.schema.json",
-  "project": {
-    "entryPointSourceFile": "lib/index.d.ts"
-  },
-  "compiler": {
-    "rootFolder": ".",
-    "configType": "tsconfig"
-  },
-  "apiReviewFile": {
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  "mainEntryPointFile": "lib/index.d.ts",
+
+  "apiReport": {
     "enabled": true,
-    "apiReviewFolder": "../../common/reviews/api"
+    "reportFolder": "../../common/reviews/api"
   },
-  "apiJsonFile": {
-    "enabled": true,
-    "outputFolder": "./temp"
+
+  "docModel": {
+    "enabled": true
   },
+
   "dtsRollup": {
-    "enabled": true
+    "enabled": true,
+    "untrimmedFilePath": "dist/rollup.d.ts",
   }
 }

apps/api-extractor-model/package.json

@@ -22,8 +22,8 @@
     "@types/node": "8.5.8"
   },
   "devDependencies": {
-    "@microsoft/node-library-build": "6.0.49",
-    "@microsoft/rush-stack-compiler-3.2": "0.3.1",
+    "@microsoft/node-library-build": "6.0.50",
+    "@microsoft/rush-stack-compiler-3.2": "0.3.2",
     "@types/jest": "23.3.11",
     "gulp": "~3.9.1",
     "tslint-microsoft-contrib": "~5.2.1"

apps/api-extractor/config/api-extractor.json

@@ -1,21 +1,19 @@
 {
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/api-extractor.schema.json",
-  "project": {
-    "entryPointSourceFile": "lib/index.d.ts"
-  },
-  "compiler": {
-    "rootFolder": ".",
-    "configType": "tsconfig"
-  },
-  "apiReviewFile": {
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  "mainEntryPointFile": "lib/index.d.ts",
+
+  "apiReport": {
     "enabled": true,
-    "apiReviewFolder": "../../common/reviews/api"
+    "reportFolder": "../../common/reviews/api"
   },
-  "apiJsonFile": {
-    "enabled": true,
-    "outputFolder": "./temp"
+
+  "docModel": {
+    "enabled": true
   },
+
   "dtsRollup": {
-    "enabled": true
+    "enabled": true,
+    "untrimmedFilePath": "dist/rollup.d.ts",
   }
 }

apps/api-extractor/package.json

@@ -46,8 +46,8 @@
     "typescript": "~3.1.6"
   },
   "devDependencies": {
-    "@microsoft/node-library-build": "6.0.49",
-    "@microsoft/rush-stack-compiler-3.2": "0.3.1",
+    "@microsoft/node-library-build": "6.0.50",
+    "@microsoft/rush-stack-compiler-3.2": "0.3.2",
     "@types/jest": "23.3.11",
     "@types/lodash": "4.14.116",
     "@types/node": "8.5.8",

apps/api-extractor/src/schemas/api-extractor.schema.json

@@ -33,7 +33,7 @@
         "skipLibCheck": {
           "description": "This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.",
           "type": "boolean"
-        },
+        }
       },
       "additionalProperties": false
     },
@@ -120,7 +120,7 @@
         "tsdocMetadataFilePath": {
           "description": "Specifies where the TSDoc metadata file should be written. The default value is \"<lookup>\", which causes the path to be automatically inferred from the \"tsdocMetadata\", \"typings\" or \"main\" fields of the project's package.json.  If none of these fields are set, the lookup falls back to \"tsdoc-metadata.json\" in the package folder.",
           "type": "string"
-        },
+        }
       },
       "additionalProperties": false
     },

apps/rush-lib/config/api-extractor.json

@@ -8,11 +8,11 @@
     "reportFolder": "../../common/reviews/api"
   },
 
-  "dtsRollup": {
+  "docModel": {
     "enabled": true
   },
 
-  "docModel": {
+  "dtsRollup": {
     "enabled": true
   }
 }

build-tests/api-documenter-test/config/api-extractor.json

@@ -7,14 +7,14 @@
     "enabled": true,
   },
 
-  "dtsRollup": {
-    "enabled": false
-  },
-
   "docModel": {
     "enabled": true,
     "apiJsonFilePath": "./etc/<unscopedPackageName>.api.json"
   },
 
+  "dtsRollup": {
+    "enabled": false
+  },
+
   "testMode": true
 }

build-tests/api-extractor-lib1-test/config/api-extractor.json

@@ -7,13 +7,11 @@
     "enabled": true,
   },
 
-  "dtsRollup": {
-    "enabled": true,
-
-    "untrimmedFilePath": "./dist/internal/<unscopedPackageName>.d.ts"
+  "docModel": {
+    "enabled": true
   },
 
-  "docModel": {
+  "dtsRollup": {
     "enabled": true
   },
 

build-tests/api-extractor-lib1-test/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "private": true,
   "main": "lib/index.js",
-  "typings": "dist/internal/api-extractor-lib1-test.d.ts",
+  "typings": "dist/api-extractor-lib1-test.d.ts",
   "scripts": {
     "build": "node build.js"
   },

build-tests/api-extractor-lib2-test/config/api-extractor.json

@@ -7,13 +7,11 @@
     "enabled": true,
   },
 
-  "dtsRollup": {
-    "enabled": true,
-
-    "untrimmedFilePath": "./dist/internal/<unscopedPackageName>.d.ts"
+  "docModel": {
+    "enabled": true
   },
 
-  "docModel": {
+  "dtsRollup": {
     "enabled": true
   },
 

build-tests/api-extractor-lib2-test/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "private": true,
   "main": "lib/index.js",
-  "typings": "dist/internal/api-extractor-lib2-test.d.ts",
+  "typings": "dist/api-extractor-lib2-test.d.ts",
   "scripts": {
     "build": "node build.js"
   },

build-tests/api-extractor-lib3-test/config/api-extractor.json

@@ -7,13 +7,11 @@
     "enabled": true,
   },
 
-  "dtsRollup": {
-    "enabled": true,
-
-    "untrimmedFilePath": "./dist/internal/<unscopedPackageName>.d.ts"
+  "docModel": {
+    "enabled": true
   },
 
-  "docModel": {
+  "dtsRollup": {
     "enabled": true
   },
 

build-tests/api-extractor-lib3-test/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "private": true,
   "main": "lib/index.js",
-  "typings": "dist/internal/api-extractor-lib3-test.d.ts",
+  "typings": "dist/api-extractor-lib3-test.d.ts",
   "scripts": {
     "build": "node build.js"
   },

build-tests/api-extractor-test-01/config/api-extractor.json

@@ -7,16 +7,15 @@
     "enabled": true,
   },
 
+  "docModel": {
+    "enabled": true
+  },
+
   "dtsRollup": {
     "enabled": true,
 
-    "untrimmedFilePath": "./dist/internal/<unscopedPackageName>.d.ts",
-    "betaTrimmedFilePath": "./dist/beta/<unscopedPackageName>.d.ts",
-    "publicTrimmedFilePath": "./dist/public/<unscopedPackageName>.d.ts",
-  },
-
-  "docModel": {
-    "enabled": true
+    "betaTrimmedFilePath": "./dist/<unscopedPackageName>-beta.d.ts",
+    "publicTrimmedFilePath": "./dist/<unscopedPackageName>-public.d.ts"
   },
 
   "testMode": true

build-tests/api-extractor-test-01/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "private": true,
   "main": "lib/index.js",
-  "typings": "dist/internal/api-extractor-test-01.d.ts",
+  "typings": "dist/api-extractor-test-01.d.ts",
   "tsdoc": {
     "tsdocFlavor": "AEDoc"
   },

build-tests/api-extractor-test-02/config/api-extractor.json

@@ -7,16 +7,15 @@
     "enabled": true,
   },
 
+  "docModel": {
+    "enabled": true
+  },
+
   "dtsRollup": {
     "enabled": true,
 
-    "untrimmedFilePath": "./dist/internal/<unscopedPackageName>.d.ts",
-    "betaTrimmedFilePath": "./dist/beta/<unscopedPackageName>.d.ts",
-    "publicTrimmedFilePath": "./dist/public/<unscopedPackageName>.d.ts",
-  },
-
-  "docModel": {
-    "enabled": true
+    "betaTrimmedFilePath": "./dist/<unscopedPackageName>-beta.d.ts",
+    "publicTrimmedFilePath": "./dist/<unscopedPackageName>-public.d.ts"
   },
 
   "testMode": true

build-tests/api-extractor-test-02/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "private": true,
   "main": "lib/index.js",
-  "typings": "dist/internal/api-extractor-test-02.d.ts",
+  "typings": "dist/api-extractor-test-02.d.ts",
   "tsdoc": {
     "tsdocFlavor": "AEDoc"
   },

build-tests/api-extractor-test-04/beta-consumer/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "api-extractor-04-preview",
+  "description": "Simulates consuming the \"beta\" typings generated by API Extractor for api-extractor-04",
+  "version": "1.0.0",
+  "private": true
+}

build-tests/api-extractor-test-04/build.js

@@ -3,7 +3,7 @@ const child_process = require('child_process');
 const path = require('path');
 const process = require('process');
 
-console.log(`==> Invoking tsc in the "preview-consumer" folder`);
+console.log(`==> Invoking tsc in the "beta-consumer" folder`);
 
 function executeCommand(command, cwd) {
   console.log('---> ' + command);
@@ -26,11 +26,11 @@ if (process.argv.indexOf('--production') >= 0) {
   executeCommand('node node_modules/@microsoft/api-extractor/lib/start run --local');
 }
 
-// Run the TypeScript compiler in the preview-consumer folder
-console.log(`==> Invoking tsc in the "preview-consumer" folder`);
+// Run the TypeScript compiler in the beta-consumer folder
+console.log(`==> Invoking tsc in the "beta-consumer" folder`);
 
-fsx.emptyDirSync('preview-consumer/lib');
+fsx.emptyDirSync('beta-consumer/lib');
 const tscPath = path.resolve('node_modules/typescript/lib/tsc');
-executeCommand(`node ${tscPath}`, 'preview-consumer');
+executeCommand(`node ${tscPath}`, 'beta-consumer');
 
 console.log(`==> Finished build.js for ${path.basename(process.cwd())}`);

build-tests/api-extractor-test-04/config/api-extractor.json

@@ -7,16 +7,15 @@
     "enabled": true,
   },
 
+  "docModel": {
+    "enabled": true
+  },
+
   "dtsRollup": {
     "enabled": true,
 
-    "untrimmedFilePath": "./dist/internal/<unscopedPackageName>.d.ts",
-    "betaTrimmedFilePath": "./dist/beta/<unscopedPackageName>.d.ts",
-    "publicTrimmedFilePath": "./dist/public/<unscopedPackageName>.d.ts",
-  },
-
-  "docModel": {
-    "enabled": true
+    "betaTrimmedFilePath": "./dist/<unscopedPackageName>-beta.d.ts",
+    "publicTrimmedFilePath": "./dist/<unscopedPackageName>-public.d.ts"
   },
 
   "testMode": true

build-tests/api-extractor-test-04/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "private": true,
   "main": "lib/index.js",
-  "typings": "dist/internal/api-extractor-test-04.d.ts",
+  "typings": "dist/api-extractor-test-04.d.ts",
   "tsdoc": {
     "tsdocFlavor": "AEDoc"
   },

build-tests/web-library-build-test/config/api-extractor.json

@@ -8,11 +8,11 @@
     "reportFolder": "../../common/reviews/api"
   },
 
-  "dtsRollup": {
-    "enabled": false
-  },
-
   "docModel": {
     "enabled": true
+  },
+
+  "dtsRollup": {
+    "enabled": false
   }
 }

common/changes/@microsoft/api-extractor-model/octogonz-bump-cyclics_2019-04-05-07-17.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@microsoft/api-extractor-model",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/api-extractor-model",
+  "email": "[email protected]"
+}