Auth next build (#3654)

* update package.json

* make internal and main share code

* remove unused deps and files

* point to the right typing file for internal

* cast internal Auth to public Auth to make TS happy

Author: Feiyang1

packages-exp/auth-compat-exp/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@firebase/auth-compat-exp",
-  "version": "0.1.0",
+  "name": "@firebase/auth-compat",
+  "version": "0.0.800",
   "private": true,
   "description": "FirebaseAuth compatibility package that uses API style compatible with Firebase@7 and prior versions",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -24,25 +24,22 @@
     "prepare": "yarn build"
   },
   "peerDependencies": {
-    "@firebase/app": "0.x",
-    "@firebase/auth-types": "0.x",
-    "@firebase/auth-exp": "0.x",
-    "@firebase/auth-types-exp": "0.x",
-    "@firebase/component": "0.x",
-    "@firebase/installations": "0.x",
-    "@firebase/util": "0.x"
+    "@firebase/app": "0.x"
   },
   "dependencies": {
-    "tslib": "1.11.1"
+    "@firebase/auth-types": "0.10.1",
+    "@firebase/auth-exp": "0.0.800",
+    "@firebase/auth-types-exp": "0.0.800",
+    "@firebase/component": "0.1.17",
+    "@firebase/util": "0.3.0",
+    "tslib": "^1.11.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-exp": "0.x",
-    "@firebase/auth-exp": "0.x",
-    "rollup": "1.32.1",
+    "rollup": "2.23.0",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",
-    "rollup-plugin-typescript2": "0.26.0"
+    "rollup-plugin-typescript2": "0.27.1"
   },
   "repository": {
     "directory": "packages-exp/auth-compat-exp",

packages-exp/auth-compat-exp/src/user.ts

@@ -47,7 +47,7 @@ export class User extends impl.UserImpl implements compat.User {
     credential: compat.AuthCredential
   ): Promise<compat.UserCredential> {
     return convertCredential(
-      this.auth,
+      (this.auth as unknown) as externs.Auth,
       impl.linkWithCredential(this, credential as externs.AuthCredential)
     );
   }
@@ -56,15 +56,15 @@ export class User extends impl.UserImpl implements compat.User {
     applicationVerifier: compat.ApplicationVerifier
   ): Promise<compat.ConfirmationResult> {
     return convertConfirmationResult(
-      this.auth,
+      (this.auth as unknown) as externs.Auth,
       impl.linkWithPhoneNumber(this, phoneNumber, applicationVerifier)
     );
   }
   async linkWithPopup(
     provider: compat.AuthProvider
   ): Promise<compat.UserCredential> {
     return convertCredential(
-      this.auth,
+      (this.auth as unknown) as externs.Auth,
       impl.linkWithPopup(
         this,
         provider as externs.AuthProvider,
@@ -88,7 +88,7 @@ export class User extends impl.UserImpl implements compat.User {
     credential: compat.AuthCredential
   ): Promise<compat.UserCredential> {
     return convertCredential(
-      this.auth,
+      (this.auth as unknown) as externs.Auth,
       impl.reauthenticateWithCredential(
         this,
         credential as externs.AuthCredential
@@ -100,15 +100,15 @@ export class User extends impl.UserImpl implements compat.User {
     applicationVerifier: compat.ApplicationVerifier
   ): Promise<compat.ConfirmationResult> {
     return convertConfirmationResult(
-      this.auth,
+      (this.auth as unknown) as externs.Auth,
       impl.reauthenticateWithPhoneNumber(this, phoneNumber, applicationVerifier)
     );
   }
   reauthenticateWithPopup(
     provider: compat.AuthProvider
   ): Promise<compat.UserCredential> {
     return convertCredential(
-      this.auth,
+      (this.auth as unknown) as externs.Auth,
       impl.reauthenticateWithPopup(
         this,
         provider as externs.AuthProvider,

packages-exp/auth-exp/demo/package.json

@@ -15,28 +15,26 @@
     "build:deps": "lerna run --scope @firebase/'{app-exp,auth-exp}' --include-dependencies build",
     "dev": "rollup -c -w"
   },
-  "peerDependencies": {
-    "@firebase/app-exp": "0.x",
-    "@firebase/app-types-exp": "0.x",
-    "@firebase/auth-exp": "0.x",
-    "@firebase/auth-types-exp": "0.x"
-  },
   "dependencies": {
-    "@firebase/logger": "^0.2.2",
-    "@firebase/util": "^0.2.44",
-    "lerna": "^3.22.1",
-    "tslib": "1.11.1"
+    "@firebase/app-exp": "0.0.800",
+    "@firebase/app-types-exp": "0.0.800",
+    "@firebase/auth-exp": "0.0.800",
+    "@firebase/auth-types-exp": "0.0.800",
+    "@firebase/logger": "0.2.6",
+    "@firebase/util": "0.3.0",
+    "tslib": "^1.11.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^8.0.1",
-    "@rollup/plugin-strip": "^1.3.2",
-    "rollup": "1.32.1",
+    "@rollup/plugin-strip": "1.3.2",
+    "rollup": "2.23.0",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-terser": "6.1.0",
-    "rollup-plugin-typescript2": "0.26.0",
-    "rollup-plugin-uglify": "6.0.4"
+    "rollup-plugin-typescript2": "0.27.1",
+    "rollup-plugin-uglify": "6.0.4",
+    "rollup-plugin-node-resolve": "5.2.0",
+    "lerna": "3.22.1"
   },
   "repository": {
     "directory": "packages-exp/auth-exp/demo",

packages-exp/auth-exp/internal/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@firebase/auth-exp/internal",
   "description": "An internal version of the Auth SDK for use in the compatibility layer",
-  "main": "../dist/internal/index.node.cjs.js",
-  "module": "../dist/internal/index.browser.esm.js",
-  "browser": "../dist/internal/index.browser.esm.js",
-  "typings": "../dist/internal/internal/index.d.ts",
+  "main": "../dist/node/internal.js",
+  "module": "../dist/esm5/internal.js",
+  "browser": "../dist/esm5/internal.js",
+  "esm2017": "../dist/esm2017/internal.js",
+  "typings": "../dist/esm5/internal/index.d.ts",
   "private": true
 }

packages-exp/auth-exp/package.json

@@ -1,25 +1,23 @@
 {
   "name": "@firebase/auth-exp",
-  "version": "0.1.0",
+  "version": "0.0.800",
   "private": true,
   "description": "The Firebase Authenticaton component of the Firebase JS SDK.",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
-  "main": "dist/index.node.cjs.js",
-  "main-esm2017": "dist/index.node.esm2017.js",
-  "react-native": "dist/index.rn.cjs.js",
-  "browser": "dist/index.cjs.js",
-  "module": "dist/index.esm.js",
-  "esm2017": "dist/index.esm2017.js",
+  "main": "dist/node/index.js",
+  "react-native": "dist/rn/index.js",
+  "browser": "dist/esm5/index.js",
+  "module": "dist/esm5/index.js",
+  "esm2017": "dist/esm2017/index.js",
   "webworker": "dist/index.webworker.esm5.js",
   "files": [
     "dist"
   ],
   "scripts": {
     "lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
-    "build": "rollup -c && yarn build:internal",
-    "build:deps": "lerna run --scope @firebase/'{app-exp,auth-exp,util}' --include-dependencies build",
-    "build:internal": "rollup -c rollup.config.internal.js",
+    "build": "rollup -c",
+    "build:deps": "lerna run --scope @firebase/auth-exp --include-dependencies build",
     "build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public",
     "dev": "rollup -c -w",
     "test": "yarn type-check && run-p lint test:browser test:node",
@@ -36,30 +34,24 @@
   },
   "peerDependencies": {
     "@firebase/app-exp": "0.x",
-    "@firebase/app-types-exp": "0.x",
-    "@firebase/auth-exp": "0.x",
-    "@firebase/auth-types-exp": "0.x",
-    "@firebase/util": "0.x"
+    "@firebase/app-types-exp": "0.x"
   },
   "dependencies": {
+    "@firebase/logger": "0.2.6",
+    "@firebase/util": "0.3.0",
     "@firebase/component": "0.1.17",
-    "@firebase/logger": "^0.2.6",
-    "@firebase/util": "^0.3.0",
+    "@firebase/auth-types-exp": "0.0.800",
     "node-fetch": "2.6.0",
     "tslib": "^1.11.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@rollup/plugin-strip": "^1.3.2",
+    "@firebase/app-exp": "0.0.800",
     "rollup": "2.23.0",
-    "rollup-plugin-copy-assets": "1.1.0",
     "rollup-plugin-json": "4.0.0",
-    "rollup-plugin-node-resolve": "5.2.0",
-    "rollup-plugin-replace": "2.2.0",
     "rollup-plugin-sourcemaps": "0.6.2",
-    "rollup-plugin-terser": "6.1.0",
     "rollup-plugin-typescript2": "0.27.1",
-    "ts-node": "8.10.2",
+    "@rollup/plugin-strip": "1.3.2",
     "typescript": "3.9.7"
   },
   "repository": {
@@ -70,7 +62,7 @@
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
-  "typings": "dist/index.d.ts",
+  "typings": "dist/esm5/index.d.ts",
   "nyc": {
     "extension": [
       ".ts"

packages-exp/auth-exp/rollup.config.internal.js

@@ -50,11 +50,11 @@ const es5Builds = [
    * Browser Builds
    */
   {
-    input: 'index.ts',
-    output: [
-      { file: pkg.browser, format: 'cjs', sourcemap: true },
-      { file: pkg.module, format: 'esm', sourcemap: true }
-    ],
+    input: {
+      index: 'index.ts',
+      internal: 'internal/index.ts'
+    },
+    output: [{ dir: 'dist/esm5', format: 'esm', sourcemap: true }],
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
@@ -86,17 +86,23 @@ const es5Builds = [
    * Node.js Build
    */
   {
-    input: 'index.node.ts',
-    output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
+    input: {
+      index: 'index.node.ts',
+      internal: 'internal/index.ts'
+    },
+    output: [{ dir: 'dist/node', format: 'cjs', sourcemap: true }],
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   /**
    * React Native Builds
    */
   {
-    input: 'index.rn.ts',
-    output: [{ file: pkg['react-native'], format: 'cjs', sourcemap: true }],
+    input: {
+      index: 'index.rn.ts',
+      internal: 'internal/index.ts'
+    },
+    output: [{ dir: 'dist/rn', format: 'cjs', sourcemap: true }],
     plugins: es5BuildPlugins,
     external: id =>
       [...deps, 'react-native'].some(
@@ -125,9 +131,12 @@ const es2017Builds = [
    *  Browser Builds
    */
   {
-    input: 'index.ts',
+    input: {
+      index: 'index.ts',
+      internal: 'internal/index.ts'
+    },
     output: {
-      file: pkg.esm2017,
+      dir: 'dist/esm2017',
       format: 'es',
       sourcemap: true
     },