Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
@msimmer
msimmer committed Jan 8, 2020
2 parents 868ef3f + 9be8873 commit 622f50d
Show file tree
Hide file tree
Showing 66 changed files with 169 additions and 167 deletions.
3 changes: 2 additions & 1 deletion .prettierignore
View file
Expand Up @@ -4,7 +4,8 @@
**/demo/**
**/demos/**
packages/b-ber-lib/*.js
packages/b-ber-reader/epub/**/*.js
packages/b-ber-reader/epub/
packages/b-ber-reader/public/
packages/b-ber-resources/index.js
packages/b-ber-shapes-dublin-core/elements.js
packages/b-ber-shapes-dublin-core/terms.js
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Expand Up @@ -2,7 +2,7 @@
"lerna": "3.15.0",
"packages": ["packages/*"],
"npmClient": "npm",
"version": "1.0.11",
"version": "1.0.15",
"command": {
"publish": {
"message": "%v"
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Expand Up @@ -21,6 +21,7 @@
"jest": "jest",
"test:coverage": "rimraf ./coverage && jest --collectCoverage=true",
"test": "npm run check && jest",
"prepare": "npm run build",
"postpublish": "node scripts/run-ci.js",
"publish:canary": "lerna publish --canary --force-publish=*",
"publish:latest": "lerna publish --dist-tag latest",
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-cli/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions packages/b-ber-cli/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-cli",
"version": "1.0.11",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"bin": {
Expand All @@ -22,11 +22,11 @@
},
"dependencies": {
"@babel/runtime": "^7.5.4",
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-shapes-sequences": "1.0.10",
"@canopycanopycanopy/b-ber-tasks": "1.0.11",
"@canopycanopycanopy/b-ber-templates": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-shapes-sequences": "1.0.15",
"@canopycanopycanopy/b-ber-tasks": "1.0.15",
"@canopycanopycanopy/b-ber-templates": "1.0.15",
"fs-extra": "^8.1.0",
"lodash.has": "latest",
"yargs": "^13.3.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-attributes/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/b-ber-grammar-attributes/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-attributes",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -17,9 +17,9 @@
"access": "public"
},
"dependencies": {
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.15",
"lodash.has": "latest"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-dialogue/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/b-ber-grammar-dialogue/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-dialogue",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,9 +22,9 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.10",
"@canopycanopycanopy/b-ber-grammar-renderer": "1.0.10",
"@canopycanopycanopy/b-ber-parser-dialogue": "1.0.10"
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.15",
"@canopycanopycanopy/b-ber-grammar-renderer": "1.0.15",
"@canopycanopycanopy/b-ber-parser-dialogue": "1.0.15"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-epigraph/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/b-ber-grammar-epigraph/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-epigraph",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,8 +22,8 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.10"
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.15"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-footnotes/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/b-ber-grammar-footnotes/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-footnotes",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,7 +22,7 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"lodash.find": "latest"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-frontmatter/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/b-ber-grammar-frontmatter/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-frontmatter",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,7 +22,7 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-lib": "1.0.10"
"@canopycanopycanopy/b-ber-lib": "1.0.15"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-gallery/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/b-ber-grammar-gallery/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-gallery",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,10 +22,10 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.10",
"@canopycanopycanopy/b-ber-grammar-renderer": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-parser-gallery": "1.0.10"
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.15",
"@canopycanopycanopy/b-ber-grammar-renderer": "1.0.15",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-parser-gallery": "1.0.15"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-image/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions packages/b-ber-grammar-image/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-image",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,12 +22,12 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.10",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.10",
"@canopycanopycanopy/b-ber-templates": "1.0.10",
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.15",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.15",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.15",
"@canopycanopycanopy/b-ber-templates": "1.0.15",
"fs-extra": "^8.1.0",
"image-size": "^0.7.4",
"mime-types": "^2.1.24"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-logo/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions packages/b-ber-grammar-logo/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-logo",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,11 +22,11 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.10",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.10",
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.15",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.15",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.15",
"fs-extra": "^8.1.0"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-media/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions packages/b-ber-grammar-media/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-media",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,11 +22,11 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.10",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.10",
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.15",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-parser-figure": "1.0.15",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.15",
"fs-extra": "^8.1.0",
"lodash.has": "latest",
"mime-types": "^2.1.24"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-pullquote/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions packages/b-ber-grammar-pullquote/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-pullquote",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,11 +22,11 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.10",
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-parser-section": "1.0.10",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.10",
"@canopycanopycanopy/b-ber-grammar-attributes": "1.0.15",
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-parser-section": "1.0.15",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.15",
"lodash.has": "latest"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-renderer/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/b-ber-grammar-renderer/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@canopycanopycanopy/b-ber-grammar-renderer",
"version": "1.0.10",
"version": "1.0.15",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand All @@ -22,9 +22,9 @@
"rimraf": "^2.6.3"
},
"dependencies": {
"@canopycanopycanopy/b-ber-lib": "1.0.10",
"@canopycanopycanopy/b-ber-logger": "1.0.10",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.10"
"@canopycanopycanopy/b-ber-lib": "1.0.15",
"@canopycanopycanopy/b-ber-logger": "1.0.15",
"@canopycanopycanopy/b-ber-shapes-directives": "1.0.15"
},
"files": [
"dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/b-ber-grammar-section/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 622f50d

Please sign in to comment.