From a04b28ac4b38ddf4e385cf366eecaf7dcb9a00cb Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 15 Dec 2020 21:04:15 +0100 Subject: [PATCH] feat: do better file detection to check that the universal file is added to the diff too --- packages/cli/src/lib/diff/handlers.ts | 23 ++++++++++++++++++++++- plugins/github-actions/package.json | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/lib/diff/handlers.ts b/packages/cli/src/lib/diff/handlers.ts index befda6b5e1..840b58af65 100644 --- a/packages/cli/src/lib/diff/handlers.ts +++ b/packages/cli/src/lib/diff/handlers.ts @@ -61,13 +61,34 @@ class PackageJsonHandler { await this.syncField('main:src'); } await this.syncField('types'); - + await this.syncFiles(); await this.syncScripts(); await this.syncPublishConfig(); await this.syncDependencies('dependencies'); await this.syncDependencies('devDependencies'); } + private async syncFiles() { + const hasUniversalFile = this.targetPkg.files.includes('universal.js'); + const hasConfigTypeScriptFile = + typeof this.targetPkg.configSchema === 'string'; + + if (hasUniversalFile || hasConfigTypeScriptFile) { + const files = [...this.pkg.files]; + if (hasUniversalFile) { + files.push('universal.js'); + } + + if (hasConfigTypeScriptFile) { + files.push(this.targetPkg.configSchema); + } + + await this.syncField('files', { files }); + } else { + await this.syncField('files'); + } + } + // Make sure a field inside package.json is in sync. This mutates the targetObj and writes package.json on change. private async syncField( fieldName: string, diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index 5bab38b404..33481328b6 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -64,6 +64,6 @@ }, "files": [ "dist", - "universal" + "universal.js" ] }