diff --git a/.eslintignore b/.eslintignore index c29c5fbb8..e03245044 100644 --- a/.eslintignore +++ b/.eslintignore @@ -16,7 +16,6 @@ test/views/*.js # typescript-generated files ts/**/*.js - # ES2015+ files !js/background.js !js/backup.js diff --git a/preload.js b/preload.js index 60e59ec3a..94d8bbef8 100644 --- a/preload.js +++ b/preload.js @@ -150,7 +150,7 @@ window.Signal.Database = require('./js/modules/database'); window.Signal.Debug = require('./js/modules/debug'); window.Signal.Logs = require('./js/modules/logs'); -window.Signal.React = {}; +window.Signal.Components = {}; window.Signal.Migrations = {}; window.Signal.Migrations.deleteAttachmentData = diff --git a/test/styleguide/legacy_bridge.js b/test/styleguide/legacy_bridge.js index 8319fbede..7f07ac287 100644 --- a/test/styleguide/legacy_bridge.js +++ b/test/styleguide/legacy_bridge.js @@ -18,7 +18,7 @@ window.Signal.Migrations = { getPlaceholderMigrations: () => {}, }; -window.Signal.React = {}; +window.Signal.Components = {}; window.EmojiConvertor = function EmojiConvertor() {}; window.EmojiConvertor.prototype.init_colons = () => {}; diff --git a/ts/test/StyleGuideUtil.ts b/ts/test/StyleGuideUtil.ts index c4affea90..67b5c07f6 100644 --- a/ts/test/StyleGuideUtil.ts +++ b/ts/test/StyleGuideUtil.ts @@ -77,7 +77,7 @@ parent.moment.locale(locale); parent.React = React; parent.ReactDOM = ReactDOM; -const SignalReact = parent.Signal.React = parent.Signal.React || {}; +const SignalComponents: any = parent.Signal.Components = {}; -SignalReact.Message = Message; -SignalReact.Reply = Reply; +SignalComponents.Message = Message; +SignalComponents.Reply = Reply;