You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@annotator.apache.org by ra...@apache.org on 2019/05/09 10:01:49 UTC
[incubator-annotator] branch master updated (dee4d4f -> d1efcfa)
This is an automated email from the ASF dual-hosted git repository.
randall pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git.
from dee4d4f Upgrade browserslist and caniuse-lite
new a3217a6 Upgrade esm
new 863fbf3 Upgrade mocha
new a557867 Set coverage includes explicitly
new fa27fac Re-enable ES module formatted Babel helpers
new 929c192 Fix outdated .eslintignore reference
new a0eb1eb Output build formats to different directories
new 44fa8fc Target default browserslist browsers
new 9afae6c Remove unused @babel/runtime
new d1efcfa Clean both builds when running clean
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.eslintignore | 3 +-
.eslintrc.yml | 1 +
.gitignore | 1 +
.mocharc.js | 5 ++
.nycrc | 8 ++-
babel.config.js | 12 +---
package.json | 18 +++---
test/mocha.opts | 4 --
yarn.lock | 178 +++++++++++++++++++++++++++++++++++++++-----------------
9 files changed, 148 insertions(+), 82 deletions(-)
create mode 100644 .mocharc.js
delete mode 100644 test/mocha.opts
[incubator-annotator] 05/09: Fix outdated .eslintignore reference
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 929c192eaec98225743b017de6e31a2902050a10
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:57:12 2019 -0700
Fix outdated .eslintignore reference
---
.eslintignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.eslintignore b/.eslintignore
index cd50778..038512d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,4 @@
/coverage
/packages/*/lib/*
/packages/*/node_modules/*
-/packages/fragment-identifier/src/fragment.mjs
+/packages/fragment-identifier/src/fragment.js
[incubator-annotator] 09/09: Clean both builds when running clean
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit d1efcfac1e67b35844c0337c989ed914a147c797
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 03:01:34 2019 -0700
Clean both builds when running clean
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 65a7b8e..942543d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"build": "lerna exec --parallel -- babel --root-mode upward -d lib src",
"build:cjs": "cross-env BABEL_ENV=cjs yarn build:babel -d lib src",
"build:esm": "cross-env BABEL_ENV=esm yarn build:babel -d esm src",
- "clean": "lerna exec -- rimraf lib",
+ "clean": "lerna exec -- rimraf esm lib",
"lint": "eslint . --ext js,mjs --fix --quiet",
"prepare": "lerna run prepare",
"start": "webpack-dev-server",
[incubator-annotator] 08/09: Remove unused @babel/runtime
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 9afae6ced31f696b4ed58f0f8163a7e5d1ae452e
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 03:00:31 2019 -0700
Remove unused @babel/runtime
Its use has been superseded by @babel/runtime-corejs3
---
package.json | 1 -
yarn.lock | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 82b2284..65a7b8e 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
"@babel/plugin-transform-runtime": "^7.4.0",
"@babel/preset-env": "^7.4.0",
"@babel/register": "^7.4.0",
- "@babel/runtime": "^7.4.0",
"ajv": "^6.5.0",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.5",
diff --git a/yarn.lock b/yarn.lock
index 61279aa..63eec46 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -668,7 +668,7 @@
core-js-pure "^3.0.0"
regenerator-runtime "^0.13.2"
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.4.0":
+"@babel/runtime@^7.0.0":
version "7.4.4"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d"
integrity sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==
[incubator-annotator] 04/09: Re-enable ES module formatted Babel
helpers
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit fa27fac7724b9e640ae32fee1ec176ff863774fb
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:56:25 2019 -0700
Re-enable ES module formatted Babel helpers
---
babel.config.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/babel.config.js b/babel.config.js
index a8e9790..f6ff1df 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -59,8 +59,7 @@ module.exports = api => {
// Use core-js for runtime helpers.
corejs: corejsOptions,
// Use helpers formatted for the target environment.
- // TODO: make this work again
- // useESModules: !CJS,
+ useESModules: !CJS,
};
return {
[incubator-annotator] 03/09: Set coverage includes explicitly
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit a5578678e8b6b45d468c169886e8dbfef59bd597
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:55:48 2019 -0700
Set coverage includes explicitly
---
.nycrc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.nycrc b/.nycrc
index 39f606a..8ddd043 100644
--- a/.nycrc
+++ b/.nycrc
@@ -1,7 +1,7 @@
{
- "exclude": [
- ".mocharc.js",
- "packages/*/test"
+ "all": true,
+ "include": [
+ "packages/*/src/**/*.js"
],
"instrument": false,
"sourceMap": false,
[incubator-annotator] 07/09: Target default browserslist browsers
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 44fa8fc0c21dfd153a2d6c3f7c844fd4b7809b1b
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:58:28 2019 -0700
Target default browserslist browsers
---
babel.config.js | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/babel.config.js b/babel.config.js
index f6ff1df..5c263d6 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -35,13 +35,8 @@ module.exports = api => {
modules: CJS ? 'commonjs' : false,
// Enable transformations for shipped proposals.
shippedProposals: true,
- // Set target environments.
- targets: {
- // Browsers: > 1%, last 2 versions, Firefox ESR
- browsers: ['defaults'],
- // Node: LTS
- node: '6.0',
- },
+ // Set target environment to default browsers.
+ targets: 'defaults',
// Import polyfills where they are used, without polluting globals.
useBuiltIns: 'usage',
};
[incubator-annotator] 02/09: Upgrade mocha
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 863fbf3edb2e4b1b226a7e3f5740f93435178e04
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:55:05 2019 -0700
Upgrade mocha
---
.eslintrc.yml | 1 +
.mocharc.js | 5 ++
.nycrc | 1 +
package.json | 2 +-
test/mocha.opts | 3 -
yarn.lock | 172 ++++++++++++++++++++++++++++++++++++++------------------
6 files changed, 126 insertions(+), 58 deletions(-)
diff --git a/.eslintrc.yml b/.eslintrc.yml
index a365db9..795d782 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -45,6 +45,7 @@ settings:
overrides:
- files:
+ - '.mocharc.js'
- 'babel.config.js'
- 'scripts/*.js'
env:
diff --git a/.mocharc.js b/.mocharc.js
new file mode 100644
index 0000000..0cf905b
--- /dev/null
+++ b/.mocharc.js
@@ -0,0 +1,5 @@
+module.exports = {
+ require: [
+ 'chai/register-assert',
+ ],
+};
diff --git a/.nycrc b/.nycrc
index 90fb7e7..39f606a 100644
--- a/.nycrc
+++ b/.nycrc
@@ -1,5 +1,6 @@
{
"exclude": [
+ ".mocharc.js",
"packages/*/test"
],
"instrument": false,
diff --git a/package.json b/package.json
index 08f5cad..b940b86 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"husky": "^1.3.1",
"lerna": "^3.13.4",
"lint-staged": "^8.1.5",
- "mocha": "^5.0.5",
+ "mocha": "^6.1.4",
"mocha-loader": "^2.0.1",
"multi-entry-loader": "^1.1.2",
"node-fetch": "^2.2.0",
diff --git a/test/mocha.opts b/test/mocha.opts
deleted file mode 100644
index ad74b47..0000000
--- a/test/mocha.opts
+++ /dev/null
@@ -1,3 +0,0 @@
--r chai/register-assert
---recursive
---watch-extensions mjs
diff --git a/yarn.lock b/yarn.lock
index 38f5de7..61279aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1689,6 +1689,11 @@ ajv@^6.5.5, ajv@^6.9.1:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
+ansi-colors@3.2.3:
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+ integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+
ansi-colors@^3.0.0:
version "3.2.4"
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -2522,7 +2527,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
-commander@2.15.1, commander@^2.14.1, commander@^2.8.1, commander@^2.9.0:
+commander@^2.14.1, commander@^2.8.1, commander@^2.9.0:
version "2.15.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
@@ -2951,7 +2956,7 @@ debug@3.1.0, debug@^3.1.0:
dependencies:
ms "2.0.0"
-debug@^3.2.5, debug@^3.2.6:
+debug@3.2.6, debug@^3.2.5, debug@^3.2.6:
version "3.2.6"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3842,6 +3847,13 @@ find-parent-dir@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+find-up@3.0.0, find-up@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+ integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+ dependencies:
+ locate-path "^3.0.0"
+
find-up@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3855,13 +3867,6 @@ find-up@^2.0.0, find-up@^2.1.0:
dependencies:
locate-path "^2.0.0"
-find-up@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
- integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
- dependencies:
- locate-path "^3.0.0"
-
findup-sync@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -3881,6 +3886,13 @@ flat-cache@^2.0.1:
rimraf "2.6.3"
write "1.0.3"
+flat@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+ integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+ dependencies:
+ is-buffer "~2.0.3"
+
flatted@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
@@ -4168,9 +4180,10 @@ glob-to-regexp@^0.3.0:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob@7.1.3, glob@^7.1.1, glob@^7.1.3:
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+ integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -4179,10 +4192,9 @@ glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.1.1, glob@^7.1.3:
- version "7.1.3"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
- integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2:
+ version "7.1.2"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -4389,10 +4401,10 @@ hasha@^3.0.0:
dependencies:
is-stream "^1.0.1"
-he@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
- integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
+he@1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
hmac-drbg@^1.0.0:
version "1.0.1"
@@ -4790,6 +4802,11 @@ is-buffer@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+is-buffer@~2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
+ integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+
is-builtin-module@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -5139,18 +5156,18 @@ js-tokens@^4.0.0:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@^3.13.0:
- version "3.13.0"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
- integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
+js-yaml@3.13.1, js-yaml@^3.13.1:
+ version "3.13.1"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+ integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
-js-yaml@^3.13.1:
- version "3.13.1"
- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
- integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@^3.13.0:
+ version "3.13.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
+ integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
@@ -5531,18 +5548,18 @@ lodash@^4.17.5, lodash@^4.2.1:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+log-symbols@2.2.0, log-symbols@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+ dependencies:
+ chalk "^2.0.1"
+
log-symbols@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
dependencies:
chalk "^1.0.0"
-log-symbols@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
- dependencies:
- chalk "^2.0.1"
-
log-update@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
@@ -5925,22 +5942,34 @@ mocha-loader@^2.0.1:
script-loader "^0.7.2"
style-loader "^0.23.1"
-mocha@^5.0.5:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
- integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
+mocha@^6.1.4:
+ version "6.1.4"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.1.4.tgz#e35fada242d5434a7e163d555c705f6875951640"
+ integrity sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==
dependencies:
+ ansi-colors "3.2.3"
browser-stdout "1.3.1"
- commander "2.15.1"
- debug "3.1.0"
+ debug "3.2.6"
diff "3.5.0"
escape-string-regexp "1.0.5"
- glob "7.1.2"
+ find-up "3.0.0"
+ glob "7.1.3"
growl "1.10.5"
- he "1.1.1"
+ he "1.2.0"
+ js-yaml "3.13.1"
+ log-symbols "2.2.0"
minimatch "3.0.4"
mkdirp "0.5.1"
- supports-color "5.4.0"
+ ms "2.1.1"
+ node-environment-flags "1.0.5"
+ object.assign "4.1.0"
+ strip-json-comments "2.0.1"
+ supports-color "6.0.0"
+ which "1.3.1"
+ wide-align "1.1.3"
+ yargs "13.2.2"
+ yargs-parser "13.0.0"
+ yargs-unparser "1.5.0"
modify-values@^1.0.0:
version "1.0.1"
@@ -5961,7 +5990,7 @@ ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
@@ -6065,6 +6094,14 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+node-environment-flags@1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
+ integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
+ dependencies:
+ object.getownpropertydescriptors "^2.0.3"
+ semver "^5.7.0"
+
node-fetch-npm@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
@@ -6356,7 +6393,7 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-keys@^1.0.12:
+object-keys@^1.0.11, object-keys@^1.0.12:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -6371,6 +6408,16 @@ object-visit@^1.0.0:
dependencies:
isobject "^3.0.0"
+object.assign@4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+ integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+ dependencies:
+ define-properties "^1.1.2"
+ function-bind "^1.1.1"
+ has-symbols "^1.0.0"
+ object-keys "^1.0.11"
+
object.getownpropertydescriptors@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
@@ -7612,7 +7659,7 @@ semver-compare@^1.0.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-"semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.1, semver@^5.6.0:
+"semver@2.x || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
version "5.7.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -8121,7 +8168,7 @@ strip-indent@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -8142,10 +8189,10 @@ style-loader@^0.23.1:
loader-utils "^1.1.0"
schema-utils "^1.0.0"
-supports-color@5.4.0:
- version "5.4.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
- integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
+supports-color@6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
+ integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
dependencies:
has-flag "^3.0.0"
@@ -8817,7 +8864,7 @@ which-module@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-which@1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@1, which@1.3.1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
dependencies:
@@ -8829,7 +8876,7 @@ which@^1.2.12:
dependencies:
isexe "^2.0.0"
-wide-align@^1.1.0:
+wide-align@1.1.3, wide-align@^1.1.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
dependencies:
@@ -8933,6 +8980,14 @@ yallist@^3.0.0, yallist@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+yargs-parser@13.0.0:
+ version "13.0.0"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
+ integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+ dependencies:
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
+
yargs-parser@^11.1.1:
version "11.1.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
@@ -8949,6 +9004,15 @@ yargs-parser@^13.0.0:
camelcase "^5.0.0"
decamelize "^1.2.0"
+yargs-unparser@1.5.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d"
+ integrity sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==
+ dependencies:
+ flat "^4.1.0"
+ lodash "^4.17.11"
+ yargs "^12.0.5"
+
yargs@12.0.5, yargs@^12.0.1, yargs@^12.0.5:
version "12.0.5"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -8967,7 +9031,7 @@ yargs@12.0.5, yargs@^12.0.1, yargs@^12.0.5:
y18n "^3.2.1 || ^4.0.0"
yargs-parser "^11.1.1"
-yargs@^13.2.2:
+yargs@13.2.2, yargs@^13.2.2:
version "13.2.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
[incubator-annotator] 01/09: Upgrade esm
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit a3217a6893aeb33a45deeca8f79be9087e2bd935
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:52:01 2019 -0700
Upgrade esm
---
.nycrc | 3 ++-
package.json | 6 +++---
test/mocha.opts | 1 -
yarn.lock | 10 +++++++---
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/.nycrc b/.nycrc
index f01ed05..90fb7e7 100644
--- a/.nycrc
+++ b/.nycrc
@@ -3,5 +3,6 @@
"packages/*/test"
],
"instrument": false,
- "sourceMap": false
+ "sourceMap": false,
+ "require": ["esm", "@babel/register"]
}
diff --git a/package.json b/package.json
index a5e49f0..08f5cad 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,8 @@
"lint": "eslint . --ext js,mjs --fix --quiet",
"prepare": "lerna run prepare",
"start": "webpack-dev-server",
- "test": "cross-env BABEL_ENV=test nyc mocha -r esm packages/*/test/**/*.js",
- "validate": "cross-env BABEL_ENV=test nyc mocha -r esm test/**/*.js"
+ "test": "cross-env BABEL_ENV=test nyc mocha packages/*/test/**/*.js",
+ "validate": "cross-env BABEL_ENV=test nyc mocha test/**/*.js"
},
"devDependencies": {
"@babel/cli": "^7.4.0",
@@ -44,7 +44,7 @@
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-node": "^9.0.1",
"eslint-plugin-prettier": "^3.0.1",
- "esm": "^3.0.49",
+ "esm": "^3.2.22",
"husky": "^1.3.1",
"lerna": "^3.13.4",
"lint-staged": "^8.1.5",
diff --git a/test/mocha.opts b/test/mocha.opts
index e637792..ad74b47 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,4 +1,3 @@
--r @babel/register
-r chai/register-assert
--recursive
--watch-extensions mjs
diff --git a/yarn.lock b/yarn.lock
index b9fbd04..38f5de7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3527,9 +3527,10 @@ eslint@^5.16.0:
table "^5.2.3"
text-table "^0.2.0"
-esm@^3.0.49:
- version "3.0.49"
- resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.49.tgz#24e2a305c742f9565f2ededa5665493347f8a412"
+esm@^3.2.22:
+ version "3.2.22"
+ resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
+ integrity sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA==
espree@^5.0.1:
version "5.0.1"
@@ -4391,6 +4392,7 @@ hasha@^3.0.0:
he@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+ integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
hmac-drbg@^1.0.0:
version "1.0.1"
@@ -5926,6 +5928,7 @@ mocha-loader@^2.0.1:
mocha@^5.0.5:
version "5.2.0"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
+ integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
dependencies:
browser-stdout "1.3.1"
commander "2.15.1"
@@ -8142,6 +8145,7 @@ style-loader@^0.23.1:
supports-color@5.4.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+ integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
dependencies:
has-flag "^3.0.0"
[incubator-annotator] 06/09: Output build formats to different
directories
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit a0eb1ebb68fcffda8a86e8a4cef6b6d08c86222c
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:57:34 2019 -0700
Output build formats to different directories
---
.eslintignore | 1 +
.gitignore | 1 +
package.json | 7 +++----
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.eslintignore b/.eslintignore
index 038512d..8b9639d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
/coverage
+/packages/*/esm/*
/packages/*/lib/*
/packages/*/node_modules/*
/packages/fragment-identifier/src/fragment.js
diff --git a/.gitignore b/.gitignore
index 4c9af02..610fa82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.nyc_output
coverage
node_modules
+/packages/*/esm
/packages/*/lib
diff --git a/package.json b/package.json
index b940b86..82b2284 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,9 @@
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
"scripts": {
- "build": "yarn build:cjs && yarn build:esm",
- "build:cjs": "cross-env BABEL_ENV=cjs yarn build:run",
- "build:esm": "cross-env BABEL_ENV=esm yarn build:run --keep-file-extension",
- "build:run": "lerna exec --parallel -- babel -d lib src --config-file ../../babel.config.js",
+ "build": "lerna exec --parallel -- babel --root-mode upward -d lib src",
+ "build:cjs": "cross-env BABEL_ENV=cjs yarn build:babel -d lib src",
+ "build:esm": "cross-env BABEL_ENV=esm yarn build:babel -d esm src",
"clean": "lerna exec -- rimraf lib",
"lint": "eslint . --ext js,mjs --fix --quiet",
"prepare": "lerna run prepare",