Skip to content

Commit

Permalink
Merge master into release
Browse files Browse the repository at this point in the history
  • Loading branch information
google-oss-bot authored Feb 1, 2023
2 parents 1de6be4 + 70c042a commit e1d7c9d
Show file tree
Hide file tree
Showing 3 changed files with 797 additions and 561 deletions.
2 changes: 0 additions & 2 deletions e2e/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ module.exports = function (config) {
resolve: {
directories: ['./node_modules'],
alias: {
'@firebase/messaging/sw':
'node_modules/@firebase/messaging/dist/index.sw.esm2017.js',
'idb': 'node_modules/idb/build/index.js'
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"karma-typescript": "5.5.3",
"karma-typescript-es6-transform": "5.5.3",
"mocha": "9.2.2",
"typescript": "4.3.4",
"typescript": "4.7.4",
"webpack": "5.75.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.10.0"
Expand Down
Loading

0 comments on commit e1d7c9d

Please sign in to comment.