From 817b5dc94bdbe800102afe32160db3815ee0a319 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 29 Apr 2019 10:33:24 +0100 Subject: [PATCH 01/12] package.json from @daisy/ace-config used as authoritative source of truth for global Ace version, used in CLI(s) (meow), verbose logger (winston), and JSON/HTML report. --- packages/ace-cli/package.json | 1 + packages/ace-cli/src/index.js | 12 +++++++++--- packages/ace-config/package.json | 2 +- packages/ace-core/package.json | 1 + packages/ace-core/src/core/ace.js | 2 +- packages/ace-http/package.json | 1 + packages/ace-http/src/index.js | 13 ++++++++++--- packages/ace-report/package.json | 1 + packages/ace-report/src/report-builders.js | 2 +- packages/ace-report/src/report-builders.test.js | 2 +- tests/__tests__/cli.test.js | 3 +-- 11 files changed, 28 insertions(+), 12 deletions(-) diff --git a/packages/ace-cli/package.json b/packages/ace-cli/package.json index e7ed9773..5cf181ec 100644 --- a/packages/ace-cli/package.json +++ b/packages/ace-cli/package.json @@ -18,6 +18,7 @@ "main": "lib/index.js", "bin": "bin/ace.js", "dependencies": { + "@daisy/ace-config": "^1.0.3", "@daisy/ace-core": "^1.0.2", "@daisy/ace-logger": "^1.0.1", "meow": "^3.7.0", diff --git a/packages/ace-cli/src/index.js b/packages/ace-cli/src/index.js index c5e4dc4a..755bc99c 100755 --- a/packages/ace-cli/src/index.js +++ b/packages/ace-cli/src/index.js @@ -12,8 +12,11 @@ const { config, paths } = require('@daisy/ace-config'); const defaults = require('./defaults'); const cliConfig = config.get('cli', defaults.cli); +const pkg = require('@daisy/ace-config/package'); -const cli = meow(` +const cli = meow({ + help: +` Usage: ace [options] Options: @@ -31,7 +34,10 @@ const cli = meow(` Examples $ ace -o out ~/Documents/book.epub -`, { +`, +// autoVersion: false, +version: pkg.version +}, { alias: { f: 'force', h: 'help', @@ -42,7 +48,7 @@ const cli = meow(` V: 'verbose', }, boolean: ['force', 'verbose', 'silent', 'subdir'], - string: ['outdir', 'tempdir'], + string: ['outdir', 'tempdir'] }); function sleep(ms) { diff --git a/packages/ace-config/package.json b/packages/ace-config/package.json index e8262552..a3db4f82 100644 --- a/packages/ace-config/package.json +++ b/packages/ace-config/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-config", - "version": "1.0.0", + "version": "1.0.3", "description": "Config utilities for Ace", "author": { "name": "DAISY developers", diff --git a/packages/ace-core/package.json b/packages/ace-core/package.json index 4d29edb8..8fbfb393 100644 --- a/packages/ace-core/package.json +++ b/packages/ace-core/package.json @@ -17,6 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { + "@daisy/ace-config": "^1.0.3", "@daisy/ace-report": "^1.0.1", "@daisy/ace-report-axe": "^1.0.1", "@daisy/epub-utils": "^1.0.2", diff --git a/packages/ace-core/src/core/ace.js b/packages/ace-core/src/core/ace.js index 2db55636..badb0170 100644 --- a/packages/ace-core/src/core/ace.js +++ b/packages/ace-core/src/core/ace.js @@ -5,7 +5,7 @@ const path = require('path'); const tmp = require('tmp'); const winston = require('winston'); const os = require('os'); -const pkg = require('../../package'); +const pkg = require('@daisy/ace-config/package'); const EPUB = require('@daisy/epub-utils').EPUB; const Report = require('@daisy/ace-report').Report; diff --git a/packages/ace-http/package.json b/packages/ace-http/package.json index 2280be02..c03f730a 100644 --- a/packages/ace-http/package.json +++ b/packages/ace-http/package.json @@ -18,6 +18,7 @@ "main": "lib/index.js", "bin": "bin/ace-http.js", "dependencies": { + "@daisy/ace-config": "^1.0.3", "express": "^4.15.5", "express-easy-zip": "^1.1.4", "meow": "^3.7.0", diff --git a/packages/ace-http/src/index.js b/packages/ace-http/src/index.js index d174eb2d..35197f9f 100644 --- a/packages/ace-http/src/index.js +++ b/packages/ace-http/src/index.js @@ -12,6 +12,8 @@ const meow = require('meow'); const ace = require('@daisy/ace-core'); const logger = require('@daisy/ace-logger'); +const pkg = require('@daisy/ace-config/package'); + const UPLOADS = tmp.dirSync({ unsafeCleanup: true }).name; const DEFAULTPORT = 8000; const DEFAULTHOST = "localhost"; @@ -21,7 +23,9 @@ var upload = multer({dest: UPLOADS}); var joblist = []; var baseurl = ""; -const cli = meow(` +const cli = meow({ + help: +` Usage: ace-http [options] Options: @@ -37,7 +41,10 @@ const cli = meow(` Examples $ ace-http -p 3000 -`, { +`, +// autoVersion: false, +version: pkg.version +}, { alias: { h: 'help', s: 'silent', @@ -47,7 +54,7 @@ const cli = meow(` p: 'port' }, boolean: ['verbose', 'silent'], - string: ['host', 'port'], + string: ['host', 'port'] }); function run() { diff --git a/packages/ace-report/package.json b/packages/ace-report/package.json index 17d5f829..3b68eb06 100644 --- a/packages/ace-report/package.json +++ b/packages/ace-report/package.json @@ -17,6 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { + "@daisy/ace-config": "^1.0.3", "escape-html": "^1.0.3", "fs-extra": "^6.0.1", "handlebars": "^4.0.11", diff --git a/packages/ace-report/src/report-builders.js b/packages/ace-report/src/report-builders.js index ce74fe80..42913a18 100644 --- a/packages/ace-report/src/report-builders.js +++ b/packages/ace-report/src/report-builders.js @@ -3,7 +3,7 @@ 'use strict'; -const pkg = require('../package'); +const pkg = require('@daisy/ace-config/package'); const { config, paths } = require('@daisy/ace-config'); const defaults = require('./defaults'); diff --git a/packages/ace-report/src/report-builders.test.js b/packages/ace-report/src/report-builders.test.js index 88b817cc..aa0a1ed8 100644 --- a/packages/ace-report/src/report-builders.test.js +++ b/packages/ace-report/src/report-builders.test.js @@ -1,7 +1,7 @@ 'use strict'; const builders = require('./report-builders'); -const pkg = require('../package'); +const pkg = require('@daisy/ace-config/package'); describe('report builder', () => { let report; diff --git a/tests/__tests__/cli.test.js b/tests/__tests__/cli.test.js index 916569d5..8452c94c 100644 --- a/tests/__tests__/cli.test.js +++ b/tests/__tests__/cli.test.js @@ -4,8 +4,7 @@ const path = require('path'); const stripAnsi = require('strip-ansi'); const ace = require('../runAceCLI'); -const pkg = require('../../packages/ace-core/package'); - +const pkg = require('@daisy/ace-config/package'); describe('Running the CLI', () => { test('with no input should fail', () => { From fe6c77bd3e94bbc0b58b4f330d1ce0f01674f40f Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 29 Apr 2019 11:07:54 +0100 Subject: [PATCH 02/12] version bump in docs too (changelog, website) --- CHANGELOG.md | 10 ++++++++++ website/config.toml | 2 +- website/content/_index.md | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c89372cf..b0fbe147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [1.0.3](https://github.com/daisy/ace/compare/v1.0.2...v1.0.3) (2019-05-01) + + +### Bug Fixes + +* Version now reported correctly across the board, see https://github.com/daisy/ace/pull/226 + + + ## [1.0.2](https://github.com/daisy/ace/compare/v1.0.1...v1.0.2) (2018-05-25) diff --git a/website/config.toml b/website/config.toml index b1c42a6c..04de9008 100644 --- a/website/config.toml +++ b/website/config.toml @@ -8,4 +8,4 @@ publishDir = "site" [params] description = "**[Ace](/ace)**, an accessibility checker for EPUB! \n\ A **[DAISY Consortium](http://daisy.org)** project. \n\ - Latest version: v1.0.2" + Latest version: v1.0.3" diff --git a/website/content/_index.md b/website/content/_index.md index 1acc8211..6e13f4fb 100644 --- a/website/content/_index.md +++ b/website/content/_index.md @@ -6,6 +6,6 @@ Ace, the Accessibility Checker for EPUB, is a tool developed by the [DAISY Conso Read more about the Ace project on [Inclusive Publishing](http://inclusivepublishing.org/ace). -Latest version: v1.0.2. +Latest version: v1.0.3. Note: We’re working on a simple GUI with an installer, to allow using Ace without having to deal with package managers and command line tools… stay tuned! From bd75c96840febfcaa4d48d925b6725a66b459e2e Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 29 Apr 2019 11:08:35 +0100 Subject: [PATCH 03/12] commented-out Travis Snyk integration, breaks build right now (we can see Snyk warnings in PRs anyway) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cea3d6f5..572043c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.2.1 - export PATH="$HOME/.yarn/bin:$PATH" script: - - yarn snyk test +# - yarn snyk test - xvfb-run yarn test --runInBand branches: only: From c54ef03204c9564c8ea9890e696db6f8ba9de7c5 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 29 Apr 2019 16:54:06 +0100 Subject: [PATCH 04/12] CHANGELOG is auto-updated, reverting change (see https://github.com/daisy/ace/pull/226#discussion_r279326519 ) --- CHANGELOG.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0fbe147..c89372cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,3 @@ - -## [1.0.3](https://github.com/daisy/ace/compare/v1.0.2...v1.0.3) (2019-05-01) - - -### Bug Fixes - -* Version now reported correctly across the board, see https://github.com/daisy/ace/pull/226 - - - ## [1.0.2](https://github.com/daisy/ace/compare/v1.0.1...v1.0.2) (2018-05-25) From 34936f751ec56a16fc2ef925f682f191c7d390e1 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 29 Apr 2019 16:59:54 +0100 Subject: [PATCH 05/12] version bumps where needed (see https://github.com/daisy/ace/pull/226#discussion_r279327097 and https://github.com/daisy/ace/pull/226#discussion_r279327736 ) --- packages/ace-cli/package.json | 2 +- packages/ace-core/package.json | 2 +- packages/ace-http/package.json | 2 +- packages/ace-report/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ace-cli/package.json b/packages/ace-cli/package.json index 5cf181ec..5c0bb315 100644 --- a/packages/ace-cli/package.json +++ b/packages/ace-cli/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-cli", - "version": "1.0.2", + "version": "1.0.3", "description": "Ace by DAISY, an Accessibility Checker for EPUB", "author": { "name": "DAISY developers", diff --git a/packages/ace-core/package.json b/packages/ace-core/package.json index 8fbfb393..bc097412 100644 --- a/packages/ace-core/package.json +++ b/packages/ace-core/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-core", - "version": "1.0.2", + "version": "1.0.3", "description": "Core library for Ace", "author": { "name": "DAISY developers", diff --git a/packages/ace-http/package.json b/packages/ace-http/package.json index c03f730a..b0638e68 100644 --- a/packages/ace-http/package.json +++ b/packages/ace-http/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-http", - "version": "1.0.0", + "version": "1.0.1", "description": "HTTP API for Ace", "author": { "name": "DAISY developers", diff --git a/packages/ace-report/package.json b/packages/ace-report/package.json index 3b68eb06..33edcf8c 100644 --- a/packages/ace-report/package.json +++ b/packages/ace-report/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-report", - "version": "1.0.1", + "version": "1.0.2", "description": "Reporting utilities for Ace", "author": { "name": "DAISY developers", From 1413f464790c75baf79e50f56cc754d0e55be819 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 29 Apr 2019 17:02:29 +0100 Subject: [PATCH 06/12] reverting website version bumps (see https://github.com/daisy/ace/pull/226#discussion_r279327905 ) --- website/config.toml | 2 +- website/content/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/config.toml b/website/config.toml index 04de9008..b1c42a6c 100644 --- a/website/config.toml +++ b/website/config.toml @@ -8,4 +8,4 @@ publishDir = "site" [params] description = "**[Ace](/ace)**, an accessibility checker for EPUB! \n\ A **[DAISY Consortium](http://daisy.org)** project. \n\ - Latest version: v1.0.3" + Latest version: v1.0.2" diff --git a/website/content/_index.md b/website/content/_index.md index 6e13f4fb..1acc8211 100644 --- a/website/content/_index.md +++ b/website/content/_index.md @@ -6,6 +6,6 @@ Ace, the Accessibility Checker for EPUB, is a tool developed by the [DAISY Conso Read more about the Ace project on [Inclusive Publishing](http://inclusivepublishing.org/ace). -Latest version: v1.0.3. +Latest version: v1.0.2. Note: We’re working on a simple GUI with an installer, to allow using Ace without having to deal with package managers and command line tools… stay tuned! From aa34e4e3f59a15da0daa37535e75a006207758a9 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 29 Apr 2019 17:46:54 +0100 Subject: [PATCH 07/12] added missing NPM deps in package.json (easily missed due to Yarn-driven monorepo with single root node_modules containing flat deps packages, and single root yarn.lock ... package-lock.json would possibly catch these discrepancies in each of the monorepo's individual packages? ... depends on the build process, really) --- packages/ace-http/package.json | 2 ++ packages/ace-report-axe/package.json | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/ace-http/package.json b/packages/ace-http/package.json index b0638e68..7d0e0973 100644 --- a/packages/ace-http/package.json +++ b/packages/ace-http/package.json @@ -19,6 +19,8 @@ "bin": "bin/ace-http.js", "dependencies": { "@daisy/ace-config": "^1.0.3", + "@daisy/ace-core": "^1.0.2", + "@daisy/ace-logger": "^1.0.1", "express": "^4.15.5", "express-easy-zip": "^1.1.4", "meow": "^3.7.0", diff --git a/packages/ace-report-axe/package.json b/packages/ace-report-axe/package.json index 8e332b57..67f2c5f9 100644 --- a/packages/ace-report-axe/package.json +++ b/packages/ace-report-axe/package.json @@ -17,6 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { + "@daisy/ace-report": "^1.0.1", "fs-extra": "^6.0.1", "winston": "^2.4.0" }, From 4c39e681391298b56aae2a6022362ad628fadef3 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Tue, 30 Apr 2019 09:27:40 +0100 Subject: [PATCH 08/12] using new ace-meta package as authoritative source of truth for global Ace version --- packages/ace-cli/package.json | 1 + packages/ace-cli/src/index.js | 2 +- packages/ace-config/package.json | 2 +- packages/ace-core/package.json | 2 +- packages/ace-core/src/core/ace.js | 2 +- packages/ace-http/package.json | 2 +- packages/ace-http/src/index.js | 2 +- packages/ace-meta/package.json | 21 +++++++++++++++++++ packages/ace-report/package.json | 1 + packages/ace-report/src/report-builders.js | 2 +- .../ace-report/src/report-builders.test.js | 2 +- tests/__tests__/cli.test.js | 2 +- 12 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 packages/ace-meta/package.json diff --git a/packages/ace-cli/package.json b/packages/ace-cli/package.json index 5c0bb315..329956a8 100644 --- a/packages/ace-cli/package.json +++ b/packages/ace-cli/package.json @@ -21,6 +21,7 @@ "@daisy/ace-config": "^1.0.3", "@daisy/ace-core": "^1.0.2", "@daisy/ace-logger": "^1.0.1", + "@daisy/ace-meta": "^1.0.3", "meow": "^3.7.0", "winston": "^2.4.0" }, diff --git a/packages/ace-cli/src/index.js b/packages/ace-cli/src/index.js index 755bc99c..21fbd1a1 100755 --- a/packages/ace-cli/src/index.js +++ b/packages/ace-cli/src/index.js @@ -12,7 +12,7 @@ const { config, paths } = require('@daisy/ace-config'); const defaults = require('./defaults'); const cliConfig = config.get('cli', defaults.cli); -const pkg = require('@daisy/ace-config/package'); +const pkg = require('@daisy/ace-meta/package'); const cli = meow({ help: diff --git a/packages/ace-config/package.json b/packages/ace-config/package.json index a3db4f82..8c343dae 100644 --- a/packages/ace-config/package.json +++ b/packages/ace-config/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-config", - "version": "1.0.3", + "version": "1.0.2", "description": "Config utilities for Ace", "author": { "name": "DAISY developers", diff --git a/packages/ace-core/package.json b/packages/ace-core/package.json index bc097412..2b46f55d 100644 --- a/packages/ace-core/package.json +++ b/packages/ace-core/package.json @@ -17,7 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { - "@daisy/ace-config": "^1.0.3", + "@daisy/ace-meta": "^1.0.3", "@daisy/ace-report": "^1.0.1", "@daisy/ace-report-axe": "^1.0.1", "@daisy/epub-utils": "^1.0.2", diff --git a/packages/ace-core/src/core/ace.js b/packages/ace-core/src/core/ace.js index badb0170..c6f1aaf1 100644 --- a/packages/ace-core/src/core/ace.js +++ b/packages/ace-core/src/core/ace.js @@ -5,7 +5,7 @@ const path = require('path'); const tmp = require('tmp'); const winston = require('winston'); const os = require('os'); -const pkg = require('@daisy/ace-config/package'); +const pkg = require('@daisy/ace-meta/package'); const EPUB = require('@daisy/epub-utils').EPUB; const Report = require('@daisy/ace-report').Report; diff --git a/packages/ace-http/package.json b/packages/ace-http/package.json index 7d0e0973..df23b8e0 100644 --- a/packages/ace-http/package.json +++ b/packages/ace-http/package.json @@ -18,9 +18,9 @@ "main": "lib/index.js", "bin": "bin/ace-http.js", "dependencies": { - "@daisy/ace-config": "^1.0.3", "@daisy/ace-core": "^1.0.2", "@daisy/ace-logger": "^1.0.1", + "@daisy/ace-meta": "^1.0.3", "express": "^4.15.5", "express-easy-zip": "^1.1.4", "meow": "^3.7.0", diff --git a/packages/ace-http/src/index.js b/packages/ace-http/src/index.js index 35197f9f..d9013ca6 100644 --- a/packages/ace-http/src/index.js +++ b/packages/ace-http/src/index.js @@ -12,7 +12,7 @@ const meow = require('meow'); const ace = require('@daisy/ace-core'); const logger = require('@daisy/ace-logger'); -const pkg = require('@daisy/ace-config/package'); +const pkg = require('@daisy/ace-meta/package'); const UPLOADS = tmp.dirSync({ unsafeCleanup: true }).name; const DEFAULTPORT = 8000; diff --git a/packages/ace-meta/package.json b/packages/ace-meta/package.json new file mode 100644 index 00000000..0034c4e3 --- /dev/null +++ b/packages/ace-meta/package.json @@ -0,0 +1,21 @@ +{ + "name": "@daisy/ace-meta", + "version": "1.0.3", + "description": "Meta version information for Ace", + "author": { + "name": "DAISY developers", + "organization": "DAISY Consortium", + "url": "http://www.daisy.org/" + }, + "repository": { + "type": "git", + "url": "https://github.com/daisy/ace" + }, + "bugs": { + "url": "https://github.com/daisy/ace/issues" + }, + "license": "MIT", + "publishConfig": { + "access": "public" + } +} diff --git a/packages/ace-report/package.json b/packages/ace-report/package.json index 33edcf8c..84493f6d 100644 --- a/packages/ace-report/package.json +++ b/packages/ace-report/package.json @@ -18,6 +18,7 @@ "main": "lib/index.js", "dependencies": { "@daisy/ace-config": "^1.0.3", + "@daisy/ace-meta": "^1.0.3", "escape-html": "^1.0.3", "fs-extra": "^6.0.1", "handlebars": "^4.0.11", diff --git a/packages/ace-report/src/report-builders.js b/packages/ace-report/src/report-builders.js index 42913a18..f532dfe8 100644 --- a/packages/ace-report/src/report-builders.js +++ b/packages/ace-report/src/report-builders.js @@ -3,7 +3,7 @@ 'use strict'; -const pkg = require('@daisy/ace-config/package'); +const pkg = require('@daisy/ace-meta/package'); const { config, paths } = require('@daisy/ace-config'); const defaults = require('./defaults'); diff --git a/packages/ace-report/src/report-builders.test.js b/packages/ace-report/src/report-builders.test.js index aa0a1ed8..418fd52c 100644 --- a/packages/ace-report/src/report-builders.test.js +++ b/packages/ace-report/src/report-builders.test.js @@ -1,7 +1,7 @@ 'use strict'; const builders = require('./report-builders'); -const pkg = require('@daisy/ace-config/package'); +const pkg = require('@daisy/ace-meta/package'); describe('report builder', () => { let report; diff --git a/tests/__tests__/cli.test.js b/tests/__tests__/cli.test.js index 8452c94c..d2f1e811 100644 --- a/tests/__tests__/cli.test.js +++ b/tests/__tests__/cli.test.js @@ -4,7 +4,7 @@ const path = require('path'); const stripAnsi = require('strip-ansi'); const ace = require('../runAceCLI'); -const pkg = require('@daisy/ace-config/package'); +const pkg = require('@daisy/ace-meta/package'); describe('Running the CLI', () => { test('with no input should fail', () => { From 183b27d9ca08ae1d36fbd89807cc14cbebda44a4 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Tue, 30 Apr 2019 09:30:35 +0100 Subject: [PATCH 09/12] fixed version mismatch --- packages/ace-cli/package.json | 2 +- packages/ace-logger/package.json | 2 +- packages/ace-report/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ace-cli/package.json b/packages/ace-cli/package.json index 329956a8..bf11f5da 100644 --- a/packages/ace-cli/package.json +++ b/packages/ace-cli/package.json @@ -18,7 +18,7 @@ "main": "lib/index.js", "bin": "bin/ace.js", "dependencies": { - "@daisy/ace-config": "^1.0.3", + "@daisy/ace-config": "^1.0.2", "@daisy/ace-core": "^1.0.2", "@daisy/ace-logger": "^1.0.1", "@daisy/ace-meta": "^1.0.3", diff --git a/packages/ace-logger/package.json b/packages/ace-logger/package.json index e3065b37..14ab8cdd 100644 --- a/packages/ace-logger/package.json +++ b/packages/ace-logger/package.json @@ -17,7 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { - "@daisy/ace-config": "^1.0.0", + "@daisy/ace-config": "^1.0.2", "fs-extra": "^6.0.1", "winston": "^2.4.0" }, diff --git a/packages/ace-report/package.json b/packages/ace-report/package.json index 84493f6d..c782cb31 100644 --- a/packages/ace-report/package.json +++ b/packages/ace-report/package.json @@ -17,7 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { - "@daisy/ace-config": "^1.0.3", + "@daisy/ace-config": "^1.0.2", "@daisy/ace-meta": "^1.0.3", "escape-html": "^1.0.3", "fs-extra": "^6.0.1", From 1277148e140d3f9e48ee7b7f30fd4aa6a3ac1f9d Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Tue, 30 Apr 2019 09:35:59 +0100 Subject: [PATCH 10/12] revert ace-config to v1.0.0 --- packages/ace-cli/package.json | 2 +- packages/ace-config/package.json | 2 +- packages/ace-logger/package.json | 2 +- packages/ace-report/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ace-cli/package.json b/packages/ace-cli/package.json index bf11f5da..8c8d22c8 100644 --- a/packages/ace-cli/package.json +++ b/packages/ace-cli/package.json @@ -18,7 +18,7 @@ "main": "lib/index.js", "bin": "bin/ace.js", "dependencies": { - "@daisy/ace-config": "^1.0.2", + "@daisy/ace-config": "^1.0.0", "@daisy/ace-core": "^1.0.2", "@daisy/ace-logger": "^1.0.1", "@daisy/ace-meta": "^1.0.3", diff --git a/packages/ace-config/package.json b/packages/ace-config/package.json index 8c343dae..e8262552 100644 --- a/packages/ace-config/package.json +++ b/packages/ace-config/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-config", - "version": "1.0.2", + "version": "1.0.0", "description": "Config utilities for Ace", "author": { "name": "DAISY developers", diff --git a/packages/ace-logger/package.json b/packages/ace-logger/package.json index 14ab8cdd..e3065b37 100644 --- a/packages/ace-logger/package.json +++ b/packages/ace-logger/package.json @@ -17,7 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { - "@daisy/ace-config": "^1.0.2", + "@daisy/ace-config": "^1.0.0", "fs-extra": "^6.0.1", "winston": "^2.4.0" }, diff --git a/packages/ace-report/package.json b/packages/ace-report/package.json index c782cb31..7701e098 100644 --- a/packages/ace-report/package.json +++ b/packages/ace-report/package.json @@ -17,7 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { - "@daisy/ace-config": "^1.0.2", + "@daisy/ace-config": "^1.0.0", "@daisy/ace-meta": "^1.0.3", "escape-html": "^1.0.3", "fs-extra": "^6.0.1", From becdfef5ab6902b3efbaa33d98fb31295779fe42 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Tue, 30 Apr 2019 09:38:41 +0100 Subject: [PATCH 11/12] removed unnecessary code change (simplifies diff) --- packages/ace-cli/src/index.js | 2 +- packages/ace-http/src/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ace-cli/src/index.js b/packages/ace-cli/src/index.js index 21fbd1a1..3a739f7c 100755 --- a/packages/ace-cli/src/index.js +++ b/packages/ace-cli/src/index.js @@ -48,7 +48,7 @@ version: pkg.version V: 'verbose', }, boolean: ['force', 'verbose', 'silent', 'subdir'], - string: ['outdir', 'tempdir'] + string: ['outdir', 'tempdir'], }); function sleep(ms) { diff --git a/packages/ace-http/src/index.js b/packages/ace-http/src/index.js index d9013ca6..6631c64a 100644 --- a/packages/ace-http/src/index.js +++ b/packages/ace-http/src/index.js @@ -54,7 +54,7 @@ version: pkg.version p: 'port' }, boolean: ['verbose', 'silent'], - string: ['host', 'port'] + string: ['host', 'port'], }); function run() { From 264d3c043cf67566dbf1cda10c3cbe98b49ca0a3 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Tue, 30 Apr 2019 09:39:48 +0100 Subject: [PATCH 12/12] version bump for ace-report-axe (had incorrect package deps, now fixed) --- packages/ace-report-axe/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ace-report-axe/package.json b/packages/ace-report-axe/package.json index 67f2c5f9..fb19328c 100644 --- a/packages/ace-report-axe/package.json +++ b/packages/ace-report-axe/package.json @@ -1,6 +1,6 @@ { "name": "@daisy/ace-report-axe", - "version": "1.0.1", + "version": "1.0.2", "description": "Ace report adapter for aXe", "author": { "name": "DAISY developers",