diff --git a/package.json b/package.json index 900dec1c..4ee8e0c4 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ ], "license": "BSD-3-Clause", "devDependencies": { - "@dhis2/cli-style": "^3.0.0", + "@dhis2/cli-style": "^3.0.1", "husky": "^1.3.1" }, "husky": { diff --git a/packages/app/package.json b/packages/app/package.json index b4e1beeb..f7e27d41 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -12,7 +12,7 @@ "license": "BSD-3-Clause", "private": false, "dependencies": { - "@dhis2/cli-helpers-engine": "^1.0.0" + "@dhis2/cli-helpers-engine": "^1.0.1" }, "publishConfig": { "access": "public" diff --git a/packages/cluster/README.md b/packages/cluster/README.md index feb97559..f7891e8c 100644 --- a/packages/cluster/README.md +++ b/packages/cluster/README.md @@ -37,5 +37,3 @@ Note that any Docker image in [amcgee/dhis2-core](https://cloud.docker.com/u/amc ## Known Issues - The 2.31 patch releases (2.31.0, 2.31.1, etc.) are nested, so they cannot be downloaded automatically. You can download any .sql.gz file manually and specify it with the `--seedFile` option to the `d2 cluster up` command or the `--path` option to the `d2 cluster seed` command. - -- The `d2 cluster seed ` command sometimes exits prematurely after downloading the db archive, run it again _without_ the `--update` option to continue seeding the cluster database from the downloaded file. diff --git a/packages/cluster/package.json b/packages/cluster/package.json index b6650cac..f24f36f4 100644 --- a/packages/cluster/package.json +++ b/packages/cluster/package.json @@ -7,7 +7,7 @@ "author": "Austin McGee ", "license": "BSD-3-Clause", "dependencies": { - "@dhis2/cli-helpers-engine": "^1.0.0", + "@dhis2/cli-helpers-engine": "^1.0.1", "chalk": "^2.4.2" }, "bin": { diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 73bfa3d1..be56908b 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -8,7 +8,7 @@ "license": "BSD-3-Clause", "dependencies": { "@dhis2/cli-create": "^1.0.1", - "@dhis2/cli-helpers-engine": "^1.0.0" + "@dhis2/cli-helpers-engine": "^1.0.1" }, "bin": "./bin/d2-create-app", "publishConfig": { diff --git a/packages/create/package.json b/packages/create/package.json index c62d040f..80746b7e 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -9,7 +9,7 @@ "license": "BSD-3-Clause", "private": false, "dependencies": { - "@dhis2/cli-helpers-engine": "^1.0.0", + "@dhis2/cli-helpers-engine": "^1.0.1", "chalk": "^2.4.2", "fs-extra": "^7.0.1", "handlebars": "^4.1.0", diff --git a/packages/create/src/builders/app.js b/packages/create/src/builders/app.js index 58c0b3c7..14f5540f 100644 --- a/packages/create/src/builders/app.js +++ b/packages/create/src/builders/app.js @@ -5,11 +5,15 @@ const chalk = require('chalk') const buildApp = async ({ name, ...argv }) => { const data = { basename: name || 'myApp' } - reporter.info(`Creating DHIS2 application ${chalk.bold(data.basename)}...`) - // const data = await cliBuilder({ name, ...argv }) + reporter.info( + `Hold your horses! DHIS2 application bootstrapping with ${chalk.bold( + 'd2 create app' + )} is coming soon...` + ) + // reporter.info(`Creating DHIS2 application ${chalk.bold(data.basename)}...`) - const dest = path.join(process.cwd(), data.basename) - await installTemplate('app', dest, data) + // const dest = path.join(process.cwd(), data.basename) + // await installTemplate('app', dest, data) } module.exports = buildApp diff --git a/packages/create/templates/cli/package.json b/packages/create/templates/cli/package.json index f2d914c4..ba6225b7 100644 --- a/packages/create/templates/cli/package.json +++ b/packages/create/templates/cli/package.json @@ -9,7 +9,7 @@ "license": "BSD-3-Clause", "private": false, "dependencies": { - "@dhis2/cli-helpers-engine": "^1.0.0" + "@dhis2/cli-helpers-engine": "^1.0.1" }, "publishConfig": { "access": "public" diff --git a/packages/main/package.json b/packages/main/package.json index 70f6d22b..5dcdb4e4 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -15,8 +15,8 @@ "@dhis2/cli-app": "^1.0.1", "@dhis2/cli-cluster": "^1.0.1", "@dhis2/cli-create": "^1.0.1", - "@dhis2/cli-helpers-engine": "^1.0.0", - "@dhis2/cli-style": "^3.0.0", + "@dhis2/cli-helpers-engine": "^1.0.1", + "@dhis2/cli-style": "^3.0.1", "@dhis2/cli-utils": "^1.0.1", "cli-table3": "^0.5.1", "envinfo": "^7.0.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index 85b924af..c6ebb87e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -12,7 +12,7 @@ "license": "BSD-3-Clause", "private": false, "dependencies": { - "@dhis2/cli-helpers-engine": "^1.0.0", + "@dhis2/cli-helpers-engine": "^1.0.1", "@semantic-release/changelog": "^3.0.2", "@semantic-release/commit-analyzer": "^6.1.0", "@semantic-release/git": "^7.0.8", diff --git a/yarn.lock b/yarn.lock index 3f36b567..a9cb883d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -116,10 +116,10 @@ dependencies: find-up "^2.1.0" -"@dhis2/cli-helpers-engine@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-1.0.0.tgz#2f5910f66e6e2ddf3a5c076acd09e9c29024a2af" - integrity sha512-RXFEn1/qw/AWcs59kabmt4LlPMQsyyF0ZHKRk7CwlGvhv+e8D3dZ7Z/GEjvLQ1hjySIbEoLl7xTbA6ZKXZa55g== +"@dhis2/cli-helpers-engine@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/cli-helpers-engine/-/cli-helpers-engine-1.0.1.tgz#4de5ca3a179faa22583c45533b1126446e89d081" + integrity sha512-SFfjSujE+iFGqHmlk/8VYCIbpBTUlzaF1gjI6oXSwhSLFeqTsKvCveTawBJS76bpcjZVc9tdiMX+2ExDvNg+4Q== dependencies: chalk "^2.4.2" mkdirp "^0.5.1" @@ -129,17 +129,17 @@ update-notifier "^2.5.0" yargs "^13.1.0" -"@dhis2/cli-style@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-3.0.0.tgz#80d148e896f82d84f6d886f2f9898c7317dec8e0" - integrity sha512-cMorjWljQ2QoYJ/ofYFlGmunt7iV32zZlv698P1Xh79aSLdd4BGVRTV9r+lhjV9K9hOrozmn0oXZDJNszn338g== +"@dhis2/cli-style@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@dhis2/cli-style/-/cli-style-3.0.1.tgz#6938557492dccebd27bd710e8dcfc6bbdd9ccaa2" + integrity sha512-GM/d99+v3TpmLx915S1BWTPdat5cSFsgL4Ylb//MLYFhtM1elXfOiOX7fKIKggGoUkLoqwAfLIgv9MvI3hCJjQ== dependencies: "@commitlint/config-conventional" "^7.1.2" "@commitlint/format" "^7.2.1" "@commitlint/lint" "^7.2.1" "@commitlint/load" "^7.2.1" "@commitlint/read" "^7.1.2" - "@dhis2/cli-helpers-engine" "^1.0.0" + "@dhis2/cli-helpers-engine" "^1.0.1" prettier "^1.15.3" yargs "^13.1.0" @@ -3723,9 +3723,9 @@ parallel-transform@^1.1.0: readable-stream "^2.1.5" parent-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5" - integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== dependencies: callsites "^3.0.0" @@ -4341,11 +4341,16 @@ semver-regex@^2.0.0: resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== -"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@5.6.0, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1: +"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@5.6.0, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.1: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== +"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.5.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" + integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"