From 15b9b5191fe8661071592399e13e191b13c9a9f9 Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 23 Oct 2020 17:04:37 -0500 Subject: [PATCH 1/9] use babel-preset-atomic install cross-env --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 557f6d1..dce7cfb 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ "devDependencies": { "@babel/cli": "^7.1.2", "@babel/core": "^7.1.2", - "@babel/preset-env": "^7.1.0", + "babel-preset-atomic": "^2.5.4", + "cross-env": "^7.0.2", "jasmine-focused": "^1.0.4", "joanna": "0.0.11", "rimraf": "^2.2.2", From 763f5accdedfea773e9f09b4da9c1fbfb9c8ee64 Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 23 Oct 2020 17:05:45 -0500 Subject: [PATCH 2/9] update @babel packages --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dce7cfb..61777ab 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ }, "license": "MIT", "devDependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", + "@babel/cli": "^7.12.1", + "@babel/core": "^7.12.3", "babel-preset-atomic": "^2.5.4", "cross-env": "^7.0.2", "jasmine-focused": "^1.0.4", From fe39d3b0674f22699efe2b66d01e6d4bb184b44d Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 23 Oct 2020 17:48:50 -0500 Subject: [PATCH 3/9] update joanna to @aminya/joanna https://github.com/atom/joanna/pull/12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 61777ab..78ea513 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "babel-preset-atomic": "^2.5.4", "cross-env": "^7.0.2", "jasmine-focused": "^1.0.4", - "joanna": "0.0.11", + "joanna": "https://github.com/aminya/joanna", "rimraf": "^2.2.2", "temp": "^0.6.0" } From 90f6a48c662fb927094b2a0df956409d2b6a43de Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 23 Oct 2020 19:20:55 -0500 Subject: [PATCH 4/9] seprate build and docs script + babel config --- babel.config.js | 10 ++++++++++ package.json | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 babel.config.js diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 0000000..873b92c --- /dev/null +++ b/babel.config.js @@ -0,0 +1,10 @@ +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 78ea513..06bf899 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,9 @@ "description": "Simple library for implementing and consuming evented APIs", "main": "./dist/event-kit", "scripts": { - "prepublish": "babel lib --out-dir dist --presets @babel/env && joanna-tello -o api.json package.json lib", + "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", "test": "jasmine-focused --captureExceptions --forceexit spec" }, "repository": { From 314a4cee61e7c52e8e93a9934c6152f754fd5f7e Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 23 Oct 2020 19:32:26 -0500 Subject: [PATCH 5/9] include the non-transformed code in the npm package --- .npmignore | 1 - README.md | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.npmignore b/.npmignore index a2f78f0..d4c42e7 100644 --- a/.npmignore +++ b/.npmignore @@ -1,7 +1,6 @@ spec script src -lib .npmignore .DS_Store npm-debug.log diff --git a/README.md b/README.md index 7df7c88..520e490 100644 --- a/README.md +++ b/README.md @@ -74,3 +74,9 @@ const {Disposable} = require('event-kit') const disposable = new Disposable(() => this.destroyResource()) ``` + +### Using ES6 Code +You can use the ES6 style classes from `lib` directory. +``` +const {Disposable} = require('event-kit/lib/event-kit') +``` From 790de8a2e5136b93a6a4eabcb9f59f3fe69975a3 Mon Sep 17 00:00:00 2001 From: aminya Date: Fri, 23 Oct 2020 19:33:57 -0500 Subject: [PATCH 6/9] test on new node versions add visual studio to PATH on appveyor --- .travis.yml | 4 +++- appveyor.yml | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 472ab39..44925b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,9 @@ notifications: on_failure: change node_js: - - 8 + - 10 + - 12 + - 14 git: depth: 10 diff --git a/appveyor.yml b/appveyor.yml index 9b76f4f..f2985be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,15 @@ environment: - nodejs_version: "6" + matrix: + - nodejs_version: "10" + - nodejs_version: "12" + - nodejs_version: "14" platform: - x64 - x86 install: + - SET PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\bin;%PATH% - ps: Install-Product node $env:nodejs_version - npm install From aa9568b473cba844f9fd9868720adfe127dde874 Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 24 Oct 2020 00:24:03 -0500 Subject: [PATCH 7/9] :arrow_up: jasmine-focused --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06bf899..4e3eae1 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@babel/core": "^7.12.3", "babel-preset-atomic": "^2.5.4", "cross-env": "^7.0.2", - "jasmine-focused": "^1.0.4", + "jasmine-focused": "^1.0.7", "joanna": "https://github.com/aminya/joanna", "rimraf": "^2.2.2", "temp": "^0.6.0" From 328ac99863f2b029221fdb0d309eb5d458434f0d Mon Sep 17 00:00:00 2001 From: aminya Date: Sat, 24 Oct 2020 00:27:06 -0500 Subject: [PATCH 8/9] remove unused devDeps (rimraf and temp) --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 4e3eae1..1a73418 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,6 @@ "babel-preset-atomic": "^2.5.4", "cross-env": "^7.0.2", "jasmine-focused": "^1.0.7", - "joanna": "https://github.com/aminya/joanna", - "rimraf": "^2.2.2", - "temp": "^0.6.0" + "joanna": "https://github.com/aminya/joanna" } } From 6a211060f12bf0fcdb9d8a7c5815b462825e3531 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 18 Jan 2021 22:51:07 -0600 Subject: [PATCH 9/9] chore: rebump devDeps --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1a73418..5efa0a5 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,10 @@ }, "license": "MIT", "devDependencies": { - "@babel/cli": "^7.12.1", - "@babel/core": "^7.12.3", - "babel-preset-atomic": "^2.5.4", - "cross-env": "^7.0.2", + "@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" }