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: diff --git a/packages/ace-cli/package.json b/packages/ace-cli/package.json index e7ed9773..8c8d22c8 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", @@ -18,8 +18,10 @@ "main": "lib/index.js", "bin": "bin/ace.js", "dependencies": { + "@daisy/ace-config": "^1.0.0", "@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 c5e4dc4a..3a739f7c 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-meta/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', diff --git a/packages/ace-core/package.json b/packages/ace-core/package.json index 4d29edb8..2b46f55d 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", @@ -17,6 +17,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { + "@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 2db55636..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('../../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 2280be02..df23b8e0 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", @@ -18,6 +18,9 @@ "main": "lib/index.js", "bin": "bin/ace-http.js", "dependencies": { + "@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 d174eb2d..6631c64a 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-meta/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', 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-axe/package.json b/packages/ace-report-axe/package.json index 8e332b57..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", @@ -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" }, diff --git a/packages/ace-report/package.json b/packages/ace-report/package.json index 17d5f829..7701e098 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", @@ -17,6 +17,8 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { + "@daisy/ace-config": "^1.0.0", + "@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 ce74fe80..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('../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 88b817cc..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('../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 916569d5..d2f1e811 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-meta/package'); describe('Running the CLI', () => { test('with no input should fail', () => {