From a771ee5d9050efd2170662670116ba34c3e06b2a Mon Sep 17 00:00:00 2001 From: Pete Bacon Darwin Date: Mon, 15 Jan 2018 16:10:32 +0000 Subject: [PATCH] build(aio): move file cleaning to later in the doc gen (#21540) Previously the generated files were cleaned out before doc-gen began (via a yarn pre-script). This can cause a race condition in the CLI server, which prevents the new generated files from being picked up. Now we delay the cleaning until the last minute to ensure that they ar still picked up by the webpack server. PR Close #21540 --- aio/package.json | 1 - aio/tools/transforms/angular.io-package/index.js | 1 + .../processors/cleanGeneratedFiles.js | 10 ++++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 aio/tools/transforms/angular.io-package/processors/cleanGeneratedFiles.js diff --git a/aio/package.json b/aio/package.json index 8c24e7de04..1f4514cd2c 100644 --- a/aio/package.json +++ b/aio/package.json @@ -39,7 +39,6 @@ "check-env": "yarn ~~check-env", "postcheck-env": "yarn aio-check-local", "payload-size": "scripts/payload.sh", - "predocs": "rimraf src/generated/{docs,*.json}", "docs": "dgeni ./tools/transforms/angular.io-package", "docs-watch": "node tools/transforms/authors-package/watchr.js", "docs-lint": "eslint --ignore-path=\"tools/transforms/.eslintignore\" tools/transforms", diff --git a/aio/tools/transforms/angular.io-package/index.js b/aio/tools/transforms/angular.io-package/index.js index f758a5184a..3184be07d0 100644 --- a/aio/tools/transforms/angular.io-package/index.js +++ b/aio/tools/transforms/angular.io-package/index.js @@ -17,6 +17,7 @@ module.exports = new Package('angular.io', [gitPackage, apiPackage, contentPacka // This processor relies upon the versionInfo. See below... .processor(require('./processors/processNavigationMap')) + .processor(require('./processors/cleanGeneratedFiles')) // We don't include this in the angular-base package because the `versionInfo` stuff // accesses the file system and git, which is slow. diff --git a/aio/tools/transforms/angular.io-package/processors/cleanGeneratedFiles.js b/aio/tools/transforms/angular.io-package/processors/cleanGeneratedFiles.js new file mode 100644 index 0000000000..e3992f974f --- /dev/null +++ b/aio/tools/transforms/angular.io-package/processors/cleanGeneratedFiles.js @@ -0,0 +1,10 @@ +const rimraf = require('rimraf'); +module.exports = function cleanGeneratedFiles() { + return { + $runAfter: ['writing-files'], + $runBefore: ['writeFilesProcessor'], + $process: function() { + rimraf.sync('src/generated/{docs,*.json}'); + } + }; +};