From 337061c7f948ac93ecf72433ca88860c7a771560 Mon Sep 17 00:00:00 2001 From: Christian Compton Date: Mon, 22 Apr 2019 09:49:07 -0500 Subject: [PATCH 1/5] feat: swift 5 application generation --- .travis.yml | 4 +- README.md | 4 +- package-lock.json | 64 +++++++++++++++----------- package.json | 2 +- refresh/templates/common/swift-version | 2 +- 5 files changed, 44 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f5be9a3..6e5869a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ os: - linux - osx dist: trusty -osx_image: xcode10.1 +osx_image: xcode10.2 before_install: - if [[ $TRAVIS_NODE_VERSION == "8" ]]; then npm install -g npm@4; fi - git clone https://github.com/IBM-Swift/Package-Builder.git @@ -27,7 +27,7 @@ script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then osName="osx"; fi - export projectFolder=`pwd` - projectName="$(basename $projectFolder)" -- export SWIFT_SNAPSHOT=swift-4.2.3 +- export SWIFT_SNAPSHOT=swift-5.0 - source ./Package-Builder/install-swift.sh - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then npm run testsdkgen; fi - if [[ $TRAVIS_EVENT_TYPE != "cron" ]]; then npm run coverage && npm run report-coverage; fi diff --git a/README.md b/README.md index 6d35b9d9..d01249f2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This module is a [Yeoman](http://yeoman.io) generator for creating REST webservices based on the [Kitura web framework](http://kitura.io) with the [Swift](https://swift.org/) language. -This generator and the Yeoman library runs on Node.js and generates a Swift 4.2.3 application. +This generator and the Yeoman library runs on Node.js and generates a Swift 5.0 application. ## Contents 1. [Prerequisites](#prerequisites) @@ -26,7 +26,7 @@ This generator and the Yeoman library runs on Node.js and generates a Swift 4.2. 1. [Contributing](#contributing) ## Prerequisites -To use this module, you will need Node.js and Swift 4.2.3 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 4.2.3 from https://swift.org/download. +To use this module, you will need Node.js and Swift 5.0 installed on your Linux or macOS system. You can get Node.js from https://nodejs.org and Swift 5.0 from https://swift.org/download. You will also need the Yeoman command line utility [yo](https://github.com/yeoman/yo) installed in your global Node.js module directory. diff --git a/package-lock.json b/package-lock.json index 0ba4e87a..0bbfe5ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2857,15 +2857,15 @@ } }, "generator-ibm-cloud-enablement": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/generator-ibm-cloud-enablement/-/generator-ibm-cloud-enablement-1.7.10.tgz", - "integrity": "sha512-FI8tzlsgAycDMbrMlfV8l7esMuHJViFABe8ksVqMZNHDAs9K0AWWk+WMv3wvwSVclSNX01YYF70Psn56BslCJw==", + "version": "1.7.16", + "resolved": "https://registry.npmjs.org/generator-ibm-cloud-enablement/-/generator-ibm-cloud-enablement-1.7.16.tgz", + "integrity": "sha512-v6P2axWfx2t42lco+IhlZl2IATLw/96gwux3ExwGKVwPxQzodeph657yr3MMuSrlv9R1RIeCkIr1LV+2mKPqrA==", "requires": { "fs-extra": "^2.0.0", "handlebars": "^4.1.0", - "js-yaml": "^3.9.0", - "lodash": "^4.17.10", - "yeoman-generator": "^3.1.1" + "js-yaml": "^3.13.0", + "lodash": "^4.17.11", + "yeoman-generator": "^3.2.0" }, "dependencies": { "debug": { @@ -2877,16 +2877,25 @@ } }, "handlebars": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz", - "integrity": "sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", + "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", "requires": { - "async": "^2.5.0", + "neo-async": "^2.6.0", "optimist": "^0.6.1", "source-map": "^0.6.1", "uglify-js": "^3.1.4" } }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "mem-fs-editor": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-5.1.0.tgz", @@ -2921,18 +2930,23 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, "pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" }, "read-chunk": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.1.0.tgz", - "integrity": "sha512-ZdiZJXXoZYE08SzZvTipHhI+ZW0FpzxmFtLI3vIeMuRN9ySbIZ+SZawKogqJ7dxW9fJ/W73BNtxu4Zu/bZp+Ng==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz", + "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==", "requires": { "pify": "^4.0.1", - "with-open-file": "^0.1.5" + "with-open-file": "^0.1.6" } }, "through2": { @@ -2944,20 +2958,13 @@ } }, "with-open-file": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.5.tgz", - "integrity": "sha512-zY51cJCXG6qBilVuMceKNwU3rzjB/Ygt96BuSQ4+tXo3ewlxvj9ET99lpUHNzWfkYmsyfqKZEB9NJORmGZ1Ltw==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.6.tgz", + "integrity": "sha512-SQS05JekbtwQSgCYlBsZn/+m2gpn4zWsqpCYIrCHva0+ojXcnmUEPsBN6Ipoz3vmY/81k5PvYEWSxER2g4BTqA==", "requires": { "p-finally": "^1.0.0", - "p-try": "^2.0.0", - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - } + "p-try": "^2.1.0", + "pify": "^4.0.1" } }, "yeoman-generator": { @@ -5105,6 +5112,11 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "neo-async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz", + "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==" + }, "next-tick": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", diff --git a/package.json b/package.json index 6791c015..00836141 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "bluebird": "^3.5.0", "chalk": "^2.1.0", "debug": "^3.0.0", - "generator-ibm-cloud-enablement": "1.7.10", + "generator-ibm-cloud-enablement": "1.7.16", "generator-ibm-service-enablement": "3.2.0", "generator-ibm-usecase-enablement": "3.2.7", "handlebars": "^4.0.5", diff --git a/refresh/templates/common/swift-version b/refresh/templates/common/swift-version index f2c6cb6a..819e07a2 100644 --- a/refresh/templates/common/swift-version +++ b/refresh/templates/common/swift-version @@ -1 +1 @@ -4.2.3 +5.0 From f096cc8521413adad02904b5777eeb5b2655a5e2 Mon Sep 17 00:00:00 2001 From: Christian Compton Date: Mon, 22 Apr 2019 10:08:15 -0500 Subject: [PATCH 2/5] swift 5.0 system check --- lib/actions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/actions.js b/lib/actions.js index 15cab830..32288cbb 100644 --- a/lib/actions.js +++ b/lib/actions.js @@ -52,7 +52,7 @@ exports.ensureRequiredSwiftInstalled = function () { reject(new Error(chalk.red('Could not determine swift version'))) return } - if (version !== '4') { + if (version !== '5') { reject(new Error(chalk.red('Swift version 4 is required for Swift Server Generator.'))) return } From a61ae2c0e9bcc5f17e85e62fb28886b896d3d8cf Mon Sep 17 00:00:00 2001 From: Christian Compton Date: Fri, 3 May 2019 12:33:17 -0500 Subject: [PATCH 3/5] feat: Swift 5.0 support --- app/index.js | 51 ------------- lib/helpers.js | 18 +---- package.json | 4 +- refresh/index.js | 1 - refresh/templates/common/Package.swift | 2 +- refresh/templates/common/README.scaffold.md | 13 ---- refresh/templates/common/swift-version | 2 +- test/integration/app/prompted_build.js | 4 +- test/integration/app/prompted_nobuild.js | 72 ------------------ test/lib/common_test.js | 84 +-------------------- test/unit/app.js | 76 ------------------- test/unit/helpers.js | 36 --------- test/unit/refresh.js | 31 +------- 13 files changed, 10 insertions(+), 384 deletions(-) diff --git a/app/index.js b/app/index.js index 0fe8f9f7..fbecfcd5 100644 --- a/app/index.js +++ b/app/index.js @@ -537,7 +537,6 @@ module.exports = Generator.extend({ 'MongoDB', 'PostgreSQL', 'ElephantSQL', - 'Object Storage', 'AppID', 'Auto-scaling', 'Watson Assistant, formerly Conversation', @@ -567,9 +566,6 @@ module.exports = Generator.extend({ if (answers.services.indexOf('ElephantSQL') !== -1) { this._addService('elephantsql', generateServiceName(this.appname, 'ElephantSQL')) } - if (answers.services.indexOf('Object Storage') !== -1) { - this._addService('objectStorage', generateServiceName(this.appname, 'ObjectStorage')) - } if (answers.services.indexOf('AppID') !== -1) { this._addService('appid', generateServiceName(this.appname, 'AppID')) } @@ -651,7 +647,6 @@ module.exports = Generator.extend({ case 'mongodb': return 'MongoDB' case 'postgresql': return 'PostgreSQL' case 'elephantsql': return 'ElephantSQL' - case 'objectStorage': return 'Object Storage' case 'appid': return 'AppID' case 'autoscaling': return 'Auto-scaling' case 'conversation': return 'Watson Assistant' @@ -989,52 +984,6 @@ module.exports = Generator.extend({ }) }, - promptConfigureObjectStorage: function () { - if (this.skipPrompting) return - if (!this.servicesToConfigure) return - if (!this.servicesToConfigure.objectStorage) return - - this.log() - this.log('Configure Object Storage') - var prompts = [ - /* - { name: 'objectstorageAuth_url' message: 'Enter auth url:' }, - { name: 'objectstorageDomainId', message: 'Enter domain ID:' }, - { name: 'objectstorageDomainName', message: 'Enter domain name:' }, - { name: 'objectstorageProject', message: 'Enter project:' }, - { name: 'objectstorageRole', message: 'Enter role:' }, - { name: 'objectstorageUsername', message: 'Enter username:' }, - */ - { name: 'objectstorageName', message: 'Enter name (blank for default):' }, - { name: 'objectstorageRegion', message: 'Enter region:' }, - { name: 'objectstorageProjectId', message: 'Enter project ID:' }, - { name: 'objectstorageUserId', message: 'Enter user ID:' }, - { name: 'objectstoragePassword', message: 'Enter password:', type: 'password' } - ] - return this.prompt(prompts).then((answers) => { - var objectStorageService = this.services.objectStorage[0] - this.services.objectStorage[0] = { - /* - auth_url: answers.objectstorageAuth_url || undefined, - domainId: answers.objectstorageDomainId || undefined, - domainName: answers.objectstorageDomainName || undefined, - project: answers.objectstorageProject || undefined, - role: answers.objectstorageRole || undefined, - username: answers.objectstorageUsername || undefined, - */ - region: answers.objectstorageRegion || undefined, - projectId: answers.objectstorageProjectId || undefined, - userId: answers.objectstorageUserId || undefined, - password: answers.objectstoragePassword || undefined, - serviceInfo: { - label: objectStorageService.serviceInfo.label, - name: answers.objectstorageName || objectStorageService.serviceInfo.name, - plan: objectStorageService.serviceInfo.plan - } - } - }) - }, - promptConfigureAppID: function () { if (this.skipPrompting) return if (!this.servicesToConfigure) return diff --git a/lib/helpers.js b/lib/helpers.js index 99ded0c4..59b138bf 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -447,20 +447,6 @@ function sanitizeCredentialsAndFillInDefaults (serviceType, service) { return { uri: service.uri || url.format(defaultElephantSqlURI) } - case 'objectStorage': - var defaultAuthURL = 'https://identity.open.softlayer.com' - return { - auth_url: service.auth_url || defaultAuthURL, - project: service.project || '', - projectId: service.projectId || '', - region: service.region || '', - userId: service.userId || '', - username: service.username || '', - password: service.password || '', - domainId: service.domainId || '', - domainName: service.domainName || '', - role: service.role || '' - } case 'appid': return { clientId: service.clientId || '', @@ -519,7 +505,6 @@ exports.getBluemixServiceLabel = function (serviceType) { case 'redis': return 'compose-for-redis' case 'mongodb': return 'compose-for-mongodb' case 'postgresql': return 'compose-for-postgresql' - case 'objectStorage': return 'Object-Storage' case 'appid': return 'AppID' case 'conversation': return 'conversation' case 'alertNotification': return 'AlertNotification' @@ -535,7 +520,6 @@ exports.getBluemixDefaultPlan = function (serviceType) { case 'redis': return 'Standard' case 'mongodb': return 'Standard' case 'postgresql': return 'Standard' - case 'objectStorage': return 'Free' case 'appid': return 'Graduated tier' case 'conversation': return 'free' case 'alertNotification': return 'authorizedusers' @@ -717,7 +701,7 @@ exports.routeMethodVariant = function (detail) { } exports.isThisServiceAnArray = function (serviceType) { - return (serviceType === 'cloudant' || serviceType === 'objectStorage') + return (serviceType === 'cloudant') } exports.validateServiceFields = function (serviceType, service) { diff --git a/package.json b/package.json index 00836141..bf94ba18 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "bluebird": "^3.5.0", "chalk": "^2.1.0", "debug": "^3.0.0", - "generator-ibm-cloud-enablement": "1.7.16", - "generator-ibm-service-enablement": "3.2.0", + "generator-ibm-cloud-enablement": "1.7.17", + "generator-ibm-service-enablement": "3.4.0", "generator-ibm-usecase-enablement": "3.2.7", "handlebars": "^4.0.5", "ibm-openapi-support": "^0.0.12", diff --git a/refresh/index.js b/refresh/index.js index 5d445bb1..619ec871 100644 --- a/refresh/index.js +++ b/refresh/index.js @@ -1104,7 +1104,6 @@ module.exports = Generator.extend({ autoscaling: !!this.bluemix.autoscaling, cloudant: this.bluemix.cloudant && this.bluemix.cloudant.length > 0, redis: !!this.bluemix.redis, - objectStorage: this.bluemix.objectStorage && this.bluemix.objectStorage.length > 0, appid: !!this.bluemix.appid, conversation: !!this.bluemix.conversation, alertNotification: !!this.bluemix.alertNotification, diff --git a/refresh/templates/common/Package.swift b/refresh/templates/common/Package.swift index d6fcc9fc..36d59a87 100644 --- a/refresh/templates/common/Package.swift +++ b/refresh/templates/common/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:5.0 import PackageDescription let package = Package( diff --git a/refresh/templates/common/README.scaffold.md b/refresh/templates/common/README.scaffold.md index 29f5d03e..858873cc 100644 --- a/refresh/templates/common/README.scaffold.md +++ b/refresh/templates/common/README.scaffold.md @@ -39,9 +39,6 @@ This application has been generated with the following capabilities and services {{#if redis}} * [Redis](#redis) {{/if}} -{{#if objectStorage}} -* [Object Storage](#object-storage) -{{/if}} {{#if appid}} * [AppID](#appid) {{/if}} @@ -195,16 +192,6 @@ Boilerplate code for creating a client object for the Kitura-redis API is includ The connection details for this client are loaded by the [configuration](#configuration) code and are passed to the Kitura-redis client in the boilerplate code. {{/if}} -{{#if objectStorage}} -#### Object Storage -This application uses the [Object Storage package](https://github.com/ibm-bluemix-mobile-services/bluemix-objectstorage-serversdk-swift.git) to connect to the IBM Cloud Object Storage service. - -Object Storage provides an unstructured cloud data store, which allows the application to store and access unstructured data content. - -Boilerplate code for creating a client object for the Object Storage API is included inside `Sources/Application/Application.swift` as an `internal` variable available for use anywhere in the `Application` module. - -The connection details for this client are loaded by the [configuration](#configuration) code and are passed to the Object Storage client in the boilerplate code. -{{/if}} {{#if appid}} #### AppID This application uses [App ID package](https://github.com/ibm-cloud-security/appid-serversdk-swift) to connect to the IBM Cloud App ID service. diff --git a/refresh/templates/common/swift-version b/refresh/templates/common/swift-version index 819e07a2..6b244dcd 100644 --- a/refresh/templates/common/swift-version +++ b/refresh/templates/common/swift-version @@ -1 +1 @@ -5.0 +5.0.1 diff --git a/test/integration/app/prompted_build.js b/test/integration/app/prompted_build.js index 7e86da35..19fb2bc3 100644 --- a/test/integration/app/prompted_build.js +++ b/test/integration/app/prompted_build.js @@ -117,8 +117,7 @@ describe('Integration tests (prompt build) for swiftserver:app', function () { // TODO with endpoints from swagger file @full var servicesToTest = [ 'cloudant', 'redis', 'mongodb', 'postgresql', 'elephantsql', - 'objectstorage', 'appid', 'watsonassistant', 'alertnotification', - 'pushnotifications', 'autoscaling' ] + 'appid', 'watsonassistant', 'alertnotification', 'pushnotifications', 'autoscaling' ] servicesToTest.forEach(service => { var serviceDisplayName = commonTest.serviceDisplayNames[service] @@ -215,7 +214,6 @@ describe('Integration tests (prompt build) for swiftserver:app', function () { 'Cloudant / CouchDB', 'Redis', 'MongoDB', - 'Object Storage', 'AppID', 'Auto-scaling', 'Watson Assistant', diff --git a/test/integration/app/prompted_nobuild.js b/test/integration/app/prompted_nobuild.js index 55fb9060..4b9d4c2a 100644 --- a/test/integration/app/prompted_nobuild.js +++ b/test/integration/app/prompted_nobuild.js @@ -964,78 +964,6 @@ describe('Integration tests (prompt no build) for swiftserver:app', function () }) }) - describe('with object storage', function () { - describe('default credentials', function () { - var runContext - - before(function () { - runContext = helpers.run(appGeneratorPath) - .withOptions({ skipBuild: true }) - .withPrompts({ - name: applicationName, - appType: 'Scaffold a starter', - capabilities: [], - services: [ 'Object Storage' ], - configure: [ 'Object Storage' ], - objectstorageName: 'myObjectStorageService' - }) - return runContext.toPromise() - }) - - after(function () { - runContext.cleanTestDirectory() - }) - - commonTest.itCreatedServiceConfigFiles() - commonTest.objectstorage.itCreatedServiceFilesWithExpectedContent('myObjectStorageService', { - auth_url: 'https://identity.open.softlayer.com', - project: '', - projectId: '', - region: '', - userId: '', - password: '', - domainName: '' - }) - }) - - describe('non-default credentials', function () { - var runContext - - before(function () { - runContext = helpers.run(appGeneratorPath) - .withOptions({ skipBuild: true }) - .withPrompts({ - name: applicationName, - appType: 'Scaffold a starter', - capabilities: [], - services: [ 'Object Storage' ], - configure: [ 'Object Storage' ], - objectstorageName: 'myObjectStorageService', - objectstorageRegion: 'dallas', - objectstorageProjectId: 'myProjectId', - objectstorageUserId: 'admin', - objectstoragePassword: 'password1234' - }) - return runContext.toPromise() - }) - - after(function () { - runContext.cleanTestDirectory() - }) - - commonTest.itCreatedServiceConfigFiles() - commonTest.objectstorage.itCreatedServiceFilesWithExpectedContent('myObjectStorageService', { - auth_url: 'https://identity.open.softlayer.com', - project: '', - projectId: 'myProjectId', - region: 'dallas', - userId: 'admin', - password: 'password1234', - domainName: '' - }) - }) - }) - describe('with appid', function () { describe('default credentials', function () { var runContext diff --git a/test/lib/common_test.js b/test/lib/common_test.js index e3aa0959..477127f0 100644 --- a/test/lib/common_test.js +++ b/test/lib/common_test.js @@ -18,8 +18,6 @@ var assert = require('yeoman-assert') var path = require('path') -var helpers = require('../../lib/helpers') - exports.generatorVersion = require('../../package.json').version // @@ -123,7 +121,6 @@ exports.serviceDisplayNames = { mongodb: 'MongoDB', postgresql: 'PostgreSQL', elephantsql: 'ElephantSQL', - objectstorage: 'Object Storage', appid: 'AppID', watsonassistant: 'Watson Assistant', alertnotification: 'Alert Notification', @@ -586,10 +583,6 @@ exports.itDidNotCreateServiceFiles = function () { it('cloudfoundry manifest does not contain services', function () { assert.noFileContent(exports.cloudFoundryManifestFile, 'services:') }) - - it('bluemix pipeline does not contain services', function () { - assert.noFileContent(exports.bluemixPipelineFile, 'cf create-services') - }) } exports.itDidNotCreateService = function (service) { @@ -603,10 +596,6 @@ exports.itDidNotCreateService = function (service) { ]) }) - it(`bluemix pipeline does not contain ${service} create-service command`, function () { - assert.noFileContent(exports.bluemixPipelineFile, `cf create-service "${service}"`) - }) - it(`does not create ${service} boilerplate`, function () { assert.noFile(`${exports.servicesSourceDir}/Service${service}.swift`) }) @@ -654,12 +643,6 @@ exports.itHasServiceInCloudFoundryManifest = function (serviceDescription, servi }) } -exports.itHasServiceInBluemixPipeline = function (serviceDescription, serviceLabel, servicePlan, serviceName) { - it(`bluemix pipeline contains ${serviceDescription} create-service command`, function () { - assert.fileContent(exports.bluemixPipelineFile, `cf create-service "${serviceLabel}" "${servicePlan}" "${serviceName}"`) - }) -} - exports.itCreatedServiceBoilerplate = function (serviceDescription, fileName, initFuncName) { it(`created ${serviceDescription} boilerplate`, function () { assert.file(`${exports.servicesSourceDir}/${fileName}`) @@ -674,13 +657,10 @@ exports.itCreatedServiceBoilerplate = function (serviceDescription, fileName, in exports.autoscaling = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'autoscaling' - var label = 'Auto-Scaling' - var plan = servicePlan || helpers.getBluemixDefaultPlan('autoscaling') var sourceFile = 'ServiceAutoscaling.swift' var initFunction = 'initializeServiceAutoscaling' exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('autoscaling boilerplate contains expected content', function () { @@ -700,14 +680,11 @@ exports.cloudant = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'cloudant' var mapping = 'cloudant' - var label = 'cloudantNoSQLDB' - var plan = servicePlan || helpers.getBluemixDefaultPlan('cloudant') var sourceFile = 'ServiceCloudant.swift' var initFunction = 'initializeServiceCloudant' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('cloudant boilerplate contains expected content', function () { @@ -727,20 +704,17 @@ exports.appid = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'appid' var mapping = 'appid' - var label = 'AppID' - var plan = servicePlan || helpers.getBluemixDefaultPlan('appid') var sourceFile = 'ServiceAppid.swift' var initFunction = 'initializeServiceAppid' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('appid boilerplate contains expected content', function () { var serviceFile = `${exports.servicesSourceDir}/${sourceFile}` assert.fileContent([ - [serviceFile, 'import BluemixAppID'], + [serviceFile, 'import IBMCloudAppID'], [serviceFile, 'import class Credentials.Credentials'], [serviceFile, 'func initializeServiceAppid(cloudEnv: CloudEnv) throws'], [serviceFile, 'WebAppKituraCredentialsPlugin('], @@ -755,14 +729,11 @@ exports.watsonassistant = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'watson assistant' var mapping = 'watson_assistant' - var label = 'conversation' - var plan = servicePlan || helpers.getBluemixDefaultPlan('conversation') var sourceFile = 'ServiceWatsonAssistant.swift' var initFunction = 'initializeServiceWatsonAssistant' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('watson assistant boilerplate contains expected content', function () { @@ -782,14 +753,11 @@ exports.pushnotifications = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'push notifications' var mapping = 'push' - var label = 'imfpush' - var plan = servicePlan || helpers.getBluemixDefaultPlan('push') var sourceFile = 'ServicePush.swift' var initFunction = 'initializeServicePush' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('push notifications boilerplate contains expected content', function () { @@ -809,14 +777,11 @@ exports.alertnotification = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'alert notification' var mapping = 'alert_notification' - var label = 'AlertNotification' - var plan = servicePlan || helpers.getBluemixDefaultPlan('alertNotification') var sourceFile = 'ServiceAlertNotification.swift' var initFunction = 'initializeServiceAlertNotification' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('alert notification boilerplate contains expected content', function () { @@ -831,47 +796,16 @@ exports.alertnotification = { } } -// Object storage -exports.objectstorage = { - itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { - var description = 'object storage' - var mapping = 'object_storage' - var label = 'Object-Storage' - var plan = servicePlan || helpers.getBluemixDefaultPlan('objectStorage') - var sourceFile = 'ServiceObjectStorage.swift' - var initFunction = 'initializeServiceObjectStorage' - - exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) - exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) - exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) - - it('object storage boilerplate contains expected content', function () { - var serviceFile = `${exports.servicesSourceDir}/${sourceFile}` - assert.fileContent([ - [serviceFile, 'import BluemixObjectStorage'], - [serviceFile, 'func initializeServiceObjectStorage(cloudEnv: CloudEnv) throws'], - [serviceFile, 'guard let storageCredentials ='], - [serviceFile, 'guard let connectedObjectStorage ='], - [serviceFile, 'return connectedObjectStorage'] - ]) - }) - } -} - // Redis exports.redis = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'redis' var mapping = 'redis' - var label = 'compose-for-redis' - var plan = servicePlan || helpers.getBluemixDefaultPlan('redis') var sourceFile = 'ServiceRedis.swift' var initFunction = 'initializeServiceRedis' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('redis boilerplate contains expected content', function () { @@ -891,21 +825,18 @@ exports.mongodb = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'mongodb' var mapping = 'mongodb' - var label = 'compose-for-mongodb' - var plan = servicePlan || helpers.getBluemixDefaultPlan('mongodb') var sourceFile = 'ServiceMongodb.swift' var initFunction = 'initializeServiceMongodb' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('mongodb boilerplate contains expected content', function () { var serviceFile = `${exports.servicesSourceDir}/${sourceFile}` assert.fileContent([ [serviceFile, 'import MongoKitten'], - [serviceFile, 'mongodb = try Database('], + [serviceFile, 'mongodb = try Database.synchronousConnect('], [serviceFile, 'func initializeServiceMongodb(cloudEnv: CloudEnv) throws'], [serviceFile, 'cloudEnv.getMongoDBCredentials('] ]) @@ -918,14 +849,11 @@ exports.postgresql = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'postgresql' var mapping = 'postgre' - var label = 'compose-for-postgresql' - var plan = servicePlan || helpers.getBluemixDefaultPlan('postgresql') var sourceFile = 'ServicePostgre.swift' var initFunction = 'initializeServicePostgre' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('postgresql boilerplate contains expected content', function () { @@ -946,14 +874,11 @@ exports.elephantsql = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'elephantsql' var mapping = 'elephant_sql' - var label = 'elephantsql' - var plan = servicePlan || helpers.getBluemixDefaultPlan('elephantsql') var sourceFile = 'ServiceElephantSql.swift' var initFunction = 'initializeServiceElephantSql' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('elephantsql boilerplate contains expected content', function () { @@ -973,21 +898,18 @@ exports.hypersecuredb = { itCreatedServiceFilesWithExpectedContent: function (serviceName, serviceCredentials, servicePlan) { var description = 'hypersecuredb' var mapping = 'hypersecure_dbaas_mongodb' - var label = 'hypersecuredb' - var plan = servicePlan || helpers.getBluemixDefaultPlan('hypersecuredbaas') var sourceFile = 'ServiceHypersecureDbaasMongodb.swift' var initFunction = 'initializeServiceHypersecureDbaasMongodb' exports.itHasServiceInConfig(description, mapping, serviceName, serviceCredentials) exports.itHasServiceInCloudFoundryManifest(description, serviceName) - exports.itHasServiceInBluemixPipeline(description, label, plan, serviceName) exports.itCreatedServiceBoilerplate(description, sourceFile, initFunction) it('mongodb boilerplate contains expected content', function () { var serviceFile = `${exports.servicesSourceDir}/${sourceFile}` assert.fileContent([ [serviceFile, 'import MongoKitten'], - [serviceFile, 'mongodb = try Database('], + [serviceFile, 'mongodb = try Database.synchronousConnect('], [serviceFile, 'func initializeServiceHypersecureDbaasMongodb(cloudEnv: CloudEnv) throws'], [serviceFile, 'cloudEnv.getHyperSecureDBaaSCredentials('] ]) diff --git a/test/unit/app.js b/test/unit/app.js index dcc6f885..cd1eacfc 100644 --- a/test/unit/app.js +++ b/test/unit/app.js @@ -1334,82 +1334,6 @@ describe('Unit tests for swiftserver:app', function () { }) }) - describe('with object storage', function () { - describe('default credentials', function () { - var runContext - - before(function () { - runContext = helpers.run(appGeneratorPath) - .withGenerators(dependentGenerators) - .withOptions({ testmode: true }) - .withPrompts({ - name: applicationName, - appType: 'Scaffold a starter', - capabilities: [], - services: [ 'Object Storage' ] - }) - return runContext.toPromise() - }) - - after(function () { - runContext.cleanTestDirectory() - }) - - itCreatedSpecWithServicesAndCapabilities(() => ({ - runContext: runContext, - appType: 'scaffold', - appName: applicationName, - capabilities: [], - services: { objectStorage: [{ serviceInfo: {label: 'Object-Storage'} }] } - })) - }) - - describe('non-default credentials', function () { - var runContext - - before(function () { - runContext = helpers.run(appGeneratorPath) - .withGenerators(dependentGenerators) - .withOptions({ testmode: true }) - .withPrompts({ - name: applicationName, - appType: 'Scaffold a starter', - capabilities: [], - services: [ 'Object Storage' ], - configure: [ 'Object Storage' ], - objectstorageName: 'myObjectStorageService', - objectstorageRegion: 'dallas', - objectstorageProjectId: 'myProjectId', - objectstorageUserId: 'admin', - objectstoragePassword: 'password1234' - }) - return runContext.toPromise() - }) - - after(function () { - runContext.cleanTestDirectory() - }) - - itCreatedSpecWithServicesAndCapabilities(() => ({ - runContext: runContext, - appType: 'scaffold', - appName: applicationName, - capabilities: [], - services: { - objectStorage: [{ - serviceInfo: { - name: 'myObjectStorageService' - }, - region: 'dallas', - projectId: 'myProjectId', - userId: 'admin', - password: 'password1234' - }] - } - })) - }) - }) - describe('with appid', function () { describe('default credentials', function () { var runContext diff --git a/test/unit/helpers.js b/test/unit/helpers.js index cd0287d3..12755c0f 100644 --- a/test/unit/helpers.js +++ b/test/unit/helpers.js @@ -92,22 +92,6 @@ describe('Unit tests for helpers', function () { }, uri: 'redis://:@localhost:6379' }, - objectStorage: { - serviceInfo: { - label: 'Object-Storage', - plan: 'Free' - }, - auth_url: 'https://identity.open.softlayer.com', - project: '', - projectId: '', - region: '', - userId: '', - username: '', - password: '', - domainId: '', - domainName: '', - role: '' - }, appid: { serviceInfo: { label: 'AppID', @@ -177,18 +161,6 @@ describe('Unit tests for helpers', function () { redis: { uri: 'redis://:my-password@my-host:5555' }, - objectStorage: { - auth_url: 'http://my-auth-host', - project: 'my-project', - projectId: 'my-project-id', - region: 'my-region', - userId: 'my-user-id', - username: 'my-username', - password: 'my-password', - domainId: 'my-domain-id', - domainName: 'my-domain-name', - role: 'my-role' - }, appid: { clientId: 'my-client-id', oauthServerUrl: 'http://my-oauth-server-host', @@ -360,10 +332,6 @@ describe('Unit tests for helpers', function () { assert.equal(helpers.getBluemixServiceLabel('redis'), 'compose-for-redis') }) - it('get label for objectstorage', function () { - assert.equal(helpers.getBluemixServiceLabel('objectStorage'), 'Object-Storage') - }) - it('get label for appid', function () { assert.equal(helpers.getBluemixServiceLabel('appid'), 'AppID') }) @@ -394,10 +362,6 @@ describe('Unit tests for helpers', function () { assert.equal(helpers.getBluemixDefaultPlan('redis'), 'Standard') }) - it('get default plan for objectstorage', function () { - assert.equal(helpers.getBluemixDefaultPlan('objectStorage'), 'Free') - }) - it('get default plan for appid', function () { assert.equal(helpers.getBluemixDefaultPlan('appid'), 'Graduated tier') }) diff --git a/test/unit/refresh.js b/test/unit/refresh.js index 503e40c3..cdb73b82 100644 --- a/test/unit/refresh.js +++ b/test/unit/refresh.js @@ -146,7 +146,7 @@ describe('Unit tests for swiftserver:refresh', function () { appName: 'myapp', bluemix: { backendPlatform: 'SWIFT', - objectStorage: [{ serviceInfo: {label: 'Object-Storage'} }] + cloudant: [{ serviceInfo: {label: 'cloudant'} }] } } }) @@ -360,7 +360,6 @@ describe('Unit tests for swiftserver:refresh', function () { commonTest.servicesSourceDir + '/ServiceCloudant.swift', commonTest.servicesSourceDir + '/ServiceRedis.swift', commonTest.servicesSourceDir + '/ServiceMongodb.swift', - commonTest.servicesSourceDir + '/ServiceObjectStorage.swift', commonTest.servicesSourceDir + '/ServiceWatsonAssistant.swift', commonTest.servicesSourceDir + '/ServicePush.swift', commonTest.servicesSourceDir + '/ServiceAlertNotification.swift', @@ -384,7 +383,6 @@ describe('Unit tests for swiftserver:refresh', function () { cloudant: [{ serviceInfo: { name: 'myCloudantService' } }], redis: { serviceInfo: { name: 'myRedisService' } }, mongodb: { serviceInfo: { name: 'myMongoDBService' } }, - objectStorage: [{ serviceInfo: { name: 'myObjectStorageService' } }], conversation: { serviceInfo: { name: 'myAssistantService' } }, push: { serviceInfo: { name: 'myPushService' } }, alertNotification: { serviceInfo: { name: 'myAlertService' } }, @@ -2001,33 +1999,6 @@ describe('Unit tests for swiftserver:refresh', function () { commonTest.alertnotification.itCreatedServiceFilesWithExpectedContent('myAlertService') }) - describe('with object storage', function () { - var runContext - - before(function () { - runContext = helpers.run(refreshGeneratorPath) - .withOptions({ - specObj: { - appType: 'scaffold', - appName: applicationName, - bluemix: { - backendPlatform: 'SWIFT', - server: { services: ['myObjectStorageService'] }, - objectStorage: [{ serviceInfo: { name: 'myObjectStorageService' } }] - } - } - }) - return runContext.toPromise() - }) - - after(function () { - runContext.cleanTestDirectory() - }) - - commonTest.itCreatedServiceConfigFiles() - commonTest.objectstorage.itCreatedServiceFilesWithExpectedContent('myObjectStorageService') - }) - describe('with redis', function () { var runContext From 0fc55b90a46a911650eec1b832a387dfe00ff9b9 Mon Sep 17 00:00:00 2001 From: Christian Compton Date: Tue, 7 May 2019 11:12:59 -0500 Subject: [PATCH 4/5] ci: xenial linux --- .travis.yml | 3 +- lib/actions.js | 2 +- package-lock.json | 535 ++++++++++++++++++++++++++-------------------- 3 files changed, 302 insertions(+), 238 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e5869a5..e46d7833 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ node_js: os: - linux - osx -dist: trusty +dist: xenial osx_image: xcode10.2 before_install: - if [[ $TRAVIS_NODE_VERSION == "8" ]]; then npm install -g npm@4; fi @@ -25,6 +25,7 @@ before_install: script: - osName="linux" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then osName="osx"; fi +- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl; fi - export projectFolder=`pwd` - projectName="$(basename $projectFolder)" - export SWIFT_SNAPSHOT=swift-5.0 diff --git a/lib/actions.js b/lib/actions.js index 32288cbb..d1e5ecf2 100644 --- a/lib/actions.js +++ b/lib/actions.js @@ -53,7 +53,7 @@ exports.ensureRequiredSwiftInstalled = function () { return } if (version !== '5') { - reject(new Error(chalk.red('Swift version 4 is required for Swift Server Generator.'))) + reject(new Error(chalk.red('Swift version 5 is required for Swift Server Generator.'))) return } resolve() diff --git a/package-lock.json b/package-lock.json index 0bbfe5ce..cce34cf6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,17 +6,17 @@ "dependencies": { "@mrmlnc/readdir-enhanced": { "version": "2.2.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha1-UkryQNGjYFJ7cwR17PoTRKpUDd4=", + "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "requires": { "call-me-maybe": "^1.0.1", "glob-to-regexp": "^0.3.0" } }, "@nodelib/fs.stat": { - "version": "1.1.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz", - "integrity": "sha1-VMWpZEYr49TXivYxNjwY1vqRrCY=" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", + "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" }, "JSONStream": { "version": "1.3.5", @@ -82,9 +82,9 @@ "optional": true }, "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==" }, "ansi-regex": { "version": "3.0.0", @@ -120,8 +120,8 @@ }, "arr-flatten": { "version": "1.1.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=" + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, "arr-union": { "version": "3.1.0", @@ -267,8 +267,8 @@ }, "atob": { "version": "2.1.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/atob/-/atob-2.1.2.tgz", - "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=" + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "aws-sign2": { "version": "0.7.0", @@ -340,8 +340,8 @@ }, "base": { "version": "0.11.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/base/-/base-0.11.2.tgz", - "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { "cache-base": "^1.0.1", "class-utils": "^0.3.5", @@ -354,7 +354,7 @@ "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/define-property/-/define-property-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { "is-descriptor": "^1.0.0" @@ -362,24 +362,24 @@ }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -432,8 +432,8 @@ }, "braces": { "version": "2.3.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/braces/-/braces-2.3.2.tgz", - "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -449,7 +449,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/extend-shallow/-/extend-shallow-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" @@ -499,8 +499,8 @@ }, "cache-base": { "version": "1.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { "collection-visit": "^1.0.0", "component-emitter": "^1.2.1", @@ -599,8 +599,8 @@ }, "chardet": { "version": "0.7.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=" + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" }, "check-error": { "version": "1.0.2", @@ -629,11 +629,6 @@ } } }, - "circular-json": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", - "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==" - }, "class-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/class-extend/-/class-extend-0.1.2.tgz", @@ -644,8 +639,8 @@ }, "class-utils": { "version": "0.3.6", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { "arr-union": "^3.1.0", "define-property": "^0.2.5", @@ -655,7 +650,7 @@ "dependencies": { "define-property": { "version": "0.2.5", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/define-property/-/define-property-0.2.5.tgz", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { "is-descriptor": "^0.1.0" @@ -837,9 +832,9 @@ } }, "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, "concat-map": { "version": "0.0.1", @@ -1394,9 +1389,9 @@ } }, "dargs": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/dargs/-/dargs-6.0.0.tgz", - "integrity": "sha512-6lJauzNaI7MiM8EHQWmGj+s3rP5/i1nYs8GAvKrLAx/9dpc9xS/4seFb1ioR39A+kcfu4v3jnEa/EE5qWYnitQ==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-6.1.0.tgz", + "integrity": "sha512-5dVBvpBLBnPwSsYXqfybFyehMmC/EenKEcf23AhCTgTf48JFBbmJKqoZBsERDnjL0FyiVTYWdFsRfTLHxLyKdQ==" }, "dashdash": { "version": "1.14.1", @@ -1407,9 +1402,9 @@ } }, "date-format": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz", - "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", + "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==" }, "dateformat": { "version": "3.0.3", @@ -1509,8 +1504,8 @@ }, "define-property": { "version": "2.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { "is-descriptor": "^1.0.2", "isobject": "^3.0.1" @@ -1518,24 +1513,24 @@ "dependencies": { "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -2501,8 +2496,8 @@ "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" } @@ -2525,7 +2520,7 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/ms/-/ms-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } @@ -2546,8 +2541,8 @@ "dependencies": { "is-extendable": { "version": "1.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { "is-plain-object": "^2.0.4" } @@ -2566,8 +2561,8 @@ }, "extglob": { "version": "2.0.4", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { "array-unique": "^0.3.2", "define-property": "^1.0.0", @@ -2581,7 +2576,7 @@ "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/define-property/-/define-property-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { "is-descriptor": "^1.0.0" @@ -2589,7 +2584,7 @@ }, "extend-shallow": { "version": "2.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/extend-shallow/-/extend-shallow-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" @@ -2597,24 +2592,24 @@ }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -2634,15 +2629,15 @@ "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" }, "fast-glob": { - "version": "2.2.3", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/fast-glob/-/fast-glob-2.2.3.tgz", - "integrity": "sha1-0J03jp72sAdqD6G6dRnZ1NlpnCg=", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.6.tgz", + "integrity": "sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==", "requires": { "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.0.1", + "@nodelib/fs.stat": "^1.1.2", "glob-parent": "^3.1.0", "is-glob": "^4.0.0", - "merge2": "^1.2.1", + "merge2": "^1.2.3", "micromatch": "^3.1.10" } }, @@ -2746,6 +2741,11 @@ } } }, + "flatted": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz", + "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -2857,9 +2857,9 @@ } }, "generator-ibm-cloud-enablement": { - "version": "1.7.16", - "resolved": "https://registry.npmjs.org/generator-ibm-cloud-enablement/-/generator-ibm-cloud-enablement-1.7.16.tgz", - "integrity": "sha512-v6P2axWfx2t42lco+IhlZl2IATLw/96gwux3ExwGKVwPxQzodeph657yr3MMuSrlv9R1RIeCkIr1LV+2mKPqrA==", + "version": "1.7.17", + "resolved": "https://registry.npmjs.org/generator-ibm-cloud-enablement/-/generator-ibm-cloud-enablement-1.7.17.tgz", + "integrity": "sha512-V+9PRGt6mmzr53PvDQa1ZCMOoO7GBQ1T1yyKpgvxrITzn594By09mUuQgUXREGiLK4XRAaMHt6EHYlVSXMl+WA==", "requires": { "fs-extra": "^2.0.0", "handlebars": "^4.1.0", @@ -2930,11 +2930,6 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, "pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", @@ -2957,16 +2952,6 @@ "readable-stream": "2 || 3" } }, - "with-open-file": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.6.tgz", - "integrity": "sha512-SQS05JekbtwQSgCYlBsZn/+m2gpn4zWsqpCYIrCHva0+ojXcnmUEPsBN6Ipoz3vmY/81k5PvYEWSxER2g4BTqA==", - "requires": { - "p-finally": "^1.0.0", - "p-try": "^2.1.0", - "pify": "^4.0.1" - } - }, "yeoman-generator": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-3.2.0.tgz", @@ -3002,14 +2987,14 @@ } }, "generator-ibm-service-enablement": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/generator-ibm-service-enablement/-/generator-ibm-service-enablement-3.2.0.tgz", - "integrity": "sha512-OCcolJ9PNY6Tdubl2jMlMyv+R34RoUYzWkP6u78QU482f6FrchNpeb1FH/o6YYPmbJLxsNkCFBknXhvzJc7D/g==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/generator-ibm-service-enablement/-/generator-ibm-service-enablement-3.4.0.tgz", + "integrity": "sha512-ukbIDiKbAZxZJhnQA2Jw9HY2s8dcSBJ+9l2n8+zy0C6+0aIkCcSDjP6+X5A53wvRWZ1nUDsGGSPRoSlpYxxBpw==", "requires": { - "handlebars": "^4.0.10", - "lodash": "^4.17.10", - "log4js": "^3.0.5", - "yeoman-generator": "^3.1.1" + "handlebars": "^4.1.0", + "lodash": "^4.17.11", + "log4js": "^4.0.2", + "yeoman-generator": "^3.2.0" }, "dependencies": { "debug": { @@ -3020,6 +3005,17 @@ "ms": "^2.1.1" } }, + "handlebars": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", + "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "requires": { + "neo-async": "^2.6.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" + } + }, "mem-fs-editor": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-5.1.0.tgz", @@ -3060,21 +3056,20 @@ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" }, "read-chunk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.0.0.tgz", - "integrity": "sha512-8lBUVPjj9TC5bKLBacB+rpexM03+LWiYbv6ma3BeWmUYXGxqA1WNNgIZHq/iIsCrbFMzPhFbkOqdsyOFRnuoXg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz", + "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==", "requires": { - "pify": "^4.0.0", - "with-open-file": "^0.1.3" + "pify": "^4.0.1", + "with-open-file": "^0.1.6" } }, "through2": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz", - "integrity": "sha512-8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", + "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", "requires": { - "readable-stream": "2 || 3", - "xtend": "~4.0.1" + "readable-stream": "2 || 3" } }, "yeoman-generator": { @@ -3561,12 +3556,12 @@ "dev": true }, "globby": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", - "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", + "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==", "requires": { "array-union": "^1.0.1", - "dir-glob": "^2.0.0", + "dir-glob": "2.0.0", "fast-glob": "^2.0.2", "glob": "^7.1.2", "ignore": "^3.3.5", @@ -3685,8 +3680,8 @@ }, "has-symbol-support-x": { "version": "1.4.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", - "integrity": "sha1-FAn5i8ACR9pF2mfO4KNvKC/yZFU=" + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" }, "has-symbols": { "version": "1.0.0", @@ -3696,8 +3691,8 @@ }, "has-to-string-tag-x": { "version": "1.4.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", - "integrity": "sha1-oEWrOD17SyASoAFIqwql8pAETU0=", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "requires": { "has-symbol-support-x": "^1.4.1" } @@ -3854,8 +3849,8 @@ }, "iconv-lite": { "version": "0.4.24", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -3907,23 +3902,48 @@ "dev": true }, "inquirer": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz", - "integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz", + "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==", "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", - "external-editor": "^3.0.0", + "external-editor": "^3.0.3", "figures": "^2.0.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "mute-stream": "0.0.7", "run-async": "^2.2.0", - "rxjs": "^6.1.0", + "rxjs": "^6.4.0", "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", + "strip-ansi": "^5.1.0", "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, "interpret": { @@ -3947,7 +3967,7 @@ "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-3.2.2.tgz", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" @@ -3962,8 +3982,8 @@ }, "is-buffer": { "version": "1.1.6", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=" + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-builtin-module": { "version": "1.0.0", @@ -3989,7 +4009,7 @@ "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-3.2.2.tgz", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" @@ -4005,8 +4025,8 @@ }, "is-descriptor": { "version": "0.1.6", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { "is-accessor-descriptor": "^0.1.6", "is-data-descriptor": "^0.1.4", @@ -4015,8 +4035,8 @@ "dependencies": { "kind-of": { "version": "5.1.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" } } }, @@ -4045,9 +4065,9 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "requires": { "is-extglob": "^2.1.1" } @@ -4081,7 +4101,7 @@ "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-3.2.2.tgz", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" @@ -4131,8 +4151,8 @@ }, "is-plain-object": { "version": "2.0.4", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { "isobject": "^3.0.1" } @@ -4222,8 +4242,8 @@ }, "is-windows": { "version": "1.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=" + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, "isarray": { "version": "1.0.0", @@ -4346,8 +4366,8 @@ }, "isurl": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/isurl/-/isurl-1.0.0.tgz", - "integrity": "sha1-sn9PSfPNqj6kSgpbfzRi5u3DnWc=", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "requires": { "has-to-string-tag-x": "^1.2.0", "is-object": "^1.0.1" @@ -4502,8 +4522,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=" + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" }, "lcid": { "version": "1.0.0", @@ -4599,15 +4619,25 @@ } }, "log4js": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz", - "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.1.tgz", + "integrity": "sha512-tSQUF9bBMdcBtuLD6vD7hBM9Ci6Lng/NVHZEq4YbuRGo7ObmLiZuhxz33HKAmJItit74pAjvZgirqYX2LRaoGA==", "requires": { - "circular-json": "^0.5.5", - "date-format": "^1.2.0", - "debug": "^3.1.0", + "date-format": "^2.0.0", + "debug": "^4.1.1", + "flatted": "^2.0.0", "rfdc": "^1.1.2", - "streamroller": "0.7.0" + "streamroller": "^1.0.4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + } } }, "lolex": { @@ -4642,8 +4672,8 @@ }, "make-dir": { "version": "1.3.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha1-ecEDO4BRW9bSTsmTPoYMp17ifww=", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { "pify": "^3.0.0" } @@ -4873,13 +4903,13 @@ }, "merge2": { "version": "1.2.3", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/merge2/-/merge2-1.2.3.tgz", - "integrity": "sha1-fumdvWm7ZIFoklPwGEiKG5ArDtU=" + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", + "integrity": "sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==" }, "micromatch": { "version": "3.1.10", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -4916,8 +4946,8 @@ }, "mimic-response": { "version": "1.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs=" + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==" }, "minimatch": { "version": "3.0.4", @@ -4944,8 +4974,8 @@ }, "mixin-deep": { "version": "1.3.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -4953,8 +4983,8 @@ "dependencies": { "is-extendable": { "version": "1.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { "is-plain-object": "^2.0.4" } @@ -5085,8 +5115,8 @@ }, "nanomatch": { "version": "1.2.13", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -5125,8 +5155,8 @@ }, "nice-try": { "version": "1.0.5", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=" + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "nock": { "version": "9.6.1", @@ -7860,7 +7890,7 @@ }, "kind-of": { "version": "3.2.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-3.2.2.tgz", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" @@ -7990,8 +8020,8 @@ }, "p-cancelable": { "version": "0.3.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/p-cancelable/-/p-cancelable-0.3.0.tgz", - "integrity": "sha1-ueEjgAvOu3rBOkeb4ZW1B7mNMPo=" + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" }, "p-finally": { "version": "1.0.0", @@ -7999,9 +8029,9 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-limit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz", - "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", + "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", "requires": { "p-try": "^2.0.0" } @@ -8023,9 +8053,9 @@ } }, "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "parse-github-repo-url": { "version": "1.4.1", @@ -8264,9 +8294,9 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "pretty-bytes": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.1.0.tgz", - "integrity": "sha512-wa5+qGVg9Yt7PB6rYm3kXlKzgzgivYTLRandezh43jjRqgyDyP+9YxfJpJiLs9yKD1WeU8/OvtToWpW7255FtA==" + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.2.0.tgz", + "integrity": "sha512-ujANBhiUsl9AhREUDUEY1GPOharMGm8x8juS7qOHybcLi7XsKfrYQ88hSly1l2i0klXHTDYrlL8ihMCG55Dc3w==" }, "process-nextick-args": { "version": "2.0.0", @@ -8450,8 +8480,8 @@ }, "regex-not": { "version": "1.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { "extend-shallow": "^3.0.2", "safe-regex": "^1.1.0" @@ -8464,8 +8494,8 @@ }, "repeat-element": { "version": "1.1.3", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=" + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" }, "repeat-string": { "version": "1.6.1", @@ -8565,8 +8595,8 @@ }, "ret": { "version": "0.1.15", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/ret/-/ret-0.1.15.tgz", - "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=" + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, "rfdc": { "version": "1.1.2", @@ -8607,9 +8637,9 @@ "dev": true }, "rxjs": { - "version": "6.3.3", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha1-PGp/pCDoRKgTkPsRWKnsYU9LrVU=", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.1.tgz", + "integrity": "sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==", "requires": { "tslib": "^1.9.0" } @@ -8656,8 +8686,8 @@ }, "set-value": { "version": "2.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -8667,7 +8697,7 @@ "dependencies": { "extend-shallow": { "version": "2.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/extend-shallow/-/extend-shallow-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" @@ -8764,8 +8794,8 @@ }, "snapdragon": { "version": "0.8.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { "base": "^0.11.1", "debug": "^2.2.0", @@ -8779,15 +8809,15 @@ "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/debug/-/debug-2.6.9.tgz", - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" } }, "define-property": { "version": "0.2.5", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/define-property/-/define-property-0.2.5.tgz", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { "is-descriptor": "^0.1.0" @@ -8795,7 +8825,7 @@ }, "extend-shallow": { "version": "2.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/extend-shallow/-/extend-shallow-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { "is-extendable": "^0.1.0" @@ -8803,20 +8833,20 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/ms/-/ms-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "source-map": { "version": "0.5.7", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/source-map/-/source-map-0.5.7.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" } } }, "snapdragon-node": { "version": "2.1.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { "define-property": "^1.0.0", "isobject": "^3.0.0", @@ -8825,7 +8855,7 @@ "dependencies": { "define-property": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/define-property/-/define-property-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { "is-descriptor": "^1.0.0" @@ -8833,24 +8863,24 @@ }, "is-accessor-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { "kind-of": "^6.0.0" } }, "is-data-descriptor": { "version": "1.0.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { "kind-of": "^6.0.0" } }, "is-descriptor": { "version": "1.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", @@ -8861,15 +8891,15 @@ }, "snapdragon-util": { "version": "3.0.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { "kind-of": "^3.2.0" }, "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-3.2.2.tgz", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" @@ -8884,8 +8914,8 @@ }, "source-map-resolve": { "version": "0.5.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", + "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { "atob": "^2.1.1", "decode-uri-component": "^0.2.0", @@ -8947,8 +8977,8 @@ }, "split-string": { "version": "3.1.0", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { "extend-shallow": "^3.0.0" } @@ -9114,14 +9144,35 @@ } }, "streamroller": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz", - "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz", + "integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==", "requires": { - "date-format": "^1.2.0", + "async": "^2.6.1", + "date-format": "^2.0.0", "debug": "^3.1.0", - "mkdirp": "^0.5.1", - "readable-stream": "^2.3.0" + "fs-extra": "^7.0.0", + "lodash": "^4.17.10" + }, + "dependencies": { + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + } } }, "string-template": { @@ -9366,7 +9417,7 @@ "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/kind-of/-/kind-of-3.2.2.tgz", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" @@ -9376,8 +9427,8 @@ }, "to-regex": { "version": "3.0.2", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { "define-property": "^2.0.2", "extend-shallow": "^3.0.2", @@ -9437,8 +9488,8 @@ }, "tslib": { "version": "1.9.3", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, "tunnel-agent": { "version": "0.6.0", @@ -9531,6 +9582,11 @@ "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", "dev": true }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -9645,8 +9701,8 @@ }, "use": { "version": "3.1.1", - "resolved": "https://na.artifactory.swg-devops.com:443/artifactory/api/npm/bmd-npm-virtual/use/-/use-3.1.1.tgz", - "integrity": "sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=" + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, "user-home": { "version": "2.0.0", @@ -9780,13 +9836,20 @@ "dev": true }, "with-open-file": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.4.tgz", - "integrity": "sha512-BswUwq/x/BYtNFMr4Uw9V+P2uroc9/tcDpZ2RdDHehzwCKJFF1PSIjJmBNfpUE3UQyJmVINRLOW49WTXQMEnvg==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.6.tgz", + "integrity": "sha512-SQS05JekbtwQSgCYlBsZn/+m2gpn4zWsqpCYIrCHva0+ojXcnmUEPsBN6Ipoz3vmY/81k5PvYEWSxER2g4BTqA==", "requires": { "p-finally": "^1.0.0", - "p-try": "^2.0.0", - "pify": "^3.0.0" + "p-try": "^2.1.0", + "pify": "^4.0.1" + }, + "dependencies": { + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" + } } }, "wordwrap": { From 5215d6c485e5b4ed7e154b2e5df7e163f7ac8bd8 Mon Sep 17 00:00:00 2001 From: Generator bot Date: Tue, 7 May 2019 18:23:52 +0000 Subject: [PATCH 5/5] chore(release): 5.14.0 --- CHANGES.md | 11 +++++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5545e479..d360cae1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,17 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +# [5.14.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.13.0...5.14.0) (2019-05-07) + + +### Features + +* swift 5 application generation ([337061c](https://github.com/IBM-Swift/generator-swiftserver/commit/337061c)) +* Swift 5.0 support ([a61ae2c](https://github.com/IBM-Swift/generator-swiftserver/commit/a61ae2c)) + + + # [5.13.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.12.1...5.13.0) (2019-04-18) diff --git a/package-lock.json b/package-lock.json index cce34cf6..631ed09a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "generator-swiftserver", - "version": "5.13.0", + "version": "5.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bf94ba18..30828c56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-swiftserver", - "version": "5.13.0", + "version": "5.14.0", "description": "Generator for Kitura REST webservice servers", "main": "app/index.js", "scripts": {