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:16 UTC
[incubator-annotator] 01/02: Migrate .mjs to .js
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',
},