wingbot-cli - npm Package Compare versions

Comparing version 3.3.2 to 3.3.3

CHANGELOG.md

@@ -7,2 +7,6 @@ # Changelog
 
+## [3.2.2] - 10.12.2020
+### Fixed
+- removed anonymize from the bot.js
+- small bug fixes related to languages
 ## [3.2.1] - 2020-12-4
@@ -9,0 +13,0 @@ ### Fixed

package.json

 {
   "name": "wingbot-cli",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "Wingbot.ai CLI tool",
@@ -34,3 +34,3 @@ "main": "main.js",
     "JSONStream": "^1.3.5",
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.1",
     "cli-spinner": "^0.2.10",
@@ -40,3 +40,3 @@ "commander": "^6.2.0",
     "event-stream": "^4.0.1",
-    "glob": "^7.1.6",
+    "glob": "^7.1.7",
     "handlebars": "^4.7.6",
@@ -59,7 +59,7 @@ "inquirer": "^7.3.3",
     "eslint-plugin-mocha": "^8.0.0",
-    "eslint-plugin-react": "^7.21.5",
-    "jsdoc-to-markdown": "^6.0.1",
-    "mocha": "^8.2.1",
+    "eslint-plugin-react": "^7.24.0",
+    "jsdoc-to-markdown": "^7.0.1",
+    "mocha": "^9.0.1",
     "nyc": "^15.1.0",
-    "sinon": "^9.2.1"
+    "sinon": "^11.1.1"
   },
@@ -66,0 +66,0 @@ "optionalDependencies": {

src/init.js

@@ -18,9 +18,6 @@ /*
 const SERVERLESS_AWS = 'awsServerless';
-const UNIVERSAL_DOCKER = 'universalDocker';
-const UNIVERSAL_AZURE = 'universalAzure';
+const EXPRESS = 'express';
+const EXPRESS_AZURE = 'azureExpress';
+const SERVERLESS_AZURE = 'azureServerless';
 
-// const EXPRESS = 'express';
-// const EXPRESS_AZURE = 'azureExpress';
-// const SERVERLESS_AZURE = 'azureServerless';
-
 const MESSENGER = 'messenger';
@@ -49,5 +46,6 @@ const BOT_SERVICE = 'botService';
     infrastructure: {
+        'Express application': EXPRESS,
         'Serverless AWS': SERVERLESS_AWS,
-        'Universal app (docker/serverless)': UNIVERSAL_DOCKER,
-        'Universal app (azure app service/serverless)': UNIVERSAL_AZURE
+        'Azure Functions': SERVERLESS_AZURE,
+        'Azure Web Apps': EXPRESS_AZURE
     },
@@ -57,3 +55,4 @@ platform: {
         'Azure Bot Service': BOT_SERVICE,
-        'Wingbot Orchestrator': WINGBOT_ORCHESTRATOR
+        'Wingbot Orchestrator': WINGBOT_ORCHESTRATOR,
+        Webchat: WEBCHAT
     },
@@ -105,3 +104,3 @@ database: {
             .split(',')
-            .map((l) => l.trim)
+            .map((l) => l.trim())
             .filter((l) => !!l)
@@ -115,11 +114,10 @@ .map((lang, i) => ({ lang, isDefault: i === 0 }))
         hasLanguageList: languageList.length !== 0,
-        isUniversal: data[UNIVERSAL_AZURE] || data[UNIVERSAL_DOCKER],
         isMongoOrCosmos: data[MONGODB] || data[AZURE_COSMOS_DB],
-        // isAwsOrAzure: data[SERVERLESS_AWS] || data[SERVERLESS_AZURE],
-        // isAzure: data[SERVERLESS_AZURE] || data[EXPRESS_AZURE],
+        isAwsOrAzure: data[SERVERLESS_AWS] || data[SERVERLESS_AZURE],
+        isAzure: data[SERVERLESS_AZURE] || data[EXPRESS_AZURE],
         isLogzioTokenOrSentry: data[LOGZIO_TOKEN] || data[SENTRY],
         isLogzioTokenOrSentryorAppIngsights: data[LOGZIO_TOKEN]
             || data[SENTRY] || data[APP_INSIGHTS],
-        // expressOrAppService: data[EXPRESS_AZURE] || data[EXPRESS],
-        // webchatOrMessenger: data[WEBCHAT] || data[MESSENGER],
+        expressOrAppService: data[EXPRESS_AZURE] || data[EXPRESS],
+        webchatOrMessenger: data[WEBCHAT] || data[MESSENGER],
         productionDomain: data.productionDomain
@@ -184,4 +182,12 @@ ? data.productionDomain.trim()
     log(`${chalk.white('do not forget to set')} ${chalk.magenta('NODE_ENV = production')} ${chalk.white('on production environment')}`);
-    log(`${chalk.white('for deployment use')} ${chalk.magenta('npm run deploy:production')}`);
-    log(`${chalk.white('do not forget to set')} ${chalk.magenta('WEBSITE_NODE_DEFAULT_VERSION = 8.11.1')} ${chalk.white('on all environments')}`);
+    switch (data.infrastructure) {
+        case SERVERLESS_AWS:
+            log(`${chalk.white('for deployment use')} ${chalk.magenta('npm run deploy:production')}`);
+            break;
+        case EXPRESS_AZURE:
+            log(`${chalk.white('do not forget to set')} ${chalk.magenta('WEBSITE_NODE_DEFAULT_VERSION = 8.11.1')} ${chalk.white('on all environments')}`);
+            break;
+        default:
+            break;
+    }
     if (data.gSheetTestingSuit) {
@@ -251,3 +257,3 @@ log(`${chalk.white('do not forget to put')} ${chalk.magenta('google-token.json')} ${chalk.white('to project root to be able to run automated tests')}`);
         await form.ask([
-            form.list('infrastructure', form.label('Choose a deployment infrastructure')),
+            form.list('infrastructure', form.label('Choose a deployment infrastructure'), null, (key) => form.data.platform !== WEBCHAT || key === EXPRESS_AZURE),
             form.list('database', form.label('Choose a database')),
@@ -259,3 +265,3 @@ form.list('analytics', form.label('Choose an analytic tool')),
 
-        if ([UNIVERSAL_AZURE].includes(form.data.infrastructure)) {
+        if ([EXPRESS_AZURE, SERVERLESS_AZURE].includes(form.data.infrastructure)) {
             await form.ask([
@@ -320,3 +326,3 @@ form.list('keyvault', form.label('Choose if you want to use keyvault'))
                 message: form.label('Production bot domain', 'assets will be stored here', true),
-                default: form.data.infrastructure === UNIVERSAL_AZURE ? `${urlProjectName}.azurewebsites.net` : undefined
+                default: form.data.infrastructure === EXPRESS_AZURE ? `${urlProjectName}.azurewebsites.net` : undefined
             }
@@ -352,3 +358,3 @@ ]);
                     message: form.label('Staging chatbot domain', 'will set chatbot url in configuration files', true),
-                    default: form.data.infrastructure === UNIVERSAL_AZURE ? `${urlProjectName}-staging.azurewebsites.net` : undefined
+                    default: form.data.infrastructure === EXPRESS_AZURE ? `${urlProjectName}-staging.azurewebsites.net` : undefined
                 }
@@ -375,3 +381,3 @@ ]);
                     message: form.label('Dev chatbot domain', 'will set chatbot url in configuration files', true),
-                    default: form.data.infrastructure === UNIVERSAL_AZURE ? `${urlProjectName}-dev.azurewebsites.net` : undefined
+                    default: form.data.infrastructure === EXPRESS_AZURE ? `${urlProjectName}-dev.azurewebsites.net` : undefined
                 }
@@ -398,3 +404,3 @@ ]);
                     message: form.label('Test chatbot domain', 'will set chatbot url in configuration files', true),
-                    default: form.data.infrastructure === UNIVERSAL_AZURE ? `${urlProjectName}-test.azurewebsites.net` : undefined
+                    default: form.data.infrastructure === EXPRESS_AZURE ? `${urlProjectName}-test.azurewebsites.net` : undefined
                 }
@@ -1347,29 +1353,30 @@ ]);
                 break;
-            case UNIVERSAL_AZURE:
-                // await form.ask([
-                //     {
-                //         type: 'input',
-                //         message: form.group(
-                //             'Azure deployment settings',
-                //             'We will prepare an ARM template where you will be able to edit
-                // this information later',
-                //             form.label('Resource Group name')
-                //         ),
-                //         name: 'azureRgName',
-                //         default: `${form.data.bsBotName || form.data.projectName}-rg`
-                //     },
-                //     {
-                //         type: 'input',
-                //         message: form.label('Azure region'),
-                //         name: 'azureRegion',
-                //         default: 'northeurope'
-                //     },
-                //     {
-                //         type: 'input',
-                //         message: form.label('App Service name'),
-                //         name: 'azureAppName',
-                //         default: form.data.bsBotName
-                //     }
-                // ]);
+            case SERVERLESS_AZURE:
+            case EXPRESS_AZURE:
+                await form.ask([
+                    {
+                        type: 'input',
+                        message: form.group(
+                            'Azure deployment settings',
+                            'We will prepare an ARM template where you will be able to edit this information later',
+                            form.label('Resource Group name')
+                        ),
+                        name: 'azureRgName',
+                        default: `${form.data.bsBotName || form.data.projectName}-rg`
+                    },
+                    {
+                        type: 'input',
+                        message: form.label('Azure region'),
+                        name: 'azureRegion',
+                        default: 'northeurope'
+                    },
+                    {
+                        type: 'input',
+                        message: form.label('App Service name'),
+                        name: 'azureAppName',
+                        default: form.data.bsBotName
+                    }
+                ]);
                 break;
+            case EXPRESS:
             default:
@@ -1376,0 +1383,0 @@ break;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of package files

99

increased by3.13%

Lines of code

3142

increased by0.26%

Worsened metrics

Total package byte prevSize

691744

decreased by-15.95%

Dependency changes

• Updatedchalk@^4.1.1

• Updatedglob@^7.1.7