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 09:41:15 UTC
[incubator-annotator] branch master updated (c53d965 -> dee4d4f)
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 c53d965 Upgrade webpack and webpack loaders
new 771efce Migrate .mjs to .js
new dee4d4f Upgrade browserslist and caniuse-lite
The 2 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:
.eslintrc.yml | 6 ++---
.lintstagedrc | 2 +-
.nycrc | 4 ----
package.json | 4 ++--
packages/dom/src/{index.mjs => index.js} | 0
packages/dom/src/text/{index.mjs => index.js} | 0
packages/dom/src/text/{quote.mjs => quote.js} | 0
packages/fragment-identifier/.gitignore | 2 +-
packages/fragment-identifier/package.json | 2 +-
.../src/{index.mjs => index.js} | 0
packages/range/src/{cartesian.mjs => cartesian.js} | 0
packages/range/src/{index.mjs => index.js} | 0
.../range/test/{cartesian.mjs => cartesian.js} | 2 +-
packages/range/test/{index.mjs => index.js} | 0
packages/selector/src/{index.mjs => index.js} | 0
packages/text/src/{index.mjs => index.js} | 0
test/{data-model.mjs => data-model.js} | 0
webpack.config.js | 4 ++--
yarn.lock | 28 +---------------------
19 files changed, 11 insertions(+), 43 deletions(-)
rename packages/dom/src/{index.mjs => index.js} (100%)
rename packages/dom/src/text/{index.mjs => index.js} (100%)
rename packages/dom/src/text/{quote.mjs => quote.js} (100%)
rename packages/fragment-identifier/src/{index.mjs => index.js} (100%)
rename packages/range/src/{cartesian.mjs => cartesian.js} (100%)
rename packages/range/src/{index.mjs => index.js} (100%)
rename packages/range/test/{cartesian.mjs => cartesian.js} (96%)
rename packages/range/test/{index.mjs => index.js} (100%)
rename packages/selector/src/{index.mjs => index.js} (100%)
rename packages/text/src/{index.mjs => index.js} (100%)
rename test/{data-model.mjs => data-model.js} (100%)
[incubator-annotator] 01/02: Migrate .mjs to .js
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 771efcef3befc48107bd5d96cd9d2dcbbe47221d
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 01:29:16 2019 -0700
Migrate .mjs to .js
In light of the recent announcement[1] regarding the latest ES module
support in Node.js, it seems unlikely that an .mjs file extension will
be necessary and it may even hinder development by complicating the
tooling at this stage of maturity.
---
.eslintrc.yml | 6 ++----
.lintstagedrc | 2 +-
.nycrc | 4 ----
package.json | 4 ++--
packages/dom/src/{index.mjs => index.js} | 0
packages/dom/src/text/{index.mjs => index.js} | 0
packages/dom/src/text/{quote.mjs => quote.js} | 0
packages/fragment-identifier/.gitignore | 2 +-
packages/fragment-identifier/package.json | 2 +-
packages/fragment-identifier/src/{index.mjs => index.js} | 0
packages/range/src/{cartesian.mjs => cartesian.js} | 0
packages/range/src/{index.mjs => index.js} | 0
packages/range/test/{cartesian.mjs => cartesian.js} | 2 +-
packages/range/test/{index.mjs => index.js} | 0
packages/selector/src/{index.mjs => index.js} | 0
packages/text/src/{index.mjs => index.js} | 0
test/{data-model.mjs => data-model.js} | 0
webpack.config.js | 4 ++--
18 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/.eslintrc.yml b/.eslintrc.yml
index f911783..a365db9 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -41,7 +41,6 @@ rules:
trailingComma: es5
settings:
- import/extensions: ['.mjs', '.js']
import/resolver: babel-module
overrides:
@@ -59,13 +58,12 @@ overrides:
no-console: off
node/no-unsupported-features: error
- files:
- - 'demo/**/*.mjs'
- 'demo/**/*.js'
env:
browser: true
- files:
- - 'packages/*/test/**/*.mjs'
- - 'test/**/*.mjs'
+ - 'packages/*/test/**/*.js'
+ - 'test/**/*.js'
env:
mocha: true
globals:
diff --git a/.lintstagedrc b/.lintstagedrc
index 6bce336..5189da9 100644
--- a/.lintstagedrc
+++ b/.lintstagedrc
@@ -1,3 +1,3 @@
{
- "*.{js,mjs}": "eslint"
+ "*.js": "eslint"
}
diff --git a/.nycrc b/.nycrc
index 2697469..f01ed05 100644
--- a/.nycrc
+++ b/.nycrc
@@ -2,10 +2,6 @@
"exclude": [
"packages/*/test"
],
- "extension": [
- ".js",
- ".mjs"
- ],
"instrument": false,
"sourceMap": false
}
diff --git a/package.json b/package.json
index 31a63e8..a5e49f0 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/**/*.mjs",
- "validate": "cross-env BABEL_ENV=test nyc mocha -r esm test/**/*.mjs"
+ "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"
},
"devDependencies": {
"@babel/cli": "^7.4.0",
diff --git a/packages/dom/src/index.mjs b/packages/dom/src/index.js
similarity index 100%
rename from packages/dom/src/index.mjs
rename to packages/dom/src/index.js
diff --git a/packages/dom/src/text/index.mjs b/packages/dom/src/text/index.js
similarity index 100%
rename from packages/dom/src/text/index.mjs
rename to packages/dom/src/text/index.js
diff --git a/packages/dom/src/text/quote.mjs b/packages/dom/src/text/quote.js
similarity index 100%
rename from packages/dom/src/text/quote.mjs
rename to packages/dom/src/text/quote.js
diff --git a/packages/fragment-identifier/.gitignore b/packages/fragment-identifier/.gitignore
index e57d117..dac4690 100644
--- a/packages/fragment-identifier/.gitignore
+++ b/packages/fragment-identifier/.gitignore
@@ -1 +1 @@
-/src/fragment.mjs
+/src/fragment.js
diff --git a/packages/fragment-identifier/package.json b/packages/fragment-identifier/package.json
index 47df7ef..b6a5fe4 100644
--- a/packages/fragment-identifier/package.json
+++ b/packages/fragment-identifier/package.json
@@ -11,7 +11,7 @@
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
"scripts": {
- "prepare": "pegjs --format es --output src/fragment.mjs src/fragment.pegjs"
+ "prepare": "pegjs --format es --output src/fragment.js src/fragment.pegjs"
},
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
diff --git a/packages/fragment-identifier/src/index.mjs b/packages/fragment-identifier/src/index.js
similarity index 100%
rename from packages/fragment-identifier/src/index.mjs
rename to packages/fragment-identifier/src/index.js
diff --git a/packages/range/src/cartesian.mjs b/packages/range/src/cartesian.js
similarity index 100%
rename from packages/range/src/cartesian.mjs
rename to packages/range/src/cartesian.js
diff --git a/packages/range/src/index.mjs b/packages/range/src/index.js
similarity index 100%
rename from packages/range/src/index.mjs
rename to packages/range/src/index.js
diff --git a/packages/range/test/cartesian.mjs b/packages/range/test/cartesian.js
similarity index 96%
rename from packages/range/test/cartesian.mjs
rename to packages/range/test/cartesian.js
index 963be94..73841b1 100644
--- a/packages/range/test/cartesian.mjs
+++ b/packages/range/test/cartesian.js
@@ -13,7 +13,7 @@
* the License.
*/
-import { product } from '../src/cartesian.mjs';
+import { product } from '../src/cartesian.js';
async function* gen1() {
yield 1;
diff --git a/packages/range/test/index.mjs b/packages/range/test/index.js
similarity index 100%
rename from packages/range/test/index.mjs
rename to packages/range/test/index.js
diff --git a/packages/selector/src/index.mjs b/packages/selector/src/index.js
similarity index 100%
rename from packages/selector/src/index.mjs
rename to packages/selector/src/index.js
diff --git a/packages/text/src/index.mjs b/packages/text/src/index.js
similarity index 100%
rename from packages/text/src/index.mjs
rename to packages/text/src/index.js
diff --git a/test/data-model.mjs b/test/data-model.js
similarity index 100%
rename from test/data-model.mjs
rename to test/data-model.js
diff --git a/webpack.config.js b/webpack.config.js
index 638fc1e..ba72459 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,7 +24,7 @@ module.exports = {
demo: './demo/index.js',
test: [
'chai/register-assert',
- 'mocha-loader!multi-entry-loader?include=./packages/*/test/**/*.mjs!',
+ 'mocha-loader!multi-entry-loader?include=./packages/*/test/**/*.js!',
],
},
devtool: 'inline-source-map',
@@ -32,7 +32,7 @@ module.exports = {
module: {
rules: [
{
- test: /\.m?js$/,
+ test: /\.js$/,
exclude: /node_modules/,
use: 'babel-loader',
},
[incubator-annotator] 02/02: Upgrade browserslist and caniuse-lite
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 dee4d4fb28505306a0e060735eb5c21901d9c594
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 02:40:16 2019 -0700
Upgrade browserslist and caniuse-lite
---
yarn.lock | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index 9510ed6..b9fbd04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2140,16 +2140,7 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@^4.5.1:
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.3.tgz#969495c410314bc89f14e748505e58be968080f1"
- integrity sha512-Tx/Jtrmh6vFg24AelzLwCaCq1IUJiMDM1x/LPzqbmbktF8Zo7F9ONUpOWsFK6TtdON95mSMaQUWqi0ilc8xM6g==
- dependencies:
- caniuse-lite "^1.0.30000955"
- electron-to-chromium "^1.3.122"
- node-releases "^1.1.12"
-
-browserslist@^4.5.2:
+browserslist@^4.5.1, browserslist@^4.5.2:
version "4.5.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"
integrity sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==
@@ -2318,11 +2309,6 @@ camelcase@^5.2.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-caniuse-lite@^1.0.30000955:
- version "1.0.30000955"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz#360fdb9a1e41d6dd996130411334e44a39e4446d"
- integrity sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==
-
caniuse-lite@^1.0.30000963:
version "1.0.30000967"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"
@@ -3259,11 +3245,6 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-electron-to-chromium@^1.3.122:
- version "1.3.122"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz#b32a0805f48557bd3c3b8104eadc7fa511b14a9a"
- integrity sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==
-
electron-to-chromium@^1.3.127:
version "1.3.133"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz#c47639c19b91feee3e22fad69f5556142007008c"
@@ -6171,13 +6152,6 @@ node-pre-gyp@^0.12.0:
semver "^5.3.0"
tar "^4"
-node-releases@^1.1.12:
- version "1.1.12"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.12.tgz#1d6baf544316b5422fcd35efe18708370a4e7637"
- integrity sha512-Y+AQ1xdjcgaEzpL65PBEF3fnl1FNKnDh9Zm+AUQLIlyyqtSc4u93jyMN4zrjMzdwKQ10RTr3tgY1x7qpsfF/xg==
- dependencies:
- semver "^5.3.0"
-
node-releases@^1.1.17:
version "1.1.18"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.18.tgz#cc98fd75598a324a77188ebddf6650e9cbd8b1d5"