Skip to content

Commit 4a5e110

Browse files
committed
make internal and main share code
1 parent d8f4fcb commit 4a5e110

File tree

9 files changed

+37
-100
lines changed

9 files changed

+37
-100
lines changed
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "@firebase/auth-exp/internal",
33
"description": "An internal version of the Auth SDK for use in the compatibility layer",
4-
"main": "../dist/internal/index.node.cjs.js",
5-
"module": "../dist/internal/index.browser.esm.js",
6-
"browser": "../dist/internal/index.browser.esm.js",
7-
"typings": "../dist/internal/internal/index.d.ts",
4+
"main": "../dist/node/internal.js",
5+
"module": "../dist/esm5/internal.js",
6+
"browser": "../dist/esm5/internal.js",
7+
"esm2017": "../dist/esm2017/internal.js",
8+
"typings": "../dist/esm5/index.d.ts",
89
"private": true
910
}

packages-exp/auth-exp/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@
44
"private": true,
55
"description": "The Firebase Authenticaton component of the Firebase JS SDK.",
66
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
7-
"main": "dist/index.node.cjs.js",
8-
"main-esm2017": "dist/index.node.esm2017.js",
9-
"react-native": "dist/index.rn.cjs.js",
10-
"browser": "dist/index.cjs.js",
11-
"module": "dist/index.esm.js",
12-
"esm2017": "dist/index.esm2017.js",
7+
"main": "dist/node/index.js",
8+
"react-native": "dist/rn/index.js",
9+
"browser": "dist/esm5/index.js",
10+
"module": "dist/esm5/index.js",
11+
"esm2017": "dist/esm2017/index.js",
1312
"webworker": "dist/index.webworker.esm5.js",
1413
"files": [
1514
"dist"
1615
],
1716
"scripts": {
1817
"lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
1918
"lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
20-
"build": "rollup -c && yarn build:internal",
21-
"build:deps": "lerna run --scope @firebase/'{app-exp,auth-exp,util}' --include-dependencies build",
22-
"build:internal": "rollup -c rollup.config.internal.js",
19+
"build": "rollup -c",
20+
"build:deps": "lerna run --scope @firebase/auth-exp --include-dependencies build",
2321
"build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public",
2422
"dev": "rollup -c -w",
2523
"test": "yarn type-check && run-p lint test:browser test:node",
@@ -47,7 +45,7 @@
4745
},
4846
"license": "Apache-2.0",
4947
"devDependencies": {
50-
"@rollup/plugin-strip": "1.3.2",
48+
"@firebase/app-exp": "0.0.800",
5149
"rollup": "2.23.0",
5250
"rollup-plugin-copy-assets": "1.1.0",
5351
"rollup-plugin-json": "4.0.0",
@@ -56,6 +54,7 @@
5654
"rollup-plugin-sourcemaps": "0.6.2",
5755
"rollup-plugin-terser": "6.1.0",
5856
"rollup-plugin-typescript2": "0.27.1",
57+
"@rollup/plugin-strip": "1.3.2",
5958
"typescript": "3.9.7"
6059
},
6160
"repository": {
@@ -66,7 +65,7 @@
6665
"bugs": {
6766
"url": "https://github.com/firebase/firebase-js-sdk/issues"
6867
},
69-
"typings": "dist/index.d.ts",
68+
"typings": "dist/esm5/index.d.ts",
7069
"nyc": {
7170
"extension": [
7271
".ts"

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

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ const es5Builds = [
5050
* Browser Builds
5151
*/
5252
{
53-
input: 'index.ts',
54-
output: [
55-
{ file: pkg.browser, format: 'cjs', sourcemap: true },
56-
{ file: pkg.module, format: 'esm', sourcemap: true }
57-
],
53+
input: {
54+
index: 'index.ts',
55+
internal: 'internal/index.ts'
56+
},
57+
output: [{ dir: 'dist/esm5', format: 'esm', sourcemap: true }],
5858
plugins: es5BuildPlugins,
5959
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
6060
},
@@ -86,17 +86,23 @@ const es5Builds = [
8686
* Node.js Build
8787
*/
8888
{
89-
input: 'index.node.ts',
90-
output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
89+
input: {
90+
index: 'index.node.ts',
91+
internal: 'internal/index.ts'
92+
},
93+
output: [{ dir: 'dist/node', format: 'cjs', sourcemap: true }],
9194
plugins: es5BuildPlugins,
9295
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
9396
},
9497
/**
9598
* React Native Builds
9699
*/
97100
{
98-
input: 'index.rn.ts',
99-
output: [{ file: pkg['react-native'], format: 'cjs', sourcemap: true }],
101+
input: {
102+
index: 'index.rn.ts',
103+
internal: 'internal/index.ts'
104+
},
105+
output: [{ dir: 'dist/rn', format: 'cjs', sourcemap: true }],
100106
plugins: es5BuildPlugins,
101107
external: id =>
102108
[...deps, 'react-native'].some(
@@ -125,9 +131,12 @@ const es2017Builds = [
125131
* Browser Builds
126132
*/
127133
{
128-
input: 'index.ts',
134+
input: {
135+
index: 'index.ts',
136+
internal: 'internal/index.ts'
137+
},
129138
output: {
130-
file: pkg.esm2017,
139+
dir: 'dist/esm2017',
131140
format: 'es',
132141
sourcemap: true
133142
},

packages-exp/auth-exp/src/model/popup_redirect.d.ts renamed to packages-exp/auth-exp/src/model/popup_redirect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const enum GapiOutcome {
3131
ERROR = 'ERROR'
3232
}
3333

34-
interface GapiAuthEvent extends gapi.iframes.Message {
34+
export interface GapiAuthEvent extends gapi.iframes.Message {
3535
authEvent: AuthEvent;
3636
}
3737

packages-exp/auth-exp/src/model/user.d.ts renamed to packages-exp/auth-exp/src/model/user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { Auth } from './auth';
2525
import { IdTokenResponse, TaggedWithTokenResponse } from './id_token';
2626
import { StsTokenManager } from '../core/user/token_manager';
2727

28-
type MutableUserInfo = {
28+
export type MutableUserInfo = {
2929
-readonly [K in keyof externs.UserInfo]: externs.UserInfo[K];
3030
};
3131

0 commit comments

Comments
 (0)