Skip to content

Commit 85528d9

Browse files
committed
🔀 Merge branch 'develop'
1 parent 0f6b4f3 commit 85528d9

3 files changed

Lines changed: 233 additions & 351 deletions

File tree

rollup.config.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,9 @@ const plugins = [
3030
}),
3131
nodeBuiltins(),
3232
nodeResolve({
33+
module: true,
34+
jsnext: true,
3335
browser: true,
34-
customResolveOptions: {
35-
packageFilter: pkg => {
36-
if (pkg['module']) {
37-
pkg['main'] = pkg['module'];
38-
} else if (pkg['jsnext:main']) {
39-
pkg['main'] = pkg['jsnext:main'];
40-
}
41-
42-
const fixedPackages = ['@firebase/util', '@firebase/database'];
43-
if (fixedPackages.indexOf(pkg.name) !== -1) {
44-
pkg['browser'] = pkg.main;
45-
}
46-
47-
return pkg;
48-
},
49-
},
5036
}),
5137
typescript(),
5238
nodeGlobals(),

src/sagas/auth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ function* logout() {
215215
}));
216216
}
217217

218-
localStorage.removeItem(LOCALSTORAGE_KEY);
218+
yield call(AuthData.remove, LOCALSTORAGE_KEY);
219219
yield firebase.auth!().signOut();
220220
yield put(checkLoginStatus());
221221
}

0 commit comments

Comments
 (0)