From 6b884db41b8699bda0c3ee2db4d219a78a3ff571 Mon Sep 17 00:00:00 2001 From: Jon Surrell Date: Tue, 21 Apr 2020 15:57:32 +0200 Subject: [PATCH 1/3] Restore element, icons, primitives types --- packages/element/package.json | 1 + packages/icons/package.json | 1 + packages/primitives/package.json | 1 + tsconfig.json | 9 +++------ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/element/package.json b/packages/element/package.json index 4542ddcbfd9565..78a06bcb1f2290 100644 --- a/packages/element/package.json +++ b/packages/element/package.json @@ -21,6 +21,7 @@ "main": "build/index.js", "module": "build-module/index.js", "react-native": "src/index", + "types": "build-types", "sideEffects": false, "dependencies": { "@babel/runtime": "^7.9.2", diff --git a/packages/icons/package.json b/packages/icons/package.json index dd1f25f846c424..5c5ea650f9dd14 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -22,6 +22,7 @@ "main": "build/index.js", "module": "build-module/index.js", "react-native": "src/index", + "types": "build-types", "dependencies": { "@babel/runtime": "^7.9.2", "@wordpress/element": "../element", diff --git a/packages/primitives/package.json b/packages/primitives/package.json index 349814a1a10446..9398d58959b2a0 100644 --- a/packages/primitives/package.json +++ b/packages/primitives/package.json @@ -22,6 +22,7 @@ "module": "build-module/index.js", "react-native": "src/index", "sideEffects": false, + "types": "build-types", "dependencies": { "@babel/runtime": "^7.9.2", "@wordpress/element": "file:../element", diff --git a/tsconfig.json b/tsconfig.json index 7f31d9ad53e770..28f48647436b52 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,23 +5,20 @@ { "path": "packages/autop" }, { "path": "packages/blob" }, { "path": "packages/block-editor" }, + { "path": "packages/element" }, { "path": "packages/dom-ready" }, { "path": "packages/escape-html" }, { "path": "packages/html-entities" }, { "path": "packages/i18n" }, + { "path": "packages/icons" }, { "path": "packages/is-shallow-equal" }, { "path": "packages/prettier-config" }, + { "path": "packages/primitives" }, { "path": "packages/priority-queue" }, { "path": "packages/project-management-automation" }, { "path": "packages/token-list" }, { "path": "packages/url" }, { "path": "packages/warning" } - - // Temporarily disabled due to conflicts with 3rd party DefinitelyTyped types - // See https://github.com/WordPress/gutenberg/pull/21613 - // { "path": "packages/element" }, - // { "path": "packages/icons" }, - // { "path": "packages/primitives" } ], "files": [] } From a433903d9d875d8f597feccfaa4b1342dfff99b6 Mon Sep 17 00:00:00 2001 From: Jon Surrell Date: Wed, 22 Apr 2020 11:01:16 +0200 Subject: [PATCH 2/3] Add changelogs --- packages/element/CHANGELOG.md | 4 ++++ packages/icons/CHANGELOG.md | 4 ++++ packages/primitives/CHANGELOG.md | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md index 6dc12e38828b8e..a85fe6783f8b5d 100644 --- a/packages/element/CHANGELOG.md +++ b/packages/element/CHANGELOG.md @@ -1,5 +1,9 @@ ## Master +### New Feature + +- Include TypeScript type declarations ([#21781](https://github.com/WordPress/gutenberg/pull/21781)) + ## 2.13.1 (2020-04-15) ### Bug Fix diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index ef1afdc9561f8d..d221338d6ba857 100644 --- a/packages/icons/CHANGELOG.md +++ b/packages/icons/CHANGELOG.md @@ -1,5 +1,9 @@ ## Master +### New Feature + +- Include TypeScript type declarations ([#21781](https://github.com/WordPress/gutenberg/pull/21781)) + ## 1.3.1 (2020-04-15) ### Bug Fix diff --git a/packages/primitives/CHANGELOG.md b/packages/primitives/CHANGELOG.md index 381269dfcfe7fc..b3b5f065ba16a2 100644 --- a/packages/primitives/CHANGELOG.md +++ b/packages/primitives/CHANGELOG.md @@ -1,5 +1,9 @@ ## Master +### New Feature + +- Include TypeScript type declarations ([#21781](https://github.com/WordPress/gutenberg/pull/21781)) + ## 1.3.1 (2020-04-15) ### Bug Fix From 0b23b897ab48b7bacd5ac07d116563cd0c751eb5 Mon Sep 17 00:00:00 2001 From: Jon Surrell Date: Wed, 22 Apr 2020 17:36:09 +0200 Subject: [PATCH 3/3] Revert "Rename icons, primitives tsconfig to _tsconfig (#21784)" This reverts commit 74fcd4c3f408f3ee43ae9a9f6940fd2dfe9005fb. --- packages/icons/{_tsconfig.json => tsconfig.json} | 0 packages/primitives/{_tsconfig.json => tsconfig.json} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename packages/icons/{_tsconfig.json => tsconfig.json} (100%) rename packages/primitives/{_tsconfig.json => tsconfig.json} (100%) diff --git a/packages/icons/_tsconfig.json b/packages/icons/tsconfig.json similarity index 100% rename from packages/icons/_tsconfig.json rename to packages/icons/tsconfig.json diff --git a/packages/primitives/_tsconfig.json b/packages/primitives/tsconfig.json similarity index 100% rename from packages/primitives/_tsconfig.json rename to packages/primitives/tsconfig.json