get rid of fsevents dependency

luckily fsevents is only a dependecy of babel-plugin-add-module-exports. This plugin transforms default exports into something that is easier to consume within nodejs. The fix is rather easy: "just" get rid of default exports. Unfortunately this was tricker than initially thought because several files did not use flowtype and the main file did not type check properly.
joefitzgerald · Jan 15, 2019 · a9ad6ac · a9ad6ac
1 parent 4700d7e
commit a9ad6ac
Show file tree

Hide file tree

Showing 82 changed files with 4,342 additions and 1,943 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,6 @@
 {
   "sourceMap": "inline",
   "plugins": [
-    ["add-module-exports", {}],
     ["transform-class-properties", {}],
     ["transform-es2015-modules-commonjs", {"strictMode": false}],
     ["transform-object-rest-spread", {}],

diff --git a/.travis.yml b/.travis.yml
@@ -10,13 +10,10 @@ os:
   - linux
   - osx
 
-osx_image: xcode8.3
-
 env:
   global:
     - GO111MODULE=off
     - APM_TEST_PACKAGES="go-signature-statusbar go-debug"
-    - FSEVENTS_BUILD_FROM_SOURCE=true
   matrix:
     - ATOM_CHANNEL=beta
     - ATOM_CHANNEL=stable

diff --git a/flow-libs/atom.js.flow b/flow-libs/atom.js.flow
@@ -274,6 +274,7 @@ declare class atom$Decoration {
 }
 
 declare class atom$DisplayMarkerLayer {
+  id: number,
   destroy(): void,
   clear(): void,
   isDestroyed(): boolean,
@@ -789,6 +790,12 @@ type DecorateMarkerParams = {
   onlyHead?: boolean,
   onlyEmpty?: boolean,
   onlyNonEmpty?: boolean,
+} | {
+  type: 'line-number',
+  class: string,
+  onlyHead?: boolean,
+  onlyEmpty?: boolean,
+  onlyNonEmpty?: boolean,
 } | {
   type: 'gutter',
   item?: HTMLElement,
@@ -950,6 +957,7 @@ declare class atom$TextEditor extends atom$Model {
   // Markers
   addMarkerLayer(): atom$DisplayMarkerLayer,
   getDefaultMarkerLayer(): atom$DisplayMarkerLayer,
+  getMarkerLayer(id: number): atom$DisplayMarkerLayer,
   markBufferPosition(position: atom$PointLike, options?: MarkerOptions): atom$Marker,
   markBufferRange(range: atom$RangeLike, options?: MarkerOptions): atom$Marker,
   markScreenRange(range: atom$RangeLike, options?: MarkerOptions): atom$Marker,

diff --git a/lib/ansi.js b/lib/ansi.js
@@ -3,10 +3,10 @@
 /* eslint-disable react/display-name */
 
 import etch from 'etch' // eslint-disable-line
-import EtchComponent from './etch-component'
+import { EtchComponent } from './etch-component'
 import parser from 'ansi-style-parser'
 
-export default class AnsiStyle extends EtchComponent {
+export class AnsiStyle extends EtchComponent {
   props: { text?: string, mapText?: string => any }
 
   constructor(props: Object) {

diff --git a/lib/bootstrap.js b/lib/bootstrap.js
@@ -58,7 +58,6 @@ class Bootstrap {
   }
 
   subscribeToEvents() {
-    global.jasmineLog && global.jasmineLog('bootstrap - subscribeToEvents')
     const activationHook = (hookName, fn) => {
       const hooks: any = (atom.packages: any).triggeredActivationHooks
       if (hooks && hooks.has(hookName)) {
@@ -88,19 +87,16 @@ class Bootstrap {
   }
 
   setEnvironmentLoaded() {
-    global.jasmineLog && global.jasmineLog('bootstrap - setEnvironmentLoaded')
     this.environmentLoaded = true
     this.check()
   }
 
   setGrammarUsed() {
-    global.jasmineLog && global.jasmineLog('bootstrap - setGrammarUsed')
     this.grammarUsed = true
     this.check()
   }
 
   setCommandUsed() {
-    global.jasmineLog && global.jasmineLog('bootstrap - setCommandUsed')
     this.commandUsed = true
     this.check()
   }
@@ -111,7 +107,6 @@ class Bootstrap {
     }
 
     if (this.environmentLoaded && (this.grammarUsed || this.commandUsed)) {
-      global.jasmineLog && global.jasmineLog('bootstrap - activated')
       this.activated = true
       this.subscriptions.dispose()
       if (this.onActivated) {

diff --git a/lib/config/environment.js b/lib/config/environment.js
@@ -1,6 +1,6 @@
 // @flow
 
-import pathhelper from './pathhelper'
+import * as pathhelper from './pathhelper'
 import path from 'path'
 
 const getenvironment = (): { [string]: ?string } => {

diff --git a/lib/config/locator.js b/lib/config/locator.js
@@ -2,7 +2,7 @@
 
 import { CompositeDisposable } from 'atom'
 import { getenvironment, getgopath } from './environment'
-import pathhelper from './pathhelper'
+import * as pathhelper from './pathhelper'
 import fs from 'fs'
 import os from 'os'
 import path from 'path'

diff --git a/lib/config/pathhelper.js b/lib/config/pathhelper.js
@@ -3,7 +3,7 @@
 import path from 'path'
 import os from 'os'
 
-function expand(env: { [string]: ?string }, thepath: string): string {
+export function expand(env: { [string]: ?string }, thepath: string): string {
   if (!thepath || thepath.trim() === '') {
     return ''
   }
@@ -53,16 +53,14 @@ function expand(env: { [string]: ?string }, thepath: string): string {
   return result
 }
 
-function resolveAndNormalize(pathitem: string): string {
+export function resolveAndNormalize(pathitem: string): string {
   if (!pathitem || pathitem.trim() === '') {
     return ''
   }
   const result = path.resolve(path.normalize(pathitem))
   return result
 }
 
-function home() {
+export function home() {
   return os.homedir()
 }
-
-export default { expand, resolveAndNormalize, home }
diff --git a/lib/doc/godoc-panel.js b/lib/doc/godoc-panel.js
@@ -2,9 +2,9 @@
 
 import type { Tab, PanelModel } from './../panel/tab'
 import type { GogetdocResult } from './godoc'
-import type GodocView from './godoc-view'
+import type { GodocView } from './godoc-view'
 
-export default class GodocPanel implements PanelModel {
+export class GodocPanel implements PanelModel {
   key: string
   tab: Tab
   keymap: string
@@ -16,6 +16,7 @@ export default class GodocPanel implements PanelModel {
   constructor() {
     this.key = 'reference'
     this.tab = {
+      key: 'reference',
       name: 'Reference',
       packageName: 'go-plus',
       icon: 'book',

diff --git a/lib/doc/godoc-view.js b/lib/doc/godoc-view.js
@@ -1,13 +1,12 @@
 // @flow
-/** @babel */
 /** @jsx etch.dom */
 
 import etch from 'etch'
-import EtchComponent from './../etch-component'
+import { EtchComponent } from './../etch-component'
 
-import type GodocPanel from './godoc-panel'
+import type { GodocPanel } from './godoc-panel'
 
-export default class GodocView extends EtchComponent {
+export class GodocView extends EtchComponent {
   props: { model: GodocPanel }
 
   constructor(props: { model: GodocPanel }) {

diff --git a/lib/doc/godoc.js b/lib/doc/godoc.js
@@ -1,7 +1,7 @@
 // @flow
 
 import { CompositeDisposable, Point, Range } from 'atom'
-import GodocPanel from './godoc-panel'
+import { GodocPanel } from './godoc-panel'
 import { utf8OffsetForBufferPosition } from '../utils'
 import { buildGuruArchive } from '../guru-utils'
 import os from 'os'

diff --git a/lib/etch-component.js b/lib/etch-component.js
@@ -3,11 +3,15 @@
 
 import etch from 'etch'
 
+export interface Renderable {
+  render(): any;
+}
+
 /*
   Public: Abstract class for handling the initialization
   boilerplate of an Etch component.
 */
-export default class EtchComponent {
+export class EtchComponent implements Renderable {
   props: any
   refs: Object
   element: HTMLElement

diff --git a/lib/get/get-manager.js b/lib/get/get-manager.js
@@ -2,7 +2,7 @@
 
 import os from 'os'
 import { CompositeDisposable, Disposable } from 'atom'
-import SimpleDialog from './../simple-dialog'
+import { SimpleDialog } from './../simple-dialog'
 import { promiseWaterfall } from './../promise'
 import type { GoConfig } from './../config/service'
 import type { ExecResult } from './../config/executor'
@@ -31,15 +31,15 @@ export type InteractiveGetOptions = {
 class GetManager {
   goconfig: GoConfig
   outputFunc: () => OutputManager
-  busySignal: () => BusySignalService
+  busySignal: () => ?BusySignalService
   packages: Map<string, number>
   onDidUpdateTools: Set<(MultiGetResult, Array<string>) => void>
   subscriptions: CompositeDisposable
 
   constructor(
     goconfig: GoConfig,
     outputFunc: () => OutputManager,
-    busySignal: () => BusySignalService
+    busySignal: () => ?BusySignalService
   ) {
     this.goconfig = goconfig
     this.outputFunc = outputFunc

diff --git a/lib/get/service.js b/lib/get/service.js
@@ -18,7 +18,7 @@ class GetService {
   constructor(
     goconfig: GoConfig,
     getOutput: Function,
-    busySignal: () => BusySignalService
+    busySignal: () => ?BusySignalService
   ) {
     this.getmanager = new GetManager(goconfig, getOutput, busySignal)
   }

diff --git a/lib/implements/implements-view.js b/lib/implements/implements-view.js
@@ -1,11 +1,10 @@
 // @flow
-/** @babel */
 /** @jsx etch.dom */
 /* eslint-disable react/no-unknown-property */
 /* eslint-disable react/jsx-key */
 
 import etch from 'etch'
-import EtchComponent from './../etch-component'
+import { EtchComponent } from './../etch-component'
 import { parseGoPosition, openFile } from './../utils'
 
 import type { Implements } from './implements'

diff --git a/lib/implements/implements.js b/lib/implements/implements.js
@@ -21,6 +21,7 @@ class Implements implements PanelModel {
 
     this.key = 'implements'
     this.tab = {
+      key: 'implements',
       name: 'Implements',
       packageName: 'go-plus',
       icon: 'tasklist',

diff --git a/lib/import/importer-view.js b/lib/import/importer-view.js
@@ -2,7 +2,7 @@
 
 import SelectListView from 'atom-select-list'
 
-export default class ImporterView {
+export class ImporterView {
   modalPanel: any
   selectListView: SelectListView
   previouslyFocusedElement: ?HTMLElement

diff --git a/lib/import/importer.js b/lib/import/importer.js
@@ -2,7 +2,7 @@
 
 import { CompositeDisposable } from 'atom'
 import path from 'path'
-import ImporterView from './importer-view'
+import { ImporterView } from './importer-view'
 import { getEditor } from './../utils'
 import { allPackages } from './../go'
 import * as gcph from './../autocomplete/gocodeprovider-helper'

diff --git a/lib/info/information-view.js b/lib/info/information-view.js
@@ -1,11 +1,10 @@
 // @flow
-/** @babel */
 /** @jsx etch.dom */
 /* eslint-disable react/no-unknown-property */
 /* eslint-disable react/no-string-refs */
 
 import etch from 'etch'
-import EtchComponent from './../etch-component'
+import { EtchComponent } from './../etch-component'
 
 import type { Information } from './information'
 
@@ -15,7 +14,7 @@ type Props = {
   content: string
 }
 
-export default class InformationView extends EtchComponent {
+export class InformationView extends EtchComponent {
   props: Props
 
   constructor(props: Props) {

diff --git a/lib/info/information.js b/lib/info/information.js
@@ -4,7 +4,7 @@ import os from 'os'
 
 import type { GoConfig } from './../config/service'
 import type { PanelModel, Tab } from './../panel/tab'
-import type InformationView from './information-view'
+import type { InformationView } from './information-view'
 
 class Information implements PanelModel {
   goconfig: GoConfig
@@ -17,6 +17,7 @@ class Information implements PanelModel {
     this.goconfig = goconfig
     this.key = 'go'
     this.tab = {
+      key: 'go',
       name: 'Go',
       packageName: 'go-plus',
       icon: 'info',