diff --git a/babel.config.js b/babel.config.js deleted file mode 100644 index 873b92c..0000000 --- a/babel.config.js +++ /dev/null @@ -1,10 +0,0 @@ -let presets = ["babel-preset-atomic"]; - -let plugins = ["@babel/plugin-transform-classes"] // this is needed so Disposabale can be extended by ES5-style classes - -module.exports = { - presets: presets, - plugins: plugins, - exclude: "node_modules/**", - sourceMap: true, -} diff --git a/package.json b/package.json index 5efa0a5..fa39043 100644 --- a/package.json +++ b/package.json @@ -2,11 +2,10 @@ "name": "event-kit", "version": "2.5.3", "description": "Simple library for implementing and consuming evented APIs", - "main": "./dist/event-kit", + "main": "./lib/event-kit.js", "scripts": { - "build": "cross-env BABEL_KEEP_MODULES=false babel lib --out-dir dist --delete-dir-on-start", "docs": "joanna-tello -o api.json package.json lib", - "prepublish": "npm run build && npm run docs", + "prepublish": "npm run docs", "test": "jasmine-focused --captureExceptions --forceexit spec" }, "repository": { @@ -18,10 +17,6 @@ }, "license": "MIT", "devDependencies": { - "@babel/cli": "^7.12.10", - "@babel/core": "^7.12.10", - "babel-preset-atomic": "^3.0.1", - "cross-env": "^7.0.3", "jasmine-focused": "^1.0.7", "joanna": "https://github.com/aminya/joanna" } diff --git a/spec/composite-disposable-spec.js b/spec/composite-disposable-spec.js index 55e5a55..bfabb34 100644 --- a/spec/composite-disposable-spec.js +++ b/spec/composite-disposable-spec.js @@ -1,5 +1,4 @@ -const CompositeDisposable = require("../dist/composite-disposable") -const Disposable = require("../dist/disposable") +const { CompositeDisposable, Disposable } = require("../lib/event-kit.js"); describe("CompositeDisposable", function() { let disposable1, disposable2, disposable3 diff --git a/spec/disposable-spec.js b/spec/disposable-spec.js index 0f9716d..0d58246 100644 --- a/spec/disposable-spec.js +++ b/spec/disposable-spec.js @@ -1,4 +1,4 @@ -const Disposable = require("../dist/disposable") +const { Disposable } = require("../lib/event-kit.js"); describe("Disposable", function() { it("does not try to execute disposalAction when it is not a function", function() { @@ -23,19 +23,18 @@ describe("Disposable", function() { expect(disposalAction.callCount).toBe(1) }) - it('can be extended by ES5-style classes', () => { - function MyDisposable () { - // super - Disposable.apply(this, arguments) + it("can be extended by ES6-style classes", () => { + class MyDisposable extends Disposable { + constructor(...args) { + super(...args); + } } - MyDisposable.prototype = new Disposable() - - let actionCalled = false - const disposable = new MyDisposable(() => { actionCalled = true }) - disposable.dispose() - expect(actionCalled).toBe(true) - }) + let actionCalled = false; + const disposable = new MyDisposable(() => { actionCalled = true }); + disposable.dispose(); + expect(actionCalled).toBe(true); + }); describe(".isDisposable(object)", () => { it("true if the object implements the ::dispose function", function() { diff --git a/spec/emitter-spec.js b/spec/emitter-spec.js index 6f63b97..519425f 100644 --- a/spec/emitter-spec.js +++ b/spec/emitter-spec.js @@ -1,4 +1,4 @@ -const Emitter = require("../dist/emitter") +const { Emitter } = require("../lib/event-kit.js"); describe("Emitter", function() { it("invokes the observer when the named event is emitted until disposed", function() {