From 7f50074c0d1f362908499c7e6a1f334fd7e8746e Mon Sep 17 00:00:00 2001 From: Evan Morikawa Date: Tue, 3 May 2016 16:42:28 -0700 Subject: [PATCH] feat(babel6): Convert to use new es6 require syntax --- build/tasks/nylaslint-task.coffee | 38 +++++++------ .../category-picker/lib/category-picker.cjsx | 2 +- .../spec/category-picker-spec.cjsx | 2 +- .../lib/template-composer-extension.es6 | 5 +- .../lib/template-editor.es6 | 2 - .../composer-templates/lib/template-store.es6 | 3 +- internal_packages/composer/lib/fields.es6 | 2 +- .../spec/collapsed-participants-spec.cjsx | 4 +- .../spec/composer-header-actions-spec.cjsx | 4 +- .../composer/spec/composer-view-spec.cjsx | 6 +- .../spec/expanded-participants-spec.cjsx | 57 ------------------- .../composer/spec/quoted-text-spec.cjsx | 6 +- .../composer/spec/send-actions-spec.cjsx | 2 +- internal_packages/message-list/lib/main.cjsx | 4 +- .../message-list/lib/message-item-body.cjsx | 2 +- .../message-list/lib/message-item.cjsx | 2 +- .../message-list/lib/message-list.cjsx | 2 +- .../lib/view-on-github-button.cjsx | 2 +- .../lib/personal-level-icon.jsx | 2 - internal_packages/thread-list/lib/main.cjsx | 6 +- .../thread-list/lib/thread-list.cjsx | 6 +- .../thread-search/lib/search-store.coffee | 2 +- .../spec/main-spec.coffee | 2 +- .../worker-sync/lib/nylas-sync-worker.coffee | 2 +- .../spec/nylas-sync-worker-spec.coffee | 2 +- ...elect-list-interaction-handler-spec.coffee | 2 +- ...lect-split-interaction-handler-spec.coffee | 2 +- spec/database-object-registry-spec.coffee | 2 +- spec/extension-registry-spec.coffee | 2 +- spec/models/query-spec.coffee | 2 +- spec/models/query-subscription-spec.coffee | 4 +- spec/models/thread-spec.coffee | 2 +- spec/nylas-api-spec.coffee | 4 +- spec/stores/badge-store-spec.coffee | 2 +- spec/stores/database-store-spec.coffee | 2 +- spec/stores/database-transaction-spec.coffee | 2 +- spec/stores/focused-content-store-spec.coffee | 2 +- spec/stores/message-store-spec.coffee | 4 +- spec/stores/task-queue-spec.coffee | 2 +- spec/tasks/change-folder-task-spec.coffee | 6 +- spec/tasks/change-labels-task-spec.coffee | 6 +- spec/tasks/change-starred-task-spec.coffee | 6 +- spec/tasks/change-unread-task-spec.coffee | 6 +- spec/tasks/task-spec.coffee | 2 +- spec/utils-spec.coffee | 2 +- src/browser/linux-updater-adapter.es6 | 3 +- src/components/button-dropdown.cjsx | 2 +- src/components/empty-list-state.cjsx | 2 +- src/components/evented-iframe.cjsx | 2 +- src/components/list-tabular-item.cjsx | 2 +- src/components/mail-label.cjsx | 2 +- src/components/multiselect-action-bar.cjsx | 2 +- src/components/scroll-region.cjsx | 2 +- src/components/tokenizing-text-field.cjsx | 2 +- src/flux/models/account.coffee | 2 +- src/flux/models/message.coffee | 2 +- .../models/query-subscription-pool.coffee | 2 +- src/flux/models/utils.coffee | 4 +- src/flux/nylas-api.coffee | 4 +- src/flux/stores/account-store.coffee | 2 +- src/flux/stores/badge-store.es6 | 3 +- .../database-setup-query-builder.coffee | 2 +- src/flux/stores/draft-editing-session.coffee | 4 +- src/flux/stores/draft-factory.coffee | 2 +- src/flux/stores/draft-store.coffee | 14 ++--- src/flux/stores/focused-contacts-store.coffee | 2 +- src/flux/stores/focused-content-store.coffee | 2 +- src/flux/stores/mail-rules-store.coffee | 2 +- src/flux/stores/message-body-processor.es6 | 3 +- src/flux/stores/message-store.coffee | 8 +-- src/flux/stores/metadata-store.es6 | 3 +- src/flux/stores/outbox-store.es6 | 4 +- src/flux/stores/recently-read-store.es6 | 3 +- src/flux/stores/task-queue.coffee | 2 +- src/flux/stores/thread-counts-store.coffee | 2 +- src/flux/stores/undo-redo-store.coffee | 2 +- src/flux/tasks/syncback-category-task.es6 | 2 +- src/global/nylas-exports.coffee | 6 +- src/mail-rules-processor.coffee | 12 ++-- src/mailbox-perspective.coffee | 18 +++--- src/nylas-env.coffee | 2 +- src/package.coffee | 4 +- src/services/quoted-html-transformer.coffee | 2 +- src/sheet-container.cjsx | 2 +- src/sheet-toolbar.cjsx | 2 +- src/sheet.cjsx | 2 +- 86 files changed, 162 insertions(+), 212 deletions(-) delete mode 100644 internal_packages/composer/spec/expanded-participants-spec.cjsx diff --git a/build/tasks/nylaslint-task.coffee b/build/tasks/nylaslint-task.coffee index 606d587e5..db30fa475 100644 --- a/build/tasks/nylaslint-task.coffee +++ b/build/tasks/nylaslint-task.coffee @@ -23,30 +23,36 @@ module.exports = (grunt) -> for f in fileset.src if esExtensions[path.extname(f)] esSet[path.basename(f, path.extname(f))] = true + blacklist = ["events", "main", "package", "task"] + delete esSet[item] for item in blacklist errors = [] # file.src is the list of all matching file names. for f in fileset.src - continue if esExtensions[path.extname(f)] - content = fs.readFileSync(f, encoding:'utf8') - if extensionRegex.test(content) - errors.push("#{f}: Remove require extension!") + if esExtensions[path.extname(f)] + content = fs.readFileSync(f, encoding:'utf8') + if /module.exports\s?=\s?.+/.test(content) + errors.push("#{f}: Don't use module.exports in ES6") + else + content = fs.readFileSync(f, encoding:'utf8') + if extensionRegex.test(content) + errors.push("#{f}: Remove require extension!") - requireRe = /require[\s()]['"](.*)['"]/gmi - while result = requireRe.exec(content) - i = 1 - while i < result.length - requirePath = result[i] - i += 1 - baseRequirePath = path.basename(requirePath) - if esSet[baseRequirePath] - testForPath = new RegExp("require\\(['\"].*#{baseRequirePath}['\"]\\)\\.","gm") - if not testForPath.test(content) - errors.push("#{f}: ES6 add `default` to require #{requirePath}") + requireRe = /require[\s()]['"](.*)['"]/gmi + while result = requireRe.exec(content) + i = 1 + while i < result.length + requirePath = result[i] + i += 1 + baseRequirePath = path.basename(requirePath) + if esSet[baseRequirePath] + testForPath = new RegExp("require\\(['\"].*#{baseRequirePath}['\"]\\)\\.","gm") + if not testForPath.test(content) + errors.push("#{f}: ES6 add `default` to require #{requirePath}") if errors.length > 0 grunt.log.error(err) for err in errors - done(new Error("Please fix the linter errors! Since we compile files in production to plain `.js` files it's very important you do NOT include the file extension when `require`ing a file. Also, as of Babel 6, `require` no longer returns whatever the `default` value is. If you are `require`ing an es6 file from a coffeescript file, you must explicitly request the `default` property. For example: do `require('./my-es6-file').default`")) + done(new Error("Please fix the #{errors.length} linter errors! Since we compile files in production to plain `.js` files it's very important you do NOT include the file extension when `require`ing a file. Also, as of Babel 6, `require` no longer returns whatever the `default` value is. If you are `require`ing an es6 file from a coffeescript file, you must explicitly request the `default` property. For example: do `require('./my-es6-file').default`")) done(null) diff --git a/internal_packages/category-picker/lib/category-picker.cjsx b/internal_packages/category-picker/lib/category-picker.cjsx index 3af2fe919..b45da73b8 100644 --- a/internal_packages/category-picker/lib/category-picker.cjsx +++ b/internal_packages/category-picker/lib/category-picker.cjsx @@ -9,7 +9,7 @@ ReactDOM = require 'react-dom' {RetinaImg, KeyCommandsRegion} = require 'nylas-component-kit' -CategoryPickerPopover = require './category-picker-popover' +CategoryPickerPopover = require('./category-picker-popover').default # This changes the category on one or more threads. diff --git a/internal_packages/category-picker/spec/category-picker-spec.cjsx b/internal_packages/category-picker/spec/category-picker-spec.cjsx index 9fc1c9450..58c239e10 100644 --- a/internal_packages/category-picker/spec/category-picker-spec.cjsx +++ b/internal_packages/category-picker/spec/category-picker-spec.cjsx @@ -2,7 +2,7 @@ _ = require 'underscore' React = require "react" ReactDOM = require 'react-dom' ReactTestUtils = require 'react-addons-test-utils' -CategoryPickerPopover = require '../lib/category-picker-popover' +CategoryPickerPopover = require('../lib/category-picker-popover').default {Utils, Category, diff --git a/internal_packages/composer-templates/lib/template-composer-extension.es6 b/internal_packages/composer-templates/lib/template-composer-extension.es6 index 961849417..fad672444 100644 --- a/internal_packages/composer-templates/lib/template-composer-extension.es6 +++ b/internal_packages/composer-templates/lib/template-composer-extension.es6 @@ -1,6 +1,6 @@ import {DOMUtils, ComposerExtension} from 'nylas-exports'; -class TemplatesComposerExtension extends ComposerExtension { +export default class TemplatesComposerExtension extends ComposerExtension { static warningsForSending({draft}) { const warnings = []; @@ -115,6 +115,3 @@ class TemplatesComposerExtension extends ComposerExtension { } } } - - -module.exports = TemplatesComposerExtension; diff --git a/internal_packages/composer-templates/lib/template-editor.es6 b/internal_packages/composer-templates/lib/template-editor.es6 index 8c6f86973..ff61524bb 100644 --- a/internal_packages/composer-templates/lib/template-editor.es6 +++ b/internal_packages/composer-templates/lib/template-editor.es6 @@ -69,5 +69,3 @@ export default class TemplateEditor extends ContenteditableExtension { } } } - -module.exports = TemplateEditor diff --git a/internal_packages/composer-templates/lib/template-store.es6 b/internal_packages/composer-templates/lib/template-store.es6 index 3bded06dd..e9d98aecc 100644 --- a/internal_packages/composer-templates/lib/template-store.es6 +++ b/internal_packages/composer-templates/lib/template-store.es6 @@ -280,4 +280,5 @@ class TemplateStore extends NylasStore { } } -module.exports = new TemplateStore(); +const store = new TemplateStore(); +export default store diff --git a/internal_packages/composer/lib/fields.es6 b/internal_packages/composer/lib/fields.es6 index e59509aa9..0593e7b0e 100644 --- a/internal_packages/composer/lib/fields.es6 +++ b/internal_packages/composer/lib/fields.es6 @@ -18,4 +18,4 @@ Fields.Order = { "contentBody": 6, }; -module.exports = Fields; +export default Fields diff --git a/internal_packages/composer/spec/collapsed-participants-spec.cjsx b/internal_packages/composer/spec/collapsed-participants-spec.cjsx index cde1ed570..7b0b5cad0 100644 --- a/internal_packages/composer/spec/collapsed-participants-spec.cjsx +++ b/internal_packages/composer/spec/collapsed-participants-spec.cjsx @@ -3,8 +3,8 @@ React = require "react" ReactDOM = require 'react-dom' ReactTestUtils = require 'react-addons-test-utils' -Fields = require '../lib/fields' -CollapsedParticipants = require '../lib/collapsed-participants' +Fields = require('../lib/fields').default +CollapsedParticipants = require('../lib/collapsed-participants').default {Contact} = require 'nylas-exports' diff --git a/internal_packages/composer/spec/composer-header-actions-spec.cjsx b/internal_packages/composer/spec/composer-header-actions-spec.cjsx index 4e39260ab..1cc97ef13 100644 --- a/internal_packages/composer/spec/composer-header-actions-spec.cjsx +++ b/internal_packages/composer/spec/composer-header-actions-spec.cjsx @@ -1,7 +1,7 @@ React = require 'react' ReactDOM = require 'react-dom' -ComposerHeaderActions = require '../lib/composer-header-actions' -Fields = require '../lib/fields' +ComposerHeaderActions = require('../lib/composer-header-actions').default +Fields = require('../lib/fields').default ReactTestUtils = require('react-addons-test-utils') {Actions} = require 'nylas-exports' diff --git a/internal_packages/composer/spec/composer-view-spec.cjsx b/internal_packages/composer/spec/composer-view-spec.cjsx index 78a67802b..44884c65c 100644 --- a/internal_packages/composer/spec/composer-view-spec.cjsx +++ b/internal_packages/composer/spec/composer-view-spec.cjsx @@ -22,8 +22,8 @@ ReactTestUtils = require('react-addons-test-utils') {InjectedComponent, ParticipantsTextField} = require 'nylas-component-kit' DraftEditingSession = require '../../../src/flux/stores/draft-editing-session' -ComposerEditor = require '../lib/composer-editor' -Fields = require '../lib/fields' +ComposerEditor = require('../lib/composer-editor').default +Fields = require('../lib/fields').default u1 = new Contact(name: "Christine Spang", email: "spang@nylas.com") u2 = new Contact(name: "Michael Grinich", email: "mg@nylas.com") @@ -36,7 +36,7 @@ f2 = new File(id: 'file_2_id', filename: 'b.pdf', contentType: '', size: 999999, users = [u1, u2, u3, u4, u5] -ComposerView = require "../lib/composer-view", +ComposerView = require("../lib/composer-view").default # This will setup the mocks necessary to make the composer element (once # mounted) think it's attached to the given draft. This mocks out the diff --git a/internal_packages/composer/spec/expanded-participants-spec.cjsx b/internal_packages/composer/spec/expanded-participants-spec.cjsx deleted file mode 100644 index ee6f0662f..000000000 --- a/internal_packages/composer/spec/expanded-participants-spec.cjsx +++ /dev/null @@ -1,57 +0,0 @@ -# _ = require "underscore" -# React = require "react" -# Fields = require '../lib/fields' -# ReactTestUtils = require('react-addons-test-utils') -# AccountContactField = require '../lib/account-contact-field' -# ExpandedParticipants = require '../lib/expanded-participants' -# {Actions} = require 'nylas-exports' -# -# describe "ExpandedParticipants", -> -# makeField = (props={}) -> -# @onChangeParticipants = jasmine.createSpy("onChangeParticipants") -# @onAdjustEnabledFields = jasmine.createSpy("onAdjustEnabledFields") -# props.onChangeParticipants = @onChangeParticipants -# props.onAdjustEnabledFields = @onAdjustEnabledFields -# @fields = ReactTestUtils.renderIntoDocument( -# -# ) -# -# it "always renders to field", -> -# makeField.call(@) -# el = ReactTestUtils.findRenderedDOMComponentWithClass(@fields, "to-field") -# expect(el).toBeDefined() -# -# it "renders cc when enabled", -> -# makeField.call(@, enabledFields: [Fields.Cc]) -# el = ReactTestUtils.findRenderedDOMComponentWithClass(@fields, "cc-field") -# expect(el).toBeDefined() -# -# it "renders bcc when enabled", -> -# makeField.call(@, enabledFields: [Fields.Bcc]) -# el = ReactTestUtils.findRenderedDOMComponentWithClass(@fields, "bcc-field") -# expect(el).toBeDefined() -# -# it "renders from when enabled", -> -# makeField.call(@, enabledFields: [Fields.From]) -# el = ReactTestUtils.findRenderedComponentWithType(@fields, AccountContactField) -# expect(el).toBeDefined() -# -# it "empties cc and focuses on to field", -> -# makeField.call(@, enabledFields: [Fields.Cc, Fields.Bcc, Fields.Subject]) -# @fields.refs[Fields.Cc].props.onEmptied() -# expect(@onAdjustEnabledFields).toHaveBeenCalledWith hide: [Fields.Cc] -# -# it "empties bcc and focuses on to field", -> -# makeField.call(@, enabledFields: [Fields.Cc, Fields.Bcc, Fields.Subject]) -# @fields.refs[Fields.Bcc].props.onEmptied() -# expect(@onAdjustEnabledFields).toHaveBeenCalledWith hide: [Fields.Bcc] -# -# it "empties bcc and focuses on cc field", -> -# makeField.call(@, enabledFields: [Fields.Bcc, Fields.Subject]) -# @fields.refs[Fields.Bcc].props.onEmptied() -# expect(@onAdjustEnabledFields).toHaveBeenCalledWith hide: [Fields.Bcc] -# -# it "notifies when participants change", -> -# makeField.call(@, enabledFields: [Fields.Cc, Fields.Bcc, Fields.Subject]) -# @fields.refs[Fields.Cc].props.change() -# expect(@onChangeParticipants).toHaveBeenCalled() diff --git a/internal_packages/composer/spec/quoted-text-spec.cjsx b/internal_packages/composer/spec/quoted-text-spec.cjsx index c53d49836..f671696b4 100644 --- a/internal_packages/composer/spec/quoted-text-spec.cjsx +++ b/internal_packages/composer/spec/quoted-text-spec.cjsx @@ -8,9 +8,9 @@ React = require "react" ReactDOM = require 'react-dom' ReactTestUtils = require('react-addons-test-utils') -Fields = require '../lib/fields' -Composer = require "../lib/composer-view" -ComposerEditor = require '../lib/composer-editor' +Fields = require('../lib/fields').default +Composer = require("../lib/composer-view").default +ComposerEditor = require('../lib/composer-editor').default {Message, DraftStore, ComponentRegistry} = require 'nylas-exports' diff --git a/internal_packages/composer/spec/send-actions-spec.cjsx b/internal_packages/composer/spec/send-actions-spec.cjsx index f6da1f81e..c6f80661c 100644 --- a/internal_packages/composer/spec/send-actions-spec.cjsx +++ b/internal_packages/composer/spec/send-actions-spec.cjsx @@ -2,7 +2,7 @@ React = require "react" ReactDOM = require 'react-dom' ReactTestUtils = require('react-addons-test-utils') -SendActionButton = require '../lib/send-action-button' +SendActionButton = require('../lib/send-action-button').default {Actions, Message, ComposerExtension, ExtensionRegistry} = require 'nylas-exports' {ButtonDropdown, RetinaImg} = require 'nylas-component-kit' diff --git a/internal_packages/message-list/lib/main.cjsx b/internal_packages/message-list/lib/main.cjsx index ea9ab410c..f18bdd737 100644 --- a/internal_packages/message-list/lib/main.cjsx +++ b/internal_packages/message-list/lib/main.cjsx @@ -3,10 +3,10 @@ WorkspaceStore} = require 'nylas-exports' MessageList = require "./message-list" -MessageListHiddenMessagesToggle = require './message-list-hidden-messages-toggle' +MessageListHiddenMessagesToggle = require('./message-list-hidden-messages-toggle').default SidebarPluginContainer = require "./sidebar-plugin-container" -SidebarParticipantPicker = require './sidebar-participant-picker' +SidebarParticipantPicker = require('./sidebar-participant-picker').default module.exports = activate: -> diff --git a/internal_packages/message-list/lib/message-item-body.cjsx b/internal_packages/message-list/lib/message-item-body.cjsx index e160e9148..fb1608254 100644 --- a/internal_packages/message-list/lib/message-item-body.cjsx +++ b/internal_packages/message-list/lib/message-item-body.cjsx @@ -1,6 +1,6 @@ React = require 'react' _ = require 'underscore' -EmailFrame = require './email-frame' +EmailFrame = require('./email-frame').default {Utils, CanvasUtils, NylasAPI, diff --git a/internal_packages/message-list/lib/message-item.cjsx b/internal_packages/message-list/lib/message-item.cjsx index d971d5b72..b4440152d 100644 --- a/internal_packages/message-list/lib/message-item.cjsx +++ b/internal_packages/message-list/lib/message-item.cjsx @@ -1,7 +1,7 @@ React = require 'react' classNames = require 'classnames' _ = require 'underscore' -EmailFrame = require './email-frame' +EmailFrame = require('./email-frame').default MessageParticipants = require "./message-participants" MessageItemBody = require "./message-item-body" MessageTimestamp = require "./message-timestamp" diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx index 38dda8608..405a72cff 100755 --- a/internal_packages/message-list/lib/message-list.cjsx +++ b/internal_packages/message-list/lib/message-list.cjsx @@ -2,7 +2,7 @@ _ = require 'underscore' React = require 'react' ReactDOM = require 'react-dom' classNames = require 'classnames' -FindInThread = require './find-in-thread' +FindInThread = require('./find-in-thread').default MessageItemContainer = require './message-item-container' {Utils, diff --git a/internal_packages/message-view-on-github/lib/view-on-github-button.cjsx b/internal_packages/message-view-on-github/lib/view-on-github-button.cjsx index fade22ae0..8835a6ccb 100644 --- a/internal_packages/message-view-on-github/lib/view-on-github-button.cjsx +++ b/internal_packages/message-view-on-github/lib/view-on-github-button.cjsx @@ -1,5 +1,5 @@ {shell} = require 'electron' -GithubStore = require './github-store' +GithubStore = require('./github-store').default {React} = require 'nylas-exports' {RetinaImg, KeyCommandsRegion} = require 'nylas-component-kit' diff --git a/internal_packages/personal-level-indicators/lib/personal-level-icon.jsx b/internal_packages/personal-level-indicators/lib/personal-level-icon.jsx index 3d9cbef0f..35ab69c3a 100644 --- a/internal_packages/personal-level-indicators/lib/personal-level-icon.jsx +++ b/internal_packages/personal-level-indicators/lib/personal-level-icon.jsx @@ -43,5 +43,3 @@ export default class PersonalLevelIcon extends React.Component { ); } } - -module.exports = PersonalLevelIcon diff --git a/internal_packages/thread-list/lib/main.cjsx b/internal_packages/thread-list/lib/main.cjsx index 2778f7af0..137a87dc8 100644 --- a/internal_packages/thread-list/lib/main.cjsx +++ b/internal_packages/thread-list/lib/main.cjsx @@ -3,9 +3,9 @@ React = require "react" {ComponentRegistry, WorkspaceStore} = require "nylas-exports" ThreadList = require './thread-list' -ThreadListToolbar = require './thread-list-toolbar' -MessageListToolbar = require './message-list-toolbar' -SelectedItemsStack = require './selected-items-stack' +ThreadListToolbar = require('./thread-list-toolbar').default +MessageListToolbar = require('./message-list-toolbar').default +SelectedItemsStack = require('./selected-items-stack').default {UpButton, DownButton, diff --git a/internal_packages/thread-list/lib/thread-list.cjsx b/internal_packages/thread-list/lib/thread-list.cjsx index 795f59b84..f1b89b754 100644 --- a/internal_packages/thread-list/lib/thread-list.cjsx +++ b/internal_packages/thread-list/lib/thread-list.cjsx @@ -24,8 +24,8 @@ classNames = require 'classnames' ThreadListColumns = require './thread-list-columns' ThreadListScrollTooltip = require './thread-list-scroll-tooltip' ThreadListStore = require './thread-list-store' -ThreadListContextMenu = require './thread-list-context-menu' -CategoryRemovalTargetRulesets = require './category-removal-target-rulesets' +ThreadListContextMenu = require('./thread-list-context-menu').default +CategoryRemovalTargetRulesets = require('./category-removal-target-rulesets').default class ThreadList extends React.Component @@ -146,7 +146,7 @@ class ThreadList extends React.Component Actions.closePopover() props.onSwipeLeft = (callback) => # TODO this should be grabbed from elsewhere - SnoozePopover = require '../../thread-snooze/lib/snooze-popover' + SnoozePopover = require('../../thread-snooze/lib/snooze-popover').default element = document.querySelector("[data-item-id=\"#{item.id}\"]") originRect = element.getBoundingClientRect() diff --git a/internal_packages/thread-search/lib/search-store.coffee b/internal_packages/thread-search/lib/search-store.coffee index f620d313c..df51f7915 100644 --- a/internal_packages/thread-search/lib/search-store.coffee +++ b/internal_packages/thread-search/lib/search-store.coffee @@ -9,7 +9,7 @@ NylasStore = require 'nylas-store' FocusedPerspectiveStore} = require 'nylas-exports' SearchActions = require './search-actions' -SearchMailboxPerspective = require './search-mailbox-perspective' +SearchMailboxPerspective = require('./search-mailbox-perspective').default # Stores should closely match the needs of a particular part of the front end. # For example, we might create a "MessageStore" that observes this store diff --git a/internal_packages/unread-notifications/spec/main-spec.coffee b/internal_packages/unread-notifications/spec/main-spec.coffee index 1e3c53eb5..c0b672479 100644 --- a/internal_packages/unread-notifications/spec/main-spec.coffee +++ b/internal_packages/unread-notifications/spec/main-spec.coffee @@ -1,7 +1,7 @@ _ = require 'underscore' Contact = require '../../../src/flux/models/contact' Message = require '../../../src/flux/models/message' -Thread = require '../../../src/flux/models/thread' +Thread = require('../../../src/flux/models/thread').default Category = require '../../../src/flux/models/category' CategoryStore = require '../../../src/flux/stores/category-store' DatabaseStore = require '../../../src/flux/stores/database-store' diff --git a/internal_packages/worker-sync/lib/nylas-sync-worker.coffee b/internal_packages/worker-sync/lib/nylas-sync-worker.coffee index cc3a0dc58..43a2eb5a7 100644 --- a/internal_packages/worker-sync/lib/nylas-sync-worker.coffee +++ b/internal_packages/worker-sync/lib/nylas-sync-worker.coffee @@ -1,6 +1,6 @@ _ = require 'underscore' {Actions, DatabaseStore, NylasSyncStatusStore} = require 'nylas-exports' -DeltaStreamingConnection = require './delta-streaming-connection' +DeltaStreamingConnection = require('./delta-streaming-connection').default ContactRankingsCache = require './contact-rankings-cache' INITIAL_PAGE_SIZE = 30 diff --git a/internal_packages/worker-sync/spec/nylas-sync-worker-spec.coffee b/internal_packages/worker-sync/spec/nylas-sync-worker-spec.coffee index 6083a0a63..e6275652a 100644 --- a/internal_packages/worker-sync/spec/nylas-sync-worker-spec.coffee +++ b/internal_packages/worker-sync/spec/nylas-sync-worker-spec.coffee @@ -1,6 +1,6 @@ _ = require 'underscore' {Actions, DatabaseStore, DatabaseTransaction, Account, Thread} = require 'nylas-exports' -DeltaStreamingConnection = require '../lib/delta-streaming-connection' +DeltaStreamingConnection = require('../lib/delta-streaming-connection').default NylasSyncWorker = require '../lib/nylas-sync-worker' describe "NylasSyncWorker", -> diff --git a/spec/components/multiselect-list-interaction-handler-spec.coffee b/spec/components/multiselect-list-interaction-handler-spec.coffee index 021523ae8..27b4856ee 100644 --- a/spec/components/multiselect-list-interaction-handler-spec.coffee +++ b/spec/components/multiselect-list-interaction-handler-spec.coffee @@ -1,7 +1,7 @@ MultiselectListInteractionHandler = require '../../src/components/multiselect-list-interaction-handler' WorkspaceStore = require '../../src/flux/stores/workspace-store' FocusedContentStore = require '../../src/flux/stores/focused-content-store' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default Actions = require '../../src/flux/actions' _ = require 'underscore' diff --git a/spec/components/multiselect-split-interaction-handler-spec.coffee b/spec/components/multiselect-split-interaction-handler-spec.coffee index 20458193a..48afc58a9 100644 --- a/spec/components/multiselect-split-interaction-handler-spec.coffee +++ b/spec/components/multiselect-split-interaction-handler-spec.coffee @@ -1,7 +1,7 @@ MultiselectSplitInteractionHandler = require '../../src/components/multiselect-split-interaction-handler' WorkspaceStore = require '../../src/flux/stores/workspace-store' FocusedContentStore = require '../../src/flux/stores/focused-content-store' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default Actions = require '../../src/flux/actions' _ = require 'underscore' diff --git a/spec/database-object-registry-spec.coffee b/spec/database-object-registry-spec.coffee index f4fa286e1..051d1a705 100644 --- a/spec/database-object-registry-spec.coffee +++ b/spec/database-object-registry-spec.coffee @@ -1,7 +1,7 @@ _ = require 'underscore' Model = require '../src/flux/models/model' Attributes = require '../src/flux/attributes' -DatabaseObjectRegistry = require '../src/database-object-registry' +DatabaseObjectRegistry = require('../src/database-object-registry').default class GoodTest extends Model @attributes: _.extend {}, Model.attributes, diff --git a/spec/extension-registry-spec.coffee b/spec/extension-registry-spec.coffee index 0f718b822..c5c2d1c97 100644 --- a/spec/extension-registry-spec.coffee +++ b/spec/extension-registry-spec.coffee @@ -1,4 +1,4 @@ -ExtensionRegistry = require '../src/extension-registry' +ExtensionRegistry = require('../src/extension-registry').default class TestExtension @name: 'TestExtension' diff --git a/spec/models/query-spec.coffee b/spec/models/query-spec.coffee index 426476aa0..376699496 100644 --- a/spec/models/query-spec.coffee +++ b/spec/models/query-spec.coffee @@ -1,7 +1,7 @@ ModelQuery = require '../../src/flux/models/query' {Matcher} = require '../../src/flux/attributes' Message = require '../../src/flux/models/message' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default Account = require '../../src/flux/models/account' describe "ModelQuery", -> diff --git a/spec/models/query-subscription-spec.coffee b/spec/models/query-subscription-spec.coffee index 47c753487..102c15ef2 100644 --- a/spec/models/query-subscription-spec.coffee +++ b/spec/models/query-subscription-spec.coffee @@ -2,8 +2,8 @@ DatabaseStore = require '../../src/flux/stores/database-store' QueryRange = require '../../src/flux/models/query-range' MutableQueryResultSet = require '../../src/flux/models/mutable-query-result-set' -QuerySubscription = require '../../src/flux/models/query-subscription' -Thread = require '../../src/flux/models/thread' +QuerySubscription = require('../../src/flux/models/query-subscription').default +Thread = require('../../src/flux/models/thread').default Label = require '../../src/flux/models/label' Utils = require '../../src/flux/models/utils' diff --git a/spec/models/thread-spec.coffee b/spec/models/thread-spec.coffee index 9be67a467..4ecde98b5 100644 --- a/spec/models/thread-spec.coffee +++ b/spec/models/thread-spec.coffee @@ -1,5 +1,5 @@ Message = require '../../src/flux/models/message' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default Category = require '../../src/flux/models/category' {Utils} = require 'nylas-exports' _ = require 'underscore' diff --git a/spec/nylas-api-spec.coffee b/spec/nylas-api-spec.coffee index 7fcd8b15e..ae2901a82 100644 --- a/spec/nylas-api-spec.coffee +++ b/spec/nylas-api-spec.coffee @@ -2,7 +2,7 @@ _ = require 'underscore' fs = require 'fs' Actions = require '../src/flux/actions' NylasAPI = require '../src/flux/nylas-api' -Thread = require '../src/flux/models/thread' +Thread = require('../src/flux/models/thread').default Message = require '../src/flux/models/message' AccountStore = require '../src/flux/stores/account-store' DatabaseStore = require '../src/flux/stores/database-store' @@ -304,7 +304,7 @@ describe "NylasAPI", -> "event": require('../src/flux/models/event') "label": require('../src/flux/models/label') "folder": require('../src/flux/models/folder') - "thread": require('../src/flux/models/thread') + "thread": require('../src/flux/models/thread').default "draft": require('../src/flux/models/message') "account": require('../src/flux/models/account') "message": require('../src/flux/models/message') diff --git a/spec/stores/badge-store-spec.coffee b/spec/stores/badge-store-spec.coffee index 4a1a3bac9..ca2fcf2e0 100644 --- a/spec/stores/badge-store-spec.coffee +++ b/spec/stores/badge-store-spec.coffee @@ -1,5 +1,5 @@ Label = require '../../src/flux/models/label' -BadgeStore = require '../../src/flux/stores/badge-store' +BadgeStore = require('../../src/flux/stores/badge-store').default describe "BadgeStore", -> describe "_setBadgeForCount", -> diff --git a/spec/stores/database-store-spec.coffee b/spec/stores/database-store-spec.coffee index 5dd682667..3bf6c1885 100644 --- a/spec/stores/database-store-spec.coffee +++ b/spec/stores/database-store-spec.coffee @@ -1,7 +1,7 @@ _ = require 'underscore' Label = require '../../src/flux/models/label' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default TestModel = require '../fixtures/db-test-model' ModelQuery = require '../../src/flux/models/query' DatabaseStore = require '../../src/flux/stores/database-store' diff --git a/spec/stores/database-transaction-spec.coffee b/spec/stores/database-transaction-spec.coffee index 2f88e2662..719a072bd 100644 --- a/spec/stores/database-transaction-spec.coffee +++ b/spec/stores/database-transaction-spec.coffee @@ -1,7 +1,7 @@ _ = require 'underscore' Category = require '../../src/flux/models/category' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default TestModel = require '../fixtures/db-test-model' ModelQuery = require '../../src/flux/models/query' DatabaseTransaction = require '../../src/flux/stores/database-transaction' diff --git a/spec/stores/focused-content-store-spec.coffee b/spec/stores/focused-content-store-spec.coffee index 60df8144a..df11b8e5f 100644 --- a/spec/stores/focused-content-store-spec.coffee +++ b/spec/stores/focused-content-store-spec.coffee @@ -1,5 +1,5 @@ _ = require 'underscore' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default FocusedContentStore = require '../../src/flux/stores/focused-content-store' Actions = require '../../src/flux/actions' diff --git a/spec/stores/message-store-spec.coffee b/spec/stores/message-store-spec.coffee index 197e6f152..e6fee3ab3 100644 --- a/spec/stores/message-store-spec.coffee +++ b/spec/stores/message-store-spec.coffee @@ -1,12 +1,12 @@ _ = require 'underscore' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default Category = require '../../src/flux/models/category' Message = require '../../src/flux/models/message' FocusedContentStore = require '../../src/flux/stores/focused-content-store' FocusedPerspectiveStore = require '../../src/flux/stores/focused-perspective-store' MessageStore = require '../../src/flux/stores/message-store' DatabaseStore = require '../../src/flux/stores/database-store' -ChangeUnreadTask = require '../../src/flux/tasks/change-unread-task' +ChangeUnreadTask = require('../../src/flux/tasks/change-unread-task').default Actions = require '../../src/flux/actions' testThread = new Thread(id: '123', accountId: TEST_ACCOUNT_ID) diff --git a/spec/stores/task-queue-spec.coffee b/spec/stores/task-queue-spec.coffee index 77b01e092..ccc88e5c3 100644 --- a/spec/stores/task-queue-spec.coffee +++ b/spec/stores/task-queue-spec.coffee @@ -1,7 +1,7 @@ Actions = require '../../src/flux/actions' DatabaseStore = require '../../src/flux/stores/database-store' TaskQueue = require '../../src/flux/stores/task-queue' -Task = require '../../src/flux/tasks/task' +Task = require('../../src/flux/tasks/task').default {APIError, TimeoutError} = require '../../src/flux/errors' diff --git a/spec/tasks/change-folder-task-spec.coffee b/spec/tasks/change-folder-task-spec.coffee index c48a2b4ad..5d69c4c1d 100644 --- a/spec/tasks/change-folder-task-spec.coffee +++ b/spec/tasks/change-folder-task-spec.coffee @@ -1,13 +1,13 @@ _ = require 'underscore' Folder = require '../../src/flux/models/folder' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default Message = require '../../src/flux/models/message' Actions = require '../../src/flux/actions' NylasAPI = require '../../src/flux/nylas-api' Query = require '../../src/flux/models/query' DatabaseStore = require '../../src/flux/stores/database-store' -ChangeFolderTask = require '../../src/flux/tasks/change-folder-task' -ChangeMailTask = require '../../src/flux/tasks/change-mail-task' +ChangeFolderTask = require('../../src/flux/tasks/change-folder-task').default +ChangeMailTask = require('../../src/flux/tasks/change-mail-task').default {APIError} = require '../../src/flux/errors' {Utils} = require '../../src/flux/models/utils' diff --git a/spec/tasks/change-labels-task-spec.coffee b/spec/tasks/change-labels-task-spec.coffee index 4b5286386..bd322df4e 100644 --- a/spec/tasks/change-labels-task-spec.coffee +++ b/spec/tasks/change-labels-task-spec.coffee @@ -1,12 +1,12 @@ _ = require 'underscore' Label = require '../../src/flux/models/label' -Thread = require '../../src/flux/models/thread' +Thread = require('../../src/flux/models/thread').default Message = require '../../src/flux/models/message' Actions = require '../../src/flux/actions' NylasAPI = require '../../src/flux/nylas-api' DatabaseStore = require '../../src/flux/stores/database-store' -ChangeLabelsTask = require '../../src/flux/tasks/change-labels-task' -ChangeMailTask = require '../../src/flux/tasks/change-mail-task' +ChangeLabelsTask = require('../../src/flux/tasks/change-labels-task').default +ChangeMailTask = require('../../src/flux/tasks/change-mail-task').default {AccountStore, CategoryStore} = require 'nylas-exports' {APIError} = require '../../src/flux/errors' diff --git a/spec/tasks/change-starred-task-spec.coffee b/spec/tasks/change-starred-task-spec.coffee index 90557338d..04f414c06 100644 --- a/spec/tasks/change-starred-task-spec.coffee +++ b/spec/tasks/change-starred-task-spec.coffee @@ -1,6 +1,6 @@ -Task = require '../../src/flux/tasks/task' -Thread = require '../../src/flux/models/thread' -ChangeStarredTask = require '../../src/flux/tasks/change-starred-task' +Task = require('../../src/flux/tasks/task').default +Thread = require('../../src/flux/models/thread').default +ChangeStarredTask = require('../../src/flux/tasks/change-starred-task').default describe 'ChangeStarredTask', -> describe "description", -> diff --git a/spec/tasks/change-unread-task-spec.coffee b/spec/tasks/change-unread-task-spec.coffee index 049d7e7e4..c58b06d51 100644 --- a/spec/tasks/change-unread-task-spec.coffee +++ b/spec/tasks/change-unread-task-spec.coffee @@ -1,6 +1,6 @@ -Task = require '../../src/flux/tasks/task' -Thread = require '../../src/flux/models/thread' -ChangeUnreadTask = require '../../src/flux/tasks/change-unread-task' +Task = require('../../src/flux/tasks/task').default +Thread = require('../../src/flux/models/thread').default +ChangeUnreadTask = require('../../src/flux/tasks/change-unread-task').default describe 'ChangeUnreadTask', -> describe "description", -> diff --git a/spec/tasks/task-spec.coffee b/spec/tasks/task-spec.coffee index 4fea9ae8a..2909d1251 100644 --- a/spec/tasks/task-spec.coffee +++ b/spec/tasks/task-spec.coffee @@ -1,6 +1,6 @@ Actions = require '../../src/flux/actions' TaskQueue = require '../../src/flux/stores/task-queue' -Task = require '../../src/flux/tasks/task' +Task = require('../../src/flux/tasks/task').default {APIError, TimeoutError} = require '../../src/flux/errors' diff --git a/spec/utils-spec.coffee b/spec/utils-spec.coffee index 35f3dab47..57b49b006 100644 --- a/spec/utils-spec.coffee +++ b/spec/utils-spec.coffee @@ -1,6 +1,6 @@ _ = require('underscore') Utils = require '../src/flux/models/utils' -Thread = require '../src/flux/models/thread' +Thread = require('../src/flux/models/thread').default Contact = require '../src/flux/models/contact' JSONBlob = require '../src/flux/models/json-blob' diff --git a/src/browser/linux-updater-adapter.es6 b/src/browser/linux-updater-adapter.es6 index c7ed6c997..7a7f17e68 100644 --- a/src/browser/linux-updater-adapter.es6 +++ b/src/browser/linux-updater-adapter.es6 @@ -28,4 +28,5 @@ class LinuxUpdaterAdapter { } _.extend(LinuxUpdaterAdapter.prototype, EventEmitter.prototype); -module.exports = new LinuxUpdaterAdapter() +const adapter = new LinuxUpdaterAdapter(); +export default adapter diff --git a/src/components/button-dropdown.cjsx b/src/components/button-dropdown.cjsx index e44c3c275..a4c4013fa 100644 --- a/src/components/button-dropdown.cjsx +++ b/src/components/button-dropdown.cjsx @@ -1,4 +1,4 @@ -RetinaImg = require './retina-img' +RetinaImg = require('./retina-img').default {Utils} = require 'nylas-exports' classnames = require 'classnames' diff --git a/src/components/empty-list-state.cjsx b/src/components/empty-list-state.cjsx index f9bcd4164..a87ab82da 100644 --- a/src/components/empty-list-state.cjsx +++ b/src/components/empty-list-state.cjsx @@ -2,7 +2,7 @@ _ = require 'underscore' React = require 'react' ReactDOM = require 'react-dom' classNames = require 'classnames' -RetinaImg = require './retina-img' +RetinaImg = require('./retina-img').default EventedIFrame = require './evented-iframe' {NylasSyncStatusStore, FocusedPerspectiveStore} = require 'nylas-exports' diff --git a/src/components/evented-iframe.cjsx b/src/components/evented-iframe.cjsx index b85d6c2e7..5b71a44ea 100644 --- a/src/components/evented-iframe.cjsx +++ b/src/components/evented-iframe.cjsx @@ -4,7 +4,7 @@ ReactDOM = require 'react-dom' RegExpUtils, SearchableComponentMaker, SearchableComponentStore}= require 'nylas-exports' -IFrameSearcher = require '../searchable-components/iframe-searcher' +IFrameSearcher = require('../searchable-components/iframe-searcher').default url = require 'url' _ = require "underscore" diff --git a/src/components/list-tabular-item.cjsx b/src/components/list-tabular-item.cjsx index c2c687f80..4c40c4a4e 100644 --- a/src/components/list-tabular-item.cjsx +++ b/src/components/list-tabular-item.cjsx @@ -1,6 +1,6 @@ _ = require 'underscore' React = require 'react' -SwipeContainer = require './swipe-container' +SwipeContainer = require('./swipe-container').default {Utils} = require 'nylas-exports' class ListTabularItem extends React.Component diff --git a/src/components/mail-label.cjsx b/src/components/mail-label.cjsx index 215c6b6c5..2224f633c 100644 --- a/src/components/mail-label.cjsx +++ b/src/components/mail-label.cjsx @@ -1,5 +1,5 @@ React = require 'react' -RetinaImg = require './retina-img' +RetinaImg = require('./retina-img').default CategoryStore = require '../flux/stores/category-store' LabelColorizer = diff --git a/src/components/multiselect-action-bar.cjsx b/src/components/multiselect-action-bar.cjsx index 8103113d4..1c3a9f3f7 100644 --- a/src/components/multiselect-action-bar.cjsx +++ b/src/components/multiselect-action-bar.cjsx @@ -4,7 +4,7 @@ _ = require 'underscore' {Utils, Actions} = require "nylas-exports" InjectedComponentSet = require './injected-component-set' -RetinaImg = require './retina-img' +RetinaImg = requir(('./retina-img').default).default Flexbox = require './flexbox' ### diff --git a/src/components/scroll-region.cjsx b/src/components/scroll-region.cjsx index 1eb4322d5..459f8ca86 100644 --- a/src/components/scroll-region.cjsx +++ b/src/components/scroll-region.cjsx @@ -3,7 +3,7 @@ React = require 'react' ReactDOM = require 'react-dom' {Utils} = require 'nylas-exports' classNames = require 'classnames' -ScrollbarTicks = require './scrollbar-ticks' +ScrollbarTicks = require('./scrollbar-ticks').default class Scrollbar extends React.Component @displayName: 'Scrollbar' diff --git a/src/components/tokenizing-text-field.cjsx b/src/components/tokenizing-text-field.cjsx index abea64b81..a92c93bd7 100644 --- a/src/components/tokenizing-text-field.cjsx +++ b/src/components/tokenizing-text-field.cjsx @@ -6,7 +6,7 @@ _ = require 'underscore' {Utils, Contact, RegExpUtils} = require 'nylas-exports' -RetinaImg = require './retina-img' +RetinaImg = require('./retina-img').default class SizeToFitInput extends React.Component constructor: (@props) -> diff --git a/src/flux/models/account.coffee b/src/flux/models/account.coffee index 4fed98530..935cd916e 100644 --- a/src/flux/models/account.coffee +++ b/src/flux/models/account.coffee @@ -1,4 +1,4 @@ -ModelWithMetadata = require './model-with-metadata' +ModelWithMetadata = require('./model-with-metadata').default Attributes = require '../attributes' _ = require 'underscore' CategoryStore = null diff --git a/src/flux/models/message.coffee b/src/flux/models/message.coffee index 6ffaffb05..3b7480e66 100644 --- a/src/flux/models/message.coffee +++ b/src/flux/models/message.coffee @@ -8,7 +8,7 @@ Category = require './category' Contact = require './contact' Attributes = require '../attributes' AccountStore = require '../stores/account-store' -ModelWithMetadata = require './model-with-metadata' +ModelWithMetadata = require('./model-with-metadata').default ### Public: The Message model represents a Message object served by the Nylas Platform API. diff --git a/src/flux/models/query-subscription-pool.coffee b/src/flux/models/query-subscription-pool.coffee index 75574e668..a0671c48f 100644 --- a/src/flux/models/query-subscription-pool.coffee +++ b/src/flux/models/query-subscription-pool.coffee @@ -1,5 +1,5 @@ _ = require 'underscore' -QuerySubscription = require './query-subscription' +QuerySubscription = require('./query-subscription').default DatabaseStore = null ### diff --git a/src/flux/models/utils.coffee b/src/flux/models/utils.coffee index 47bca868d..88c1f87c4 100644 --- a/src/flux/models/utils.coffee +++ b/src/flux/models/utils.coffee @@ -5,8 +5,8 @@ moment = require('moment-timezone') tz = Intl.DateTimeFormat().resolvedOptions().timeZone DefaultResourcePath = null -TaskRegistry = require '../../task-registry' -DatabaseObjectRegistry = require '../../database-object-registry' +TaskRegistry = require('../../task-registry').default +DatabaseObjectRegistry = require('../../database-object-registry').default imageData = null diff --git a/src/flux/nylas-api.coffee b/src/flux/nylas-api.coffee index 384e88251..2ecd0adde 100644 --- a/src/flux/nylas-api.coffee +++ b/src/flux/nylas-api.coffee @@ -1,7 +1,7 @@ _ = require 'underscore' {remote} = require 'electron' request = require 'request' -NylasLongConnection = require './nylas-long-connection' +NylasLongConnection = require('./nylas-long-connection').default Utils = require './models/utils' Account = require './models/account' Message = require './models/message' @@ -349,7 +349,7 @@ class NylasAPI "event": require('./models/event') "label": require('./models/label') "folder": require('./models/folder') - "thread": require('./models/thread') + "thread": require('./models/thread').default "draft": require('./models/message') "account": require('./models/account') "message": require('./models/message') diff --git a/src/flux/stores/account-store.coffee b/src/flux/stores/account-store.coffee index abcc2e314..2d4c0262c 100644 --- a/src/flux/stores/account-store.coffee +++ b/src/flux/stores/account-store.coffee @@ -238,7 +238,7 @@ class AccountStore extends NylasStore path = require 'path' Message = require '../models/message' Account = require '../models/account' - Thread = require '../models/thread' + Thread = require('../models/thread').default Label = require '../models/label' @_caches = {} diff --git a/src/flux/stores/badge-store.es6 b/src/flux/stores/badge-store.es6 index 62fd58733..96393f40b 100644 --- a/src/flux/stores/badge-store.es6 +++ b/src/flux/stores/badge-store.es6 @@ -72,4 +72,5 @@ class BadgeStore extends NylasStore { } } -module.exports = new BadgeStore() +const badgeStore = new BadgeStore() +export default badgeStore diff --git a/src/flux/stores/database-setup-query-builder.coffee b/src/flux/stores/database-setup-query-builder.coffee index 1b2484716..b9c72d67d 100644 --- a/src/flux/stores/database-setup-query-builder.coffee +++ b/src/flux/stores/database-setup-query-builder.coffee @@ -1,7 +1,7 @@ _ = require 'underscore' {AttributeCollection, AttributeJoinedData} = require '../attributes' -DatabaseObjectRegistry = require '../../database-object-registry' +DatabaseObjectRegistry = require('../../database-object-registry').default {tableNameForJoin} = require '../models/utils' # The DatabaseConnection dispatches queries to the Browser process via IPC and listens diff --git a/src/flux/stores/draft-editing-session.coffee b/src/flux/stores/draft-editing-session.coffee index 512e0a6c9..bfe0457ed 100644 --- a/src/flux/stores/draft-editing-session.coffee +++ b/src/flux/stores/draft-editing-session.coffee @@ -1,9 +1,9 @@ Message = require '../models/message' Actions = require '../actions' DatabaseStore = require './database-store' -ExtensionRegistry = require '../../extension-registry' +ExtensionRegistry = require('../../extension-registry').default {Listener, Publisher} = require '../modules/reflux-coffee' -SyncbackDraftTask = require '../tasks/syncback-draft-task' +SyncbackDraftTask = require('../tasks/syncback-draft-task').default CoffeeHelpers = require '../coffee-helpers' DraftStore = null diff --git a/src/flux/stores/draft-factory.coffee b/src/flux/stores/draft-factory.coffee index 3f63f0822..b4b926983 100644 --- a/src/flux/stores/draft-factory.coffee +++ b/src/flux/stores/draft-factory.coffee @@ -11,7 +11,7 @@ DraftStore = null InlineStyleTransformer = require '../../services/inline-style-transformer' SanitizeTransformer = require '../../services/sanitize-transformer' -Thread = require '../models/thread' +Thread = require('../models/thread').default Contact = require '../models/contact' Message = require '../models/message' Utils = require '../models/utils' diff --git a/src/flux/stores/draft-store.coffee b/src/flux/stores/draft-store.coffee index fc8ef1ccc..8e59a5928 100644 --- a/src/flux/stores/draft-store.coffee +++ b/src/flux/stores/draft-store.coffee @@ -10,13 +10,13 @@ AccountStore = require './account-store' TaskQueueStatusStore = require './task-queue-status-store' FocusedContentStore = require './focused-content-store' -BaseDraftTask = require '../tasks/base-draft-task' -SendDraftTask = require '../tasks/send-draft-task' -SyncbackDraftFilesTask = require '../tasks/syncback-draft-files-task' -SyncbackDraftTask = require '../tasks/syncback-draft-task' -DestroyDraftTask = require '../tasks/destroy-draft-task' +BaseDraftTask = require('../tasks/base-draft-task').default +SendDraftTask = require('../tasks/send-draft-task').default +SyncbackDraftFilesTask = require('../tasks/syncback-draft-files-task').default +SyncbackDraftTask = require('../tasks/syncback-draft-task').default +DestroyDraftTask = require('../tasks/destroy-draft-task').default -Thread = require '../models/thread' +Thread = require('../models/thread').default Contact = require '../models/contact' Message = require '../models/message' Actions = require '../actions' @@ -27,7 +27,7 @@ SoundRegistry = require '../../sound-registry' {Listener, Publisher} = require '../modules/reflux-coffee' CoffeeHelpers = require '../coffee-helpers' -ExtensionRegistry = require '../../extension-registry' +ExtensionRegistry = require('../../extension-registry').default {deprecate} = require '../../deprecate-utils' ### diff --git a/src/flux/stores/focused-contacts-store.coffee b/src/flux/stores/focused-contacts-store.coffee index 0b24ba353..06828253e 100644 --- a/src/flux/stores/focused-contacts-store.coffee +++ b/src/flux/stores/focused-contacts-store.coffee @@ -4,7 +4,7 @@ Rx = require 'rx-lite' Utils = require '../models/utils' Actions = require '../actions' NylasStore = require 'nylas-store' -Thread = require '../models/thread' +Thread = require('../models/thread').default Contact = require '../models/contact' MessageStore = require './message-store' AccountStore = require './account-store' diff --git a/src/flux/stores/focused-content-store.coffee b/src/flux/stores/focused-content-store.coffee index 77ade1e0e..4fe6198c6 100644 --- a/src/flux/stores/focused-content-store.coffee +++ b/src/flux/stores/focused-content-store.coffee @@ -4,7 +4,7 @@ AccountStore = require './account-store' WorkspaceStore = require './workspace-store' DatabaseStore = require './database-store' Actions = require '../actions' -Thread = require '../models/thread' +Thread = require('../models/thread').default Model = require '../models/model' {Listener, Publisher} = require '../modules/reflux-coffee' diff --git a/src/flux/stores/mail-rules-store.coffee b/src/flux/stores/mail-rules-store.coffee index 49142de97..860d7abc5 100644 --- a/src/flux/stores/mail-rules-store.coffee +++ b/src/flux/stores/mail-rules-store.coffee @@ -4,7 +4,7 @@ Rx = require 'rx-lite' AccountStore = require './account-store' DatabaseStore = require './database-store' TaskQueueStatusStore = require './task-queue-status-store' -ReprocessMailRulesTask = require '../tasks/reprocess-mail-rules-task' +ReprocessMailRulesTask = require('../tasks/reprocess-mail-rules-task').default Utils = require '../models/utils' Actions = require '../actions' diff --git a/src/flux/stores/message-body-processor.es6 b/src/flux/stores/message-body-processor.es6 index 3f903cf37..35a1409a8 100644 --- a/src/flux/stores/message-body-processor.es6 +++ b/src/flux/stores/message-body-processor.es6 @@ -133,4 +133,5 @@ class MessageBodyProcessor { } } -module.exports = new MessageBodyProcessor(); +const store = new MessageBodyProcessor(); +export default store diff --git a/src/flux/stores/message-store.coffee b/src/flux/stores/message-store.coffee index 786dfc9a9..946d417a0 100644 --- a/src/flux/stores/message-store.coffee +++ b/src/flux/stores/message-store.coffee @@ -1,14 +1,14 @@ NylasStore = require "nylas-store" Actions = require "../actions" Message = require "../models/message" -Thread = require "../models/thread" +Thread = require("../models/thread").default Utils = require '../models/utils' DatabaseStore = require "./database-store" FocusedPerspectiveStore = require './focused-perspective-store' FocusedContentStore = require "./focused-content-store" -ChangeUnreadTask = require '../tasks/change-unread-task' +ChangeUnreadTask = require('../tasks/change-unread-task').default NylasAPI = require '../nylas-api' -ExtensionRegistry = require '../../extension-registry' +ExtensionRegistry = require('../../extension-registry').default {deprecate} = require '../../deprecate-utils' async = require 'async' _ = require 'underscore' @@ -86,7 +86,7 @@ class MessageStore extends NylasStore ExtensionRegistry.MessageView.unregister(ext) _onExtensionsChanged: (role) -> - MessageBodyProcessor = require './message-body-processor' + MessageBodyProcessor = require('./message-body-processor').default MessageBodyProcessor.resetCache() diff --git a/src/flux/stores/metadata-store.es6 b/src/flux/stores/metadata-store.es6 index 5dc8bc031..23e365fd9 100644 --- a/src/flux/stores/metadata-store.es6 +++ b/src/flux/stores/metadata-store.es6 @@ -42,4 +42,5 @@ class MetadataStore extends NylasStore { } } -module.exports = new MetadataStore(); +const store = new MetadataStore(); +export default store diff --git a/src/flux/stores/outbox-store.es6 b/src/flux/stores/outbox-store.es6 index 94974f137..6b8bd3d9e 100644 --- a/src/flux/stores/outbox-store.es6 +++ b/src/flux/stores/outbox-store.es6 @@ -26,4 +26,6 @@ class OutboxStore extends NylasStore { return this._tasks.filter((task) => task.draftAccountId === accountId); } } -module.exports = new OutboxStore(); + +const store = new OutboxStore() +export default store diff --git a/src/flux/stores/recently-read-store.es6 b/src/flux/stores/recently-read-store.es6 index 25d9defc6..99cf31791 100644 --- a/src/flux/stores/recently-read-store.es6 +++ b/src/flux/stores/recently-read-store.es6 @@ -50,4 +50,5 @@ class RecentlyReadStore extends NylasStore { } } -module.exports = new RecentlyReadStore(); +const store = new RecentlyReadStore() +export default store diff --git a/src/flux/stores/task-queue.coffee b/src/flux/stores/task-queue.coffee index 9234be60e..3712d512e 100644 --- a/src/flux/stores/task-queue.coffee +++ b/src/flux/stores/task-queue.coffee @@ -5,7 +5,7 @@ path = require 'path' {Listener, Publisher} = require '../modules/reflux-coffee' CoffeeHelpers = require '../coffee-helpers' -Task = require "../tasks/task" +Task = require("../tasks/task").default Utils = require "../models/utils" Reflux = require 'reflux' Actions = require '../actions' diff --git a/src/flux/stores/thread-counts-store.coffee b/src/flux/stores/thread-counts-store.coffee index 633f61b3c..25b8b1fa2 100644 --- a/src/flux/stores/thread-counts-store.coffee +++ b/src/flux/stores/thread-counts-store.coffee @@ -2,7 +2,7 @@ Reflux = require 'reflux' _ = require 'underscore' NylasStore = require 'nylas-store' DatabaseStore = require './database-store' -Thread = require '../models/thread' +Thread = require('../models/thread').default ### Are running two nested SELECT statements really the best option? Yup. diff --git a/src/flux/stores/undo-redo-store.coffee b/src/flux/stores/undo-redo-store.coffee index 1fa5109f2..7b3ba3c9d 100644 --- a/src/flux/stores/undo-redo-store.coffee +++ b/src/flux/stores/undo-redo-store.coffee @@ -3,7 +3,7 @@ _ = require 'underscore' {Listener, Publisher} = require '../modules/reflux-coffee' CoffeeHelpers = require '../coffee-helpers' -Task = require "../tasks/task" +Task = require("../tasks/task").default Actions = require '../actions' class UndoRedoStore diff --git a/src/flux/tasks/syncback-category-task.es6 b/src/flux/tasks/syncback-category-task.es6 index e1ea4fd0a..a5a217412 100644 --- a/src/flux/tasks/syncback-category-task.es6 +++ b/src/flux/tasks/syncback-category-task.es6 @@ -4,7 +4,7 @@ import Task from './task'; import NylasAPI from '../nylas-api'; import {APIError} from '../errors'; -module.exports = class SyncbackCategoryTask extends Task { +export default class SyncbackCategoryTask extends Task { constructor({category, displayName} = {}) { super() diff --git a/src/global/nylas-exports.coffee b/src/global/nylas-exports.coffee index 0bc64e76f..115c2d928 100644 --- a/src/global/nylas-exports.coffee +++ b/src/global/nylas-exports.coffee @@ -1,6 +1,6 @@ -TaskRegistry = require '../task-registry' -StoreRegistry = require '../store-registry' -DatabaseObjectRegistry = require '../database-object-registry' +TaskRegistry = require('../task-registry').default +StoreRegistry = require('../store-registry').default +DatabaseObjectRegistry = require('../database-object-registry').default class NylasExports # Will lazy load when requested diff --git a/src/mail-rules-processor.coffee b/src/mail-rules-processor.coffee index 447f5a975..e234c4efb 100644 --- a/src/mail-rules-processor.coffee +++ b/src/mail-rules-processor.coffee @@ -1,9 +1,9 @@ _ = require 'underscore' -Task = require './flux/tasks/task' +Task = require('./flux/tasks/task').default Actions = require './flux/actions' Category = require './flux/models/category' -Thread = require './flux/models/thread' +Thread = require('./flux/models/thread').default Message = require './flux/models/message' AccountStore = require './flux/stores/account-store' DatabaseStore = require './flux/stores/database-store' @@ -11,10 +11,10 @@ TaskQueueStatusStore = require './flux/stores/task-queue-status-store' {ConditionMode, ConditionTemplates} = require './mail-rules-templates' -ChangeUnreadTask = require './flux/tasks/change-unread-task' -ChangeFolderTask = require './flux/tasks/change-folder-task' -ChangeStarredTask = require './flux/tasks/change-starred-task' -ChangeLabelsTask = require './flux/tasks/change-labels-task' +ChangeUnreadTask = require('./flux/tasks/change-unread-task').default +ChangeFolderTask = require('./flux/tasks/change-folder-task').default +ChangeStarredTask = require('./flux/tasks/change-starred-task').default +ChangeLabelsTask = require('./flux/tasks/change-labels-task').default MailRulesStore = null ### diff --git a/src/mailbox-perspective.coffee b/src/mailbox-perspective.coffee index b0d08e89c..932c235ec 100644 --- a/src/mailbox-perspective.coffee +++ b/src/mailbox-perspective.coffee @@ -1,17 +1,17 @@ _ = require 'underscore' Utils = require './flux/models/utils' -TaskFactory = require './flux/tasks/task-factory' +TaskFactory = require('./flux/tasks/task-factory').default AccountStore = require './flux/stores/account-store' CategoryStore = require './flux/stores/category-store' DatabaseStore = require './flux/stores/database-store' -OutboxStore = require './flux/stores/outbox-store' +OutboxStore = require('./flux/stores/outbox-store').default ThreadCountsStore = require './flux/stores/thread-counts-store' -RecentlyReadStore = require './flux/stores/recently-read-store' -MutableQuerySubscription = require './flux/models/mutable-query-subscription' -UnreadQuerySubscription = require './flux/models/unread-query-subscription' +RecentlyReadStore = require('./flux/stores/recently-read-store').default +MutableQuerySubscription = require('./flux/models/mutable-query-subscription').default +UnreadQuerySubscription = require('./flux/models/unread-query-subscription').default Matcher = require './flux/attributes/matcher' -Thread = require './flux/models/thread' +Thread = require('./flux/models/thread').default Category = require './flux/models/category' Actions = require './flux/actions' ChangeUnreadTask = null @@ -204,7 +204,7 @@ class StarredMailboxPerspective extends MailboxPerspective super receiveThreads: (threadsOrIds) => - ChangeStarredTask = require './flux/tasks/change-starred-task' + ChangeStarredTask = require('./flux/tasks/change-starred-task').default task = new ChangeStarredTask({threads:threadsOrIds, starred: true}) Actions.queueTask(task) @@ -378,12 +378,12 @@ class UnreadMailboxPerspective extends CategoryMailboxPerspective receiveThreads: (threadsOrIds) => super(threadsOrIds) - ChangeUnreadTask ?= require './flux/tasks/change-unread-task' + ChangeUnreadTask ?= require('./flux/tasks/change-unread-task').default task = new ChangeUnreadTask({threads:threadsOrIds, unread: true}) Actions.queueTask(task) tasksForRemovingItems: (threads, ruleset) => - ChangeUnreadTask ?= require './flux/tasks/change-unread-task' + ChangeUnreadTask ?= require('./flux/tasks/change-unread-task').default tasks = super(threads, ruleset) tasks.push new ChangeUnreadTask({threads, unread: false}) return tasks diff --git a/src/nylas-env.coffee b/src/nylas-env.coffee index a8139f406..a09b13f58 100644 --- a/src/nylas-env.coffee +++ b/src/nylas-env.coffee @@ -13,7 +13,7 @@ fs = require 'fs-plus' WindowEventHandler = require './window-event-handler' StylesElement = require './styles-element' -StoreRegistry = require './store-registry' +StoreRegistry = require('./store-registry').default Utils = require './flux/models/utils' {APIError} = require './flux/errors' diff --git a/src/package.coffee b/src/package.coffee index 4d8a73353..353bcb58d 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -10,8 +10,8 @@ Q = require 'q' ModuleCache = require './module-cache' -TaskRegistry = require './task-registry' -DatabaseObjectRegistry = require './database-object-registry' +TaskRegistry = require('./task-registry').default +DatabaseObjectRegistry = require('./database-object-registry').default try packagesCache = require('../package.json')?._N1Packages ? {} diff --git a/src/services/quoted-html-transformer.coffee b/src/services/quoted-html-transformer.coffee index 254996a0d..57df737fb 100644 --- a/src/services/quoted-html-transformer.coffee +++ b/src/services/quoted-html-transformer.coffee @@ -1,7 +1,7 @@ _ = require 'underscore' crypto = require 'crypto' DOMUtils = require '../dom-utils' -quoteStringDetector = require './quote-string-detector' +quoteStringDetector = require('./quote-string-detector').default class QuotedHTMLTransformer diff --git a/src/sheet-container.cjsx b/src/sheet-container.cjsx index 98e2794db..1903a6a11 100644 --- a/src/sheet-container.cjsx +++ b/src/sheet-container.cjsx @@ -3,7 +3,7 @@ ReactCSSTransitionGroup = require 'react-addons-css-transition-group' Sheet = require './sheet' Toolbar = require './sheet-toolbar' Flexbox = require './components/flexbox' -RetinaImg = require './components/retina-img' +RetinaImg = require('./components/retina-img').default InjectedComponentSet = require './components/injected-component-set' _ = require 'underscore' diff --git a/src/sheet-toolbar.cjsx b/src/sheet-toolbar.cjsx index 00425a53a..edc068153 100644 --- a/src/sheet-toolbar.cjsx +++ b/src/sheet-toolbar.cjsx @@ -2,7 +2,7 @@ React = require 'react' ReactDOM = require 'react-dom' Sheet = require './sheet' Flexbox = require './components/flexbox' -RetinaImg = require './components/retina-img' +RetinaImg = require('./components/retina-img').default Utils = require './flux/models/utils' {remote} = require 'electron' _str = require 'underscore.string' diff --git a/src/sheet.cjsx b/src/sheet.cjsx index d84d6426b..86b5b101c 100644 --- a/src/sheet.cjsx +++ b/src/sheet.cjsx @@ -1,7 +1,7 @@ React = require 'react' _ = require 'underscore' {Actions,ComponentRegistry, WorkspaceStore} = require "nylas-exports" -RetinaImg = require './components/retina-img' +RetinaImg = require('./components/retina-img').default Flexbox = require './components/flexbox' InjectedComponentSet = require './components/injected-component-set' ResizableRegion = require './components/resizable-region'