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:32:04 UTC
[incubator-annotator] branch master updated (6e65da1 -> ba85d68)
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 6e65da1 Upgrade validator dependencies
new 0f56693 Disable @babel/preset-env polyfills
new a68a67f Actually produce both builds
new 450fcbe Sort package.json keys
new ba85d68 Add a module field to package.json files
The 4 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:
babel.config.js | 16 ++--------------
package.json | 27 ++++++++++++++-------------
packages/dom/package.json | 13 +++++++------
packages/fragment-identifier/package.json | 13 +++++++------
packages/range/package.json | 13 +++++++------
packages/selector/package.json | 13 +++++++------
packages/text/package.json | 12 ++++++------
7 files changed, 50 insertions(+), 57 deletions(-)
[incubator-annotator] 03/04: Sort package.json keys
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 450fcbe632346acb49368a72ea771010750c40bd
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 03:30:03 2019 -0700
Sort package.json keys
---
package.json | 24 ++++++++++++------------
packages/dom/package.json | 12 ++++++------
packages/fragment-identifier/package.json | 12 ++++++------
packages/range/package.json | 12 ++++++------
packages/selector/package.json | 12 ++++++------
packages/text/package.json | 12 ++++++------
6 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/package.json b/package.json
index f8bdd1a..08d1917 100644
--- a/package.json
+++ b/package.json
@@ -3,12 +3,17 @@
"private": true,
"description": "Apache Annotator provides annotation enabling code for browsers, servers, and humans.",
"homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
"repository": {
"type": "git",
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
+ "license": "Apache-2.0",
+ "author": "Apache Software Foundation",
+ "workspaces": {
+ "packages": [
+ "packages/*"
+ ]
+ },
"scripts": {
"build": "yarn run build:cjs && yarn run build:esm",
"build:babel": "lerna exec --parallel -- babel --root-mode upward",
@@ -21,6 +26,11 @@
"test": "cross-env BABEL_ENV=test nyc mocha packages/*/test/**/*.js",
"validate": "cross-env BABEL_ENV=test nyc mocha test/**/*.js"
},
+ "husky": {
+ "hooks": {
+ "pre-commit": "lint-staged"
+ }
+ },
"devDependencies": {
"@babel/cli": "^7.4.0",
"@babel/core": "^7.4.0",
@@ -63,15 +73,5 @@
"engines": {
"node": ">=8.0.0",
"yarn": "^1.5.0"
- },
- "husky": {
- "hooks": {
- "pre-commit": "lint-staged"
- }
- },
- "workspaces": {
- "packages": [
- "packages/*"
- ]
}
}
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 84a74b7..6f8ee32 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -3,22 +3,22 @@
"version": "0.0.0",
"description": "Utilities for annotation of the Document Object Model.",
"homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
- "main": "lib",
"repository": {
"type": "git",
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
+ "license": "Apache-2.0",
+ "author": "Apache Software Foundation",
+ "main": "lib",
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
"core-js": "3",
"range-normalize": "^1.1.1"
},
- "publishConfig": {
- "access": "public"
- },
"engines": {
"node": ">=6.0.0"
+ },
+ "publishConfig": {
+ "access": "public"
}
}
diff --git a/packages/fragment-identifier/package.json b/packages/fragment-identifier/package.json
index b6a5fe4..5477207 100644
--- a/packages/fragment-identifier/package.json
+++ b/packages/fragment-identifier/package.json
@@ -3,13 +3,13 @@
"version": "0.0.0",
"description": "Convert to and from Web Annotation fragment identifiers.",
"homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
- "main": "lib",
"repository": {
"type": "git",
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
+ "license": "Apache-2.0",
+ "author": "Apache Software Foundation",
+ "main": "lib",
"scripts": {
"prepare": "pegjs --format es --output src/fragment.js src/fragment.pegjs"
},
@@ -20,10 +20,10 @@
"devDependencies": {
"pegjs": "^0.11.0-dev.273"
},
- "publishConfig": {
- "access": "public"
- },
"engines": {
"node": ">=6.0.0"
+ },
+ "publishConfig": {
+ "access": "public"
}
}
diff --git a/packages/range/package.json b/packages/range/package.json
index 3f438a6..923c71b 100644
--- a/packages/range/package.json
+++ b/packages/range/package.json
@@ -3,22 +3,22 @@
"version": "0.0.0",
"description": "Utilities for annotation.",
"homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
- "main": "lib",
"repository": {
"type": "git",
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
+ "license": "Apache-2.0",
+ "author": "Apache Software Foundation",
+ "main": "lib",
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
"cartesian": "^1.0.1",
"core-js": "3"
},
- "publishConfig": {
- "access": "public"
- },
"engines": {
"node": ">=6.0.0"
+ },
+ "publishConfig": {
+ "access": "public"
}
}
diff --git a/packages/selector/package.json b/packages/selector/package.json
index 611d161..c13c977 100644
--- a/packages/selector/package.json
+++ b/packages/selector/package.json
@@ -3,21 +3,21 @@
"version": "0.0.0",
"description": "Web Annotation selector for engine.",
"homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
- "main": "lib",
"repository": {
"type": "git",
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
+ "license": "Apache-2.0",
+ "author": "Apache Software Foundation",
+ "main": "lib",
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
"core-js": "3"
},
- "publishConfig": {
- "access": "public"
- },
"engines": {
"node": ">=6.0.0"
+ },
+ "publishConfig": {
+ "access": "public"
}
}
diff --git a/packages/text/package.json b/packages/text/package.json
index 708288f..dbee114 100644
--- a/packages/text/package.json
+++ b/packages/text/package.json
@@ -3,21 +3,21 @@
"version": "0.0.0",
"description": "Utilities for annotation of plain text documents.",
"homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
- "main": "lib",
"repository": {
"type": "git",
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
+ "license": "Apache-2.0",
+ "author": "Apache Software Foundation",
+ "main": "lib",
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
"core-js": "3"
},
- "publishConfig": {
- "access": "public"
- },
"engines": {
"node": ">=6.0.0"
+ },
+ "publishConfig": {
+ "access": "public"
}
}
[incubator-annotator] 04/04: Add a module field to package.json
files
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 ba85d68feb7ca64630221479ec014d5d709f54de
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 03:31:36 2019 -0700
Add a module field to package.json files
---
packages/dom/package.json | 3 ++-
packages/fragment-identifier/package.json | 3 ++-
packages/range/package.json | 3 ++-
packages/selector/package.json | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 6f8ee32..9c137fa 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -9,7 +9,8 @@
},
"license": "Apache-2.0",
"author": "Apache Software Foundation",
- "main": "lib",
+ "main": "lib/index.js",
+ "module": "esm/index.js",
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
"core-js": "3",
diff --git a/packages/fragment-identifier/package.json b/packages/fragment-identifier/package.json
index 5477207..02e415d 100644
--- a/packages/fragment-identifier/package.json
+++ b/packages/fragment-identifier/package.json
@@ -9,7 +9,8 @@
},
"license": "Apache-2.0",
"author": "Apache Software Foundation",
- "main": "lib",
+ "main": "lib/index.js",
+ "module": "esm/index.js",
"scripts": {
"prepare": "pegjs --format es --output src/fragment.js src/fragment.pegjs"
},
diff --git a/packages/range/package.json b/packages/range/package.json
index 923c71b..60115f5 100644
--- a/packages/range/package.json
+++ b/packages/range/package.json
@@ -9,7 +9,8 @@
},
"license": "Apache-2.0",
"author": "Apache Software Foundation",
- "main": "lib",
+ "main": "lib/index.js",
+ "module": "esm/index.js",
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
"cartesian": "^1.0.1",
diff --git a/packages/selector/package.json b/packages/selector/package.json
index c13c977..e3c8095 100644
--- a/packages/selector/package.json
+++ b/packages/selector/package.json
@@ -9,7 +9,8 @@
},
"license": "Apache-2.0",
"author": "Apache Software Foundation",
- "main": "lib",
+ "main": "lib/index.js",
+ "module": "esm/index.js",
"dependencies": {
"@babel/runtime-corejs3": "^7.4.0",
"core-js": "3"
[incubator-annotator] 01/04: Disable @babel/preset-env polyfills
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 0f56693623e33773c2a0772f9759abaf48c1f355
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 03:24:10 2019 -0700
Disable @babel/preset-env polyfills
Let the @babel/plugin-transform-runtime handle it.
---
babel.config.js | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/babel.config.js b/babel.config.js
index 5c263d6..aed0a9e 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -19,26 +19,14 @@ module.exports = api => {
const TEST = ENV === 'test';
const CJS = ENV === 'cjs';
- // Options for core-js.
- const corejsOptions = {
- // Do not polyfill proposals that have not shipped.
- proposals: false,
- // Use core-js version 3.
- version: 3,
- };
-
// Options for the @babel/env preset.
const envOptions = {
- // Use core-js for runtime polyfills.
- corejs: corejsOptions,
// Transform module syntax if necessary.
modules: CJS ? 'commonjs' : false,
// Enable transformations for shipped proposals.
shippedProposals: true,
// Set target environment to default browsers.
targets: 'defaults',
- // Import polyfills where they are used, without polluting globals.
- useBuiltIns: 'usage',
};
// Options for the module-resolver plugin.
@@ -51,8 +39,8 @@ module.exports = api => {
// Options for the @babel/transform-runtime plugin.
const runtimeOptions = {
- // Use core-js for runtime helpers.
- corejs: corejsOptions,
+ // Use core-js version 3.
+ corejs: 3,
// Use helpers formatted for the target environment.
useESModules: !CJS,
};
[incubator-annotator] 02/04: Actually produce both builds
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 a68a67f2c626479104ff952b1d41403e15dbcc20
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Thu May 9 03:25:45 2019 -0700
Actually produce both builds
---
package.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index e2cb51d..f8bdd1a 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
"scripts": {
- "build": "lerna exec --parallel -- babel --root-mode upward -d lib src",
+ "build": "yarn run build:cjs && yarn run build:esm",
+ "build:babel": "lerna exec --parallel -- babel --root-mode upward",
"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 esm lib",