Public typings only swapped on build:exp:release (#3082)

Author: hsubox76

package.json

@@ -22,8 +22,10 @@
   ],
   "scripts": {
     "dev": "lerna run --parallel --scope @firebase/* --scope firebase --scope rxfire dev",
-    "build": "lerna run --scope @firebase/* --scope firebase --scope rxfire prepare",
+    "build": "lerna run --scope @firebase/* --scope firebase --scope rxfire build",
     "build:exp": "lerna run --scope @firebase/*-exp --scope firebase-exp build",
+    "build:release": "lerna run --scope @firebase/* --scope firebase --ignore @firebase/*-exp --scope firebase-exp prepare",
+    "build:exp:release": "lerna run --scope @firebase/*-exp --scope firebase-exp prepare && yarn --cwd packages-exp/app-exp typings:public",
     "link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
     "stage:packages": "./scripts/prepublish.sh",
     "repl": "node tools/repl.js",

packages-exp/app-exp/package.json

@@ -15,19 +15,21 @@
     "lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "build": "rollup -c && yarn api-report",
-    "build:release": "rollup -c rollup.config.release.js && node ./use_public_typings.js",
+    "build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public",
     "build:deps": "lerna run --scope @firebase/app-exp --include-dependencies build",
     "dev": "rollup -c -w",
     "test": "yarn type-check && run-p lint test:browser test:node",
     "test:ci": "node ../../scripts/run_tests_in_ci.js",
     "test:browser": "karma start --single-run",
     "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --config ../../config/mocharc.node.js",
     "type-check": "tsc -p . --noEmit",
-    "prepare": "yarn build:release",
+    "prepare": "rollup -c rollup.config.release.js",
     "api-report": "api-extractor run --local --verbose",
     "predoc": "node ../../scripts/exp/remove-exp.js temp",
     "doc": "api-documenter markdown --input temp --output docs",
-    "build:doc": "yarn build && yarn doc"
+    "build:doc": "yarn build && yarn doc",
+    "typings:public": "node ./use_public_typings.js --public",
+    "typings:internal": "node ./use_public_typings.js"
   },
   "dependencies": {
     "@firebase/app-types-exp": "0.0.800",
@@ -52,7 +54,7 @@
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
-  "typings": "./dist/app-exp-public.d.ts",
+  "typings": "./dist/app-exp.d.ts",
   "nyc": {
     "extension": [
       ".ts"

packages-exp/app-exp/use_public_typings.js renamed to packages-exp/app-exp/use_typings.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
 /**
  * @license
  * Copyright 2020 Google LLC
@@ -16,16 +17,23 @@
  */
 
 const { writeFileSync } = require('fs');
+const { argv } = require('yargs');
+
+const path = require('path');
+const packageJsonPath = path.resolve(__dirname, './package.json');
 
 // point typings field to the public d.ts file in package.json
-const PUBLIC_TYPINGS_PATH = './dist/app-exp-public.d.ts';
+const TYPINGS_PATH = argv.public
+  ? './dist/app-exp-public.d.ts'
+  : './dist/app-exp.d.ts';
 console.log(
-  `Updating the typings field to the public d.ts file ${PUBLIC_TYPINGS_PATH}`
+  `Updating the packages-exp/app-exp typings field to the ${
+    argv.public ? 'public' : 'internal'
+  } d.ts file ${TYPINGS_PATH}`
 );
+const packageJson = require(packageJsonPath);
+packageJson.typings = TYPINGS_PATH;
 
-const packageJson = require('./package.json');
-packageJson.typings = PUBLIC_TYPINGS_PATH;
-
-writeFileSync('./package.json', `${JSON.stringify(packageJson, null, 2)}\n`, {
+writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`, {
   encoding: 'utf-8'
 });

scripts/exp/release.js

@@ -102,7 +102,7 @@ async function publishExpPackages() {
 
 async function buildPackages() {
   const spinner = ora(' Building Packages').start();
-  await spawn('yarn', ['build:exp'], {
+  await spawn('yarn', ['build:exp:release'], {
     cwd: projectRoot
   });
   spinner.stopAndPersist({

scripts/release/utils/yarn.js

@@ -36,7 +36,7 @@ exports.reinstallDeps = async () => {
 exports.buildPackages = async () => {
   try {
     const spinner = ora(' Building Packages').start();
-    await spawn('yarn', ['build'], {
+    await spawn('yarn', ['build:release'], {
       cwd: root
     });
     spinner.stopAndPersist({