From 701e896bb3e2214bcc9ac89521c3cb892dddf7b5 Mon Sep 17 00:00:00 2001 From: Feiyang1 Date: Thu, 3 Jun 2021 16:22:47 -0700 Subject: [PATCH 1/3] create rollup typings for messaging --- packages-exp/messaging-compat/package.json | 2 +- packages-exp/messaging-exp/api-extractor.json | 11 +++++++++-- packages-exp/messaging-exp/package.json | 13 ++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/packages-exp/messaging-compat/package.json b/packages-exp/messaging-compat/package.json index ade4c2b74bc..a1055818b0e 100644 --- a/packages-exp/messaging-compat/package.json +++ b/packages-exp/messaging-compat/package.json @@ -25,7 +25,7 @@ "test:karma": "karma start --single-run", "test:debug": "karma start --browsers=Chrome --auto-watch", "type-check": "tsc --noEmit", - "add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/messaging-exp-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging" + "add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../messaging-exp/dist/index-public.d.ts -o dist/src/index.d.ts -a -r FirebaseMessaging:MessagingCompat -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/messaging" }, "peerDependencies": { "@firebase/app-compat": "0.x" diff --git a/packages-exp/messaging-exp/api-extractor.json b/packages-exp/messaging-exp/api-extractor.json index cfd9ee5b3ea..d68a256c8c5 100644 --- a/packages-exp/messaging-exp/api-extractor.json +++ b/packages-exp/messaging-exp/api-extractor.json @@ -8,8 +8,15 @@ }], "dtsRollup": { /** - * rollup is not supported when multiple entry points are present + * rollup is not supported when multiple entry points are present. + * npm script api-report:rollup is used to generate dts rollup. */ "enabled": false - } + }, + "apiReport": { + /** + * apiReport is handled by npm script api-report:rollup + */ + "enabled": false +} } diff --git a/packages-exp/messaging-exp/package.json b/packages-exp/messaging-exp/package.json index 68fc0b1653b..29bbc91ac97 100644 --- a/packages-exp/messaging-exp/package.json +++ b/packages-exp/messaging-exp/package.json @@ -7,7 +7,7 @@ "main": "dist/index.cjs.js", "browser": "dist/index.esm2017.js", "module": "dist/index.esm2017.js", - "typings": "dist/index.d.ts", + "typings": "./dist/index-public.d.ts", "sw": "dist/index.sw.esm2017.js", "files": [ "dist", @@ -18,15 +18,18 @@ "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'", "build": "rollup -c && yarn api-report", "build:deps": "lerna run --scope @firebase/'{app-exp,messaging-exp}' --include-dependencies build", - "build:release": "rollup -c rollup.config.release.js && yarn api-report", + "build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public", "dev": "rollup -c -w", "test": "run-p test:karma type-check lint ", "test:integration": "run-p test:karma type-check lint && cd ../../integration/messaging && npm run-script test", "test:ci": "node ../../scripts/run_tests_in_ci.js", "test:karma": "karma start --single-run", "test:debug": "karma start --browsers=Chrome --auto-watch", - "api-report": "api-extractor run --local --verbose", - "type-check": "tsc --noEmit" + "api-report": "yarn api-report:rollup && yarn api-report:api-json", + "api-report:rollup": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package messaging-exp --packageRoot . --typescriptDts ./dist/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/index-public.d.ts", + "api-report:api-json": "api-extractor run --local --verbose", + "type-check": "tsc --noEmit", + "typings:public": "node ../../scripts/exp/use_typings.js ./dist/index-public.d.ts" }, "license": "Apache-2.0", "peerDependencies": { @@ -54,4 +57,4 @@ "url": "https://github.com/firebase/firebase-js-sdk/issues" }, "esm5": "dist/index.esm.js" -} \ No newline at end of file +} From e2550f1b18c189f0869e81e10d5d22f391690470 Mon Sep 17 00:00:00 2001 From: Feiyang1 Date: Fri, 4 Jun 2021 15:06:25 -0700 Subject: [PATCH 2/3] update --- packages-exp/messaging-exp/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages-exp/messaging-exp/package.json b/packages-exp/messaging-exp/package.json index 29bbc91ac97..326adf91d12 100644 --- a/packages-exp/messaging-exp/package.json +++ b/packages-exp/messaging-exp/package.json @@ -7,7 +7,7 @@ "main": "dist/index.cjs.js", "browser": "dist/index.esm2017.js", "module": "dist/index.esm2017.js", - "typings": "./dist/index-public.d.ts", + "typings": "./dist/index.d.ts", "sw": "dist/index.sw.esm2017.js", "files": [ "dist", @@ -26,7 +26,7 @@ "test:karma": "karma start --single-run", "test:debug": "karma start --browsers=Chrome --auto-watch", "api-report": "yarn api-report:rollup && yarn api-report:api-json", - "api-report:rollup": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package messaging-exp --packageRoot . --typescriptDts ./dist/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/index-public.d.ts", + "api-report:rollup": "ts-node-script ../../repo-scripts/prune-dts/extract-public-api.ts --package messaging-exp --packageRoot . --typescriptDts ./dist/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/index-public.d.ts", "api-report:api-json": "api-extractor run --local --verbose", "type-check": "tsc --noEmit", "typings:public": "node ../../scripts/exp/use_typings.js ./dist/index-public.d.ts" From 2fd57813db9341856ccd3aa11ce1c6010877e460 Mon Sep 17 00:00:00 2001 From: Feiyang1 Date: Fri, 4 Jun 2021 15:07:56 -0700 Subject: [PATCH 3/3] update string --- packages-exp/messaging-exp/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages-exp/messaging-exp/package.json b/packages-exp/messaging-exp/package.json index 326adf91d12..15cf8cbceda 100644 --- a/packages-exp/messaging-exp/package.json +++ b/packages-exp/messaging-exp/package.json @@ -7,7 +7,7 @@ "main": "dist/index.cjs.js", "browser": "dist/index.esm2017.js", "module": "dist/index.esm2017.js", - "typings": "./dist/index.d.ts", + "typings": "dist/index.d.ts", "sw": "dist/index.sw.esm2017.js", "files": [ "dist",