Skip to content

Commit 1a4f3fa

Browse files
committed
fix: MinimapServiceV1
We should not mix ES and CJS modules parcel-bundler/parcel#5531 (comment)
1 parent f276547 commit 1a4f3fa

File tree

2 files changed

+35
-6
lines changed

2 files changed

+35
-6
lines changed

lib/main.js

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { Emitter, CompositeDisposable } from 'atom'
44
import MinimapElement from './minimap-element'
55
import Minimap from './minimap'
66
import config from './config.json'
7-
import { deactivateAllPlugins } from './plugin-management'
7+
import * as PluginManagement from './plugin-management'
88

9-
exports.config = config
9+
export * as config from './config.json'
1010
export * from './plugin-management'
1111
export { default as Minimap } from './minimap'
1212

@@ -110,7 +110,7 @@ export function minimapViewProvider (model) {
110110
export function deactivate () {
111111
if (!active) { return }
112112

113-
deactivateAllPlugins()
113+
PluginManagement.deactivateAllPlugins()
114114

115115
if (editorsMinimaps) {
116116
editorsMinimaps.forEach((value, key) => {
@@ -358,9 +358,36 @@ function initSubscriptions () {
358358
}))
359359
}
360360

361+
// The public exports included in the service:
362+
const MinimapServiceV1 = {
363+
minimapViewProvider,
364+
getConfigSchema,
365+
onDidActivate,
366+
onDidDeactivate,
367+
onDidCreateMinimap,
368+
onDidAddPlugin,
369+
onDidRemovePlugin,
370+
onDidActivatePlugin,
371+
onDidDeactivatePlugin,
372+
onDidChangePluginOrder,
373+
minimapClass,
374+
minimapForEditorElement,
375+
minimapForEditor,
376+
standAloneMinimapForEditor,
377+
getActiveMinimap,
378+
observeMinimaps,
379+
registerPlugin: PluginManagement.registerPlugin,
380+
unregisterPlugin: PluginManagement.unregisterPlugin,
381+
togglePluginActivation: PluginManagement.togglePluginActivation,
382+
deactivateAllPlugins: PluginManagement.deactivateAllPlugins,
383+
activatePlugin: PluginManagement.activatePlugin,
384+
deactivatePlugin: PluginManagement.deactivatePlugin,
385+
getPluginsOrder: PluginManagement.getPluginsOrder
386+
}
387+
361388
/**
362389
* Returns the Minimap main module instance.
363390
*
364391
* @return {Main} The Minimap main module instance.
365392
*/
366-
export function provideMinimapServiceV1 () { return exports }
393+
export function provideMinimapServiceV1 () { return MinimapServiceV1 }

spec/minimap-main-spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,10 @@ describe('Minimap package', () => {
117117
})
118118

119119
describe('service', () => {
120-
it('returns the minimap main module', () => {
121-
expect(minimapPackage.provideMinimapServiceV1()).toEqual(minimapPackage)
120+
it('returns the minimap public exports', () => {
121+
const publicExports = Object.keys(minimapPackage.provideMinimapServiceV1())
122+
const allExports = Object.keys(minimapPackage)
123+
expect(publicExports.every((str) => { return allExports.includes(str) || console.log(str) } )).toBeTruthy()
122124
})
123125

124126
it('creates standalone minimap with provided text editor', () => {

0 commit comments

Comments
 (0)