Skip to content

Commit f7bf249

Browse files
authored
Messaging rewrite (#2484)
1 parent 2092cce commit f7bf249

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3811
-6378
lines changed

config/.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ module.exports = {
1414
},
1515
'overrides': [
1616
{
17-
'files': ['**/*.test.ts', '**/test/**/*.ts'],
17+
'files': ['**/*.test.ts', '**/{test,testing}/**/*.ts'],
1818
'rules': {
19+
// TODO: Use https://www.npmjs.com/package/eslint-plugin-chai-friendly instead
1920
'no-unused-expressions': 'off',
2021
'@typescript-eslint/no-explicit-any': 'off'
2122
}

config/webpack.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module.exports = {
5050
options: { esModules: true }
5151
},
5252
enforce: 'post',
53-
include: path.resolve(process.cwd(), 'src')
53+
exclude: [/\.test\.ts$/, /\btest(ing)?\//]
5454
},
5555
{
5656
test: /\.js$/,

packages/messaging-types/index.d.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ import {
2424
CompleteFn
2525
} from '@firebase/util';
2626

27-
export class FirebaseMessaging {
28-
private constructor();
27+
export interface FirebaseMessaging {
28+
// TODO: remove the token parameter and just delete the token that matches
29+
// this app if it exists.
2930
deleteToken(token: string): Promise<boolean>;
3031
getToken(): Promise<string>;
3132
onMessage(

packages/messaging/karma.conf.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@ const karma = require('karma');
1919
const path = require('path');
2020
const karmaBase = require('../../config/karma.base');
2121

22-
const files = [`test/**/*.ts`];
22+
const FILES = [`src/**/*.test.ts`];
2323

2424
module.exports = function(config) {
25-
const karmaConfig = Object.assign({}, karmaBase, {
26-
// files to load into karma
27-
files: files,
28-
// frameworks to use
29-
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
25+
const karmaConfig = {
26+
...karmaBase,
27+
files: FILES,
28+
preprocessors: { 'src/**/*.test.ts': ['webpack', 'sourcemap'] },
3029
frameworks: ['mocha']
31-
});
30+
};
3231

3332
config.set(karmaConfig);
3433
};
3534

36-
module.exports.files = files;
35+
module.exports.files = FILES;

packages/messaging/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@
3030
"@firebase/messaging-types": "0.4.0",
3131
"@firebase/util": "0.2.36",
3232
"@firebase/component": "0.1.1",
33+
"idb": "3.0.2",
3334
"tslib": "1.10.0"
3435
},
3536
"devDependencies": {
3637
"rollup": "1.28.0",
3738
"rollup-plugin-typescript2": "0.25.3",
39+
"ts-essentials": "4.0.0",
3840
"typescript": "3.7.3"
3941
},
4042
"repository": {

packages/messaging/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const es5BuildPlugins = [
3636

3737
const es5Builds = [
3838
{
39-
input: 'index.ts',
39+
input: 'src/index.ts',
4040
output: [
4141
{ file: pkg.main, format: 'cjs', sourcemap: true },
4242
{ file: pkg.module, format: 'es', sourcemap: true }
@@ -63,7 +63,7 @@ const es2017BuildPlugins = [
6363

6464
const es2017Builds = [
6565
{
66-
input: 'index.ts',
66+
input: 'src/index.ts',
6767
output: {
6868
file: pkg.esm2017,
6969
format: 'es',

0 commit comments

Comments
 (0)