From 6398ec6aa000a8ab596f7d3a903b1a08aa18c9db Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Thu, 17 Oct 2019 17:32:08 -0300 Subject: [PATCH] build: build and publish from dist folder --- .releaserc | 10 +- .travis.yml | 3 +- dist/.gitkeep | 0 package-lock.json | 1145 +++++++++++------ package.json | 12 +- test/integration/assistant.v1.test.js | 4 +- test/integration/assistant.v2.test.js | 4 +- test/integration/compare-comply.test.js | 4 +- test/integration/discovery.test.js | 4 +- .../language-translator.v3.test.js | 4 +- .../natural-language-classifier.test.js | 4 +- .../personality-insights.v3.test.js | 4 +- test/integration/speech-to-text.test.js | 4 +- test/integration/text-to-speech.test.js | 4 +- test/integration/tone-analyzer.test.js | 4 +- ...ual-recognition.custom-classifiers.test.js | 4 +- .../integration/visual-recognition.v3.test.js | 4 +- .../integration/visual-recognition.v4.test.js | 4 +- test/unit/assistant.v1.test.js | 2 +- test/unit/assistant.v2.test.js | 2 +- test/unit/authorization.test.js | 2 +- test/unit/compare-comply.v1.test.js | 2 +- test/unit/discovery.v1.test.js | 2 +- test/unit/iam-token-manager.test.js | 2 +- test/unit/language-translator.v3.test.js | 2 +- .../natural-language-classifier.v1.test.js | 2 +- .../natural-language-understanding.v1.test.js | 2 +- test/unit/personality-insights.v3.test.js | 2 +- test/unit/speech-helpers.test.js | 4 +- test/unit/speech-to-text.v1.test.js | 2 +- test/unit/text-to-speech.v1.test.js | 2 +- test/unit/tone-analyzer.v3.test.js | 2 +- test/unit/visual-recognition.v3.test.js | 2 +- test/unit/visual-recognition.v4.test.js | 2 +- test/unit/websocket-utils.test.js | 2 +- tsconfig.json | 2 +- 36 files changed, 837 insertions(+), 423 deletions(-) delete mode 100644 dist/.gitkeep diff --git a/.releaserc b/.releaserc index 5f3fcedca4..1611393656 100644 --- a/.releaserc +++ b/.releaserc @@ -3,13 +3,15 @@ "verifyConditions": ["@semantic-release/changelog", "@semantic-release/npm", "@semantic-release/git"], "prepare": ["@semantic-release/changelog", "@semantic-release/npm", "@semantic-release/git"], "publish": [ - "@semantic-release/npm", + ["@semantic-release/npm", { + "pkgRoot": "dist" + }], { "path": "@semantic-release/github", "assets": [ - {"path": "dist/watson.js"}, - {"path": "dist/watson.min.js"} + {"path": "dist/dist/watson.js"}, + {"path": "dist/dist/watson.min.js"} ] } ] -} \ No newline at end of file +} diff --git a/.travis.yml b/.travis.yml index c07f30e9e4..bd37b93241 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,8 @@ before_install: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ ! -z ${encrypted_ac3aacad7ba8_key} ] && cd test/resources/ && tar xvf secrets.tar && cd ../.. || true' -- npm install -g typescript script: -- tsc +- npm run build - npm run test-unit-travis || travis_terminate 1 - npm run test-integration-travis || node scripts/report_integration_test.js || travis_terminate 1 - npm run check-packages diff --git a/dist/.gitkeep b/dist/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/package-lock.json b/package-lock.json index a79a6ed1b3..6c24975fa3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1596,6 +1596,29 @@ "tslib": "^1.9.3" } }, + "@snyk/cocoapods-lockfile-parser": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-2.0.4.tgz", + "integrity": "sha512-d57bajPjqCiNXMuyMmt9Zt98zbjABZUFw+91B705flzV6oB7OThgtA40Eoin6iatYoStIx28bC3T6b0mScy/iA==", + "dev": true, + "requires": { + "@snyk/dep-graph": "^1.11.0", + "@snyk/ruby-semver": "^2.0.4", + "@types/js-yaml": "^3.12.1", + "core-js": "^3.2.0", + "js-yaml": "^3.13.1", + "source-map-support": "^0.5.7", + "tslib": "^1.9.3" + }, + "dependencies": { + "core-js": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.3.2.tgz", + "integrity": "sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg==", + "dev": true + } + } + }, "@snyk/composer-lockfile-parser": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.3.tgz", @@ -1625,6 +1648,53 @@ "integrity": "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==", "dev": true }, + "@snyk/ruby-semver": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.0.4.tgz", + "integrity": "sha512-ceMD4CBS3qtAg+O0BUvkKdsheUNCqi+/+Rju243Ul8PsUgZnXmGiqfk/2z7DCprRQnxUTra4+IyeDQT7wAheCQ==", + "dev": true, + "requires": { + "lodash": "^4.17.14" + } + }, + "@snyk/snyk-cocoapods-plugin": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-1.0.3.tgz", + "integrity": "sha512-AHAA7z23nPi1eHODsDxeSkl73Ze3yphuqJjMl39ie323EzBDcb9g6uAACrk0Qn2K/K2D8uyxMAf2zDtc+JGQfw==", + "dev": true, + "requires": { + "@snyk/cli-interface": "1.5.0", + "@snyk/cocoapods-lockfile-parser": "2.0.4", + "@snyk/dep-graph": "1.13.0", + "source-map-support": "^0.5.7", + "tslib": "^1.9.3" + }, + "dependencies": { + "@snyk/cli-interface": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-1.5.0.tgz", + "integrity": "sha512-+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg==", + "dev": true, + "requires": { + "tslib": "^1.9.3" + } + }, + "@snyk/dep-graph": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.13.0.tgz", + "integrity": "sha512-e0XcLH6Kgs/lunf6iDjbxEnm9+JYFEJn6eo/PlEUW+SMWBZ2uEXHBTDNp9oxjJou48PngzWMveEkniBAN+ulOQ==", + "dev": true, + "requires": { + "graphlib": "^2.1.5", + "lodash": "^4.7.14", + "object-hash": "^1.3.1", + "semver": "^6.0.0", + "source-map-support": "^0.5.11", + "tslib": "^1.9.3" + } + } + } + }, "@types/agent-base": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@types/agent-base/-/agent-base-4.2.0.tgz", @@ -1734,6 +1804,15 @@ "@types/node": "*" } }, + "@types/ignore-walk": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-Q0pVLfFSEkAnFgXF6Sbe5pJ/cZb14tNyFcBiwkIw5nJaGw8PFMXolfWsPIxG/ja7SmEHX/DjlpruRFGnG6lbjA==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, "@types/isstream": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/@types/isstream/-/isstream-0.1.0.tgz", @@ -1764,6 +1843,12 @@ "@types/istanbul-lib-report": "*" } }, + "@types/js-yaml": { + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz", + "integrity": "sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -1771,9 +1856,9 @@ "dev": true }, "@types/node": { - "version": "11.13.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.21.tgz", - "integrity": "sha512-fLwcSjMmDnjfk4FP7/QDiNzXSCEOGNvEe9eA6vaITmC784+Gm70wF7woaFQxUb2CpMjgLBhSPyhH0oIe1JS2uw==" + "version": "11.13.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.22.tgz", + "integrity": "sha512-rOsaPRUGTOXbRBOKToy4cgZXY4Y+QSVhxcLwdEveozbk7yuudhWMpxxcaXqYizLMP3VY7OcWCFtx9lGFh5j5kg==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -1974,6 +2059,12 @@ "string-width": "^2.0.0" } }, + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + }, "ansi-escapes": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", @@ -2292,12 +2383,6 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, - "ast-types": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.2.tgz", - "integrity": "sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==", - "dev": true - }, "astral-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", @@ -2593,6 +2678,15 @@ "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, + "bl": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", + "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", + "dev": true, + "requires": { + "readable-stream": "^3.0.1" + } + }, "bluebird": { "version": "3.5.5", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", @@ -2968,12 +3062,6 @@ "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", "dev": true }, - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true - }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -3913,23 +4001,6 @@ "assert-plus": "^1.0.0" } }, - "data-uri-to-buffer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz", - "integrity": "sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==", - "dev": true, - "requires": { - "@types/node": "^8.0.7" - }, - "dependencies": { - "@types/node": { - "version": "8.10.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.54.tgz", - "integrity": "sha512-kaYyLYf6ICn6/isAyD4K1MyWWd5Q3JgH6bnMN089LUx88+s4W8GvK9Q6JMBVu5vsFFp7pMdSxdKmlBXwH/VFRg==", - "dev": true - } - } - }, "data-urls": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", @@ -4096,28 +4167,11 @@ "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", "dev": true }, - "degenerator": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz", - "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=", - "dev": true, - "requires": { - "ast-types": "0.x.x", - "escodegen": "1.x.x", - "esprima": "3.x.x" - } - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, "dependency-lint": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/dependency-lint/-/dependency-lint-5.0.1.tgz", @@ -4332,9 +4386,9 @@ "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==" }, "dotnet-deps-parser": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.5.0.tgz", - "integrity": "sha512-t6rBxcWVZSDNhhWdsbq9ozaCzfPXV79FiyES1JLNEoA7nYF+zDC2VZvFZSnH8ilU3bghJXxZPH+EcKYvfw8g/g==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.5.2.tgz", + "integrity": "sha512-bk5Q1luEwQ10rrBwZbtTxUNadaLz2dM6xzOLoTK+oUBcaq6saCeELmkIgdG+Fwkn58XRgLQvOySVS0gp4OG6RA==", "dev": true, "requires": { "@types/xml2js": "0.4.3", @@ -5078,12 +5132,6 @@ "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.7.1.tgz", "integrity": "sha512-bTrKkzzZI6wH+NXhyD3SOXtb2zXTw2SbwI2RxUlRcXVsnN7jNL5hJzVQLYv7FOQhxFkK4XWdAflEaWFpaLLWpQ==" }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -5242,6 +5290,12 @@ } } }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, "fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -5807,30 +5861,6 @@ } } }, - "ftp": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", - "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=", - "dev": true, - "requires": { - "readable-stream": "1.1.x", - "xregexp": "2.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - } - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -5876,37 +5906,6 @@ "pump": "^3.0.0" } }, - "get-uri": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.3.tgz", - "integrity": "sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==", - "dev": true, - "requires": { - "data-uri-to-buffer": "2", - "debug": "4", - "extend": "~3.0.2", - "file-uri-to-path": "1", - "ftp": "~0.3.10", - "readable-stream": "3" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", @@ -6301,19 +6300,6 @@ "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=", "dev": true }, - "http-errors": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", - "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.4", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - } - }, "http-proxy-agent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", @@ -6454,9 +6440,9 @@ } }, "ibm-cloud-sdk-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ibm-cloud-sdk-core/-/ibm-cloud-sdk-core-1.0.0.tgz", - "integrity": "sha512-J7nSKw6X68YgZnZkUP9Qzl/rYlCHVOnXDnEidNxYSyLGZ4PijXXWeTdIUNvxGt0beYj0aQH8viX6ZUSnHVKZSQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ibm-cloud-sdk-core/-/ibm-cloud-sdk-core-1.2.0.tgz", + "integrity": "sha512-TYGzf4aw0KeSwCD/yiesOKZGfw6DPLe3MKKYP6kvUDTFFxy4mdccSVw8FwNBOuRPu3nJKusPoncuMUODK9/69g==", "requires": { "@types/extend": "~3.0.0", "@types/file-type": "~5.2.1", @@ -6464,6 +6450,7 @@ "@types/node": "~10.14.19", "axios": "^0.18.0", "camelcase": "^5.3.1", + "debug": "^4.1.1", "dotenv": "^6.2.0", "extend": "~3.0.2", "file-type": "^7.7.1", @@ -6479,9 +6466,22 @@ }, "dependencies": { "@types/node": { - "version": "10.14.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.20.tgz", - "integrity": "sha512-An+MXSV8CGXz/BO9C1KKsoJ/8WDrvlNUaRMsm2h+IHZuSyQkM8U5bJJkb8ItLKA73VePG/nUK+t+EuW2IWuhsQ==" + "version": "10.14.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.22.tgz", + "integrity": "sha512-9taxKC944BqoTVjE+UT3pQH0nHZlTvITwfsOZqyc+R3sfJuxaTtxWjfn1K2UlxyPcKHf0rnaXcVFrS9F9vf0bw==" + }, + "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" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -6817,12 +6817,6 @@ "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", "dev": true }, - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true - }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", @@ -9784,12 +9778,6 @@ "integrity": "sha1-5tq3/r9a2Bbqgc9cYpxaDr3nLBo=", "dev": true }, - "netmask": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz", - "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=", - "dev": true - }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -13698,35 +13686,6 @@ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, - "pac-proxy-agent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz", - "integrity": "sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==", - "dev": true, - "requires": { - "agent-base": "^4.2.0", - "debug": "^3.1.0", - "get-uri": "^2.0.0", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", - "pac-resolver": "^3.0.0", - "raw-body": "^2.2.0", - "socks-proxy-agent": "^4.0.1" - } - }, - "pac-resolver": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz", - "integrity": "sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==", - "dev": true, - "requires": { - "co": "^4.6.0", - "degenerator": "^1.0.4", - "ip": "^1.1.5", - "netmask": "^1.0.6", - "thunkify": "^2.1.2" - } - }, "package-json": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", @@ -14113,28 +14072,6 @@ "integrity": "sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==", "dev": true }, - "proxy-agent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.0.tgz", - "integrity": "sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==", - "dev": true, - "requires": { - "agent-base": "^4.2.0", - "debug": "^3.1.0", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", - "lru-cache": "^4.1.2", - "pac-proxy-agent": "^3.0.0", - "proxy-from-env": "^1.0.0", - "socks-proxy-agent": "^4.0.1" - } - }, - "proxy-from-env": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", - "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=", - "dev": true - }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -14226,18 +14163,6 @@ "safe-buffer": "^5.1.0" } }, - "raw-body": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", - "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==", - "dev": true, - "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.3", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -15429,12 +15354,6 @@ } } }, - "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", - "dev": true - }, "sha.js": { "version": "2.4.11", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", @@ -15580,12 +15499,6 @@ "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", "dev": true }, - "smart-buffer": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz", - "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==", - "dev": true - }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -15710,13 +15623,15 @@ } }, "snyk": { - "version": "1.228.5", - "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.228.5.tgz", - "integrity": "sha512-3gC39DW/F+4vDCKL47frng0MPbwv9P1zbPFRFE2eWQXpsD1KDd2Ch3MHPamJsfqdXUNKXQwf+R5e8oFOF7YtRg==", + "version": "1.235.1", + "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.235.1.tgz", + "integrity": "sha512-wEwZd1WlsY3/9bTbiHJOTcCeYkGnGH9jrq+fUEE12c9Y3AK1OsouaMQlAbCVy+wYIe9rA4bqmjRqV3OFDPaR6A==", "dev": true, "requires": { + "@snyk/cli-interface": "^2.0.3", "@snyk/dep-graph": "1.12.0", "@snyk/gemfile": "1.2.0", + "@snyk/snyk-cocoapods-plugin": "1.0.3", "@types/agent-base": "^4.2.0", "@types/restify": "^4.3.6", "abbrev": "^1.1.1", @@ -15732,20 +15647,20 @@ "needle": "^2.2.4", "opn": "^5.5.0", "os-name": "^3.0.0", - "proxy-agent": "^3.1.0", + "proxy-agent": "*", "proxy-from-env": "^1.0.0", "semver": "^6.0.0", "snyk-config": "^2.2.1", - "snyk-docker-plugin": "1.29.1", - "snyk-go-plugin": "1.11.0", - "snyk-gradle-plugin": "^3.0.2", + "snyk-docker-plugin": "1.33.1", + "snyk-go-plugin": "1.11.1", + "snyk-gradle-plugin": "3.1.0", "snyk-module": "1.9.1", "snyk-mvn-plugin": "2.4.0", "snyk-nodejs-lockfile-parser": "1.16.0", - "snyk-nuget-plugin": "1.12.1", + "snyk-nuget-plugin": "1.13.0", "snyk-php-plugin": "1.6.4", "snyk-policy": "1.13.5", - "snyk-python-plugin": "^1.13.2", + "snyk-python-plugin": "^1.13.3", "snyk-resolve": "1.0.1", "snyk-resolve-deps": "4.4.0", "snyk-sbt-plugin": "2.8.0", @@ -15758,88 +15673,589 @@ "update-notifier": "^2.5.0", "uuid": "^3.3.2", "wrap-ansi": "^5.1.0" - } - }, - "snyk-config": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz", - "integrity": "sha512-9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==", - "dev": true, - "requires": { - "debug": "^3.1.0", - "lodash": "^4.17.15", - "nconf": "^0.10.0" - } - }, - "snyk-docker-plugin": { - "version": "1.29.1", - "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.29.1.tgz", - "integrity": "sha512-Mucc1rZ7l0U8Dykr5m6HPjau8b2H8JVtVaXGbKSZD6e/47JDJhudkgrWjsS5Yt/Zdp1weE3+4SguftFiVR971A==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "dockerfile-ast": "0.0.16", - "semver": "^6.1.0", - "tslib": "^1" }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "3.2.6", + "bundled": true, "dev": true, "requires": { "ms": "^2.1.1" } }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "snyk-go-parser": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz", - "integrity": "sha512-jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg==", - "dev": true, - "requires": { - "toml": "^3.0.0", - "tslib": "^1.9.3" - } - }, - "snyk-go-plugin": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.11.0.tgz", - "integrity": "sha512-9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "graphlib": "^2.1.1", - "snyk-go-parser": "1.3.1", - "tmp": "0.0.33", - "tslib": "^1.10.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "esprima": { + "version": "4.0.1", + "bundled": true + }, + "inherits": { + "version": "2.0.4", + "bundled": true + }, + "lru-cache": { + "version": "4.1.5", + "bundled": true, "dev": true, "requires": { - "ms": "^2.1.1" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "bundled": true, "dev": true - } - } - }, + }, + "prelude-ls": { + "version": "1.1.2", + "bundled": true + }, + "proxy-agent": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "agent-base": "^4.2.0", + "debug": "^3.1.0", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent-snyk-fork": "*", + "lru-cache": "^4.1.2", + "pac-proxy-agent": "*", + "proxy-from-env": "^1.0.0", + "socks-proxy-agent": "^4.0.1" + }, + "dependencies": { + "agent-base": { + "version": "4.3.0", + "bundled": true, + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + }, + "ast-types": { + "version": "0.13.2", + "bundled": true, + "dev": true + }, + "bytes": { + "version": "3.1.0", + "bundled": true, + "dev": true + }, + "co": { + "version": "4.6.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "data-uri-to-buffer": { + "version": "2.0.2", + "bundled": true, + "dev": true + }, + "debug": { + "version": "3.2.6", + "bundled": true, + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-is": { + "version": "0.1.3", + "bundled": true, + "dev": true + }, + "degenerator": { + "version": "1.0.4", + "bundled": true, + "dev": true, + "requires": { + "ast-types": "0.x.x", + "escodegen": "1.x.x", + "esprima": "3.x.x" + } + }, + "depd": { + "version": "1.1.2", + "bundled": true, + "dev": true + }, + "es6-promise": { + "version": "4.2.8", + "bundled": true, + "dev": true + }, + "es6-promisify": { + "version": "5.0.0", + "bundled": true, + "dev": true, + "requires": { + "es6-promise": "^4.0.3" + } + }, + "escodegen": { + "version": "1.12.0", + "bundled": true, + "dev": true, + "requires": { + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "esprima": { + "version": "3.1.3", + "bundled": true, + "dev": true + }, + "estraverse": { + "version": "4.3.0", + "bundled": true, + "dev": true + }, + "esutils": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "extend": { + "version": "3.0.2", + "bundled": true, + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "bundled": true, + "dev": true + }, + "file-uri-to-path": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "ftp": { + "version": "0.3.10", + "bundled": true, + "dev": true, + "requires": { + "readable-stream": "1.1.x", + "xregexp": "2.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "1.1.14", + "bundled": true, + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + } + } + }, + "get-uri": { + "version": "2.0.3", + "bundled": true, + "dev": true, + "requires": { + "data-uri-to-buffer": "2", + "debug": "4", + "extend": "~3.0.2", + "file-uri-to-path": "1", + "ftp": "~0.3.10", + "readable-stream": "3" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, + "http-errors": { + "version": "1.7.3", + "bundled": true, + "dev": true, + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, + "http-proxy-agent": { + "version": "2.1.0", + "bundled": true, + "dev": true, + "requires": { + "agent-base": "4", + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "bundled": true, + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true + } + } + }, + "https-proxy-agent-snyk-fork": { + "version": "2.2.2-fixed-mitm-vuln", + "bundled": true, + "dev": true, + "requires": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + } + }, + "iconv-lite": { + "version": "0.4.24", + "bundled": true, + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true + }, + "ip": { + "version": "1.1.5", + "bundled": true, + "dev": true + }, + "isarray": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "levn": { + "version": "0.3.0", + "bundled": true, + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "ms": { + "version": "2.1.2", + "bundled": true, + "dev": true + }, + "netmask": { + "version": "1.0.6", + "bundled": true, + "dev": true + }, + "optionator": { + "version": "0.8.2", + "bundled": true, + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" + } + }, + "pac-proxy-agent": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "agent-base": "^4.2.0", + "debug": "^3.1.0", + "get-uri": "^2.0.0", + "http-proxy-agent": "^2.1.0", + "pac-resolver": "^3.0.0", + "raw-body": "^2.2.0", + "socks-proxy-agent": "^4.0.1" + } + }, + "pac-resolver": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "co": "^4.6.0", + "degenerator": "^1.0.4", + "ip": "^1.1.5", + "netmask": "^1.0.6", + "thunkify": "^2.1.2" + } + }, + "prelude-ls": { + "version": "1.1.2", + "bundled": true, + "dev": true + }, + "raw-body": { + "version": "2.4.1", + "bundled": true, + "dev": true, + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.3", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "readable-stream": { + "version": "3.4.0", + "bundled": true, + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "dependencies": { + "string_decoder": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + } + } + } + }, + "safe-buffer": { + "version": "5.2.0", + "bundled": true, + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true + }, + "setprototypeof": { + "version": "1.1.1", + "bundled": true, + "dev": true + }, + "smart-buffer": { + "version": "4.0.2", + "bundled": true, + "dev": true + }, + "socks": { + "version": "2.3.2", + "bundled": true, + "dev": true, + "requires": { + "ip": "^1.1.5", + "smart-buffer": "4.0.2" + } + }, + "socks-proxy-agent": { + "version": "4.0.2", + "bundled": true, + "dev": true, + "requires": { + "agent-base": "~4.2.1", + "socks": "~2.3.2" + }, + "dependencies": { + "agent-base": { + "version": "4.2.1", + "bundled": true, + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } + } + } + }, + "source-map": { + "version": "0.6.1", + "bundled": true, + "dev": true, + "optional": true + }, + "statuses": { + "version": "1.5.0", + "bundled": true, + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "bundled": true, + "dev": true + }, + "thunkify": { + "version": "2.1.2", + "bundled": true, + "dev": true + }, + "toidentifier": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "type-check": { + "version": "0.3.2", + "bundled": true, + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "unpipe": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "wordwrap": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "xregexp": { + "version": "2.0.0", + "bundled": true, + "dev": true + } + } + }, + "proxy-from-env": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "type-check": { + "version": "0.3.2", + "bundled": true, + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "yallist": { + "version": "2.1.2", + "bundled": true, + "dev": true + } + } + }, + "snyk-config": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz", + "integrity": "sha512-9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==", + "dev": true, + "requires": { + "debug": "^3.1.0", + "lodash": "^4.17.15", + "nconf": "^0.10.0" + } + }, + "snyk-docker-plugin": { + "version": "1.33.1", + "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.33.1.tgz", + "integrity": "sha512-xfs3DN1tPMTh6J8x2341wGK4HRr+pI5+i/YRuRmsslnBnwk/DkKYcbt8zOIWk6kzMoW8vo+9LqqXBQO/24szKg==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "dockerfile-ast": "0.0.16", + "semver": "^6.1.0", + "tar-stream": "^2.1.0", + "tslib": "^1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "snyk-go-parser": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz", + "integrity": "sha512-jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg==", + "dev": true, + "requires": { + "toml": "^3.0.0", + "tslib": "^1.9.3" + } + }, + "snyk-go-plugin": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz", + "integrity": "sha512-IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "graphlib": "^2.1.1", + "snyk-go-parser": "1.3.1", + "tmp": "0.0.33", + "tslib": "^1.10.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "snyk-gradle-plugin": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz", @@ -15915,13 +16331,13 @@ } }, "snyk-nuget-plugin": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.12.1.tgz", - "integrity": "sha512-QuANQxBjTGj3hEf2YpEQ0WuI4Yq/93boqWUs4eoSTfDyBRFgIkUP6fLkzNldrkL8fQbcagqQ2Xz8M9IEKRQtMg==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.0.tgz", + "integrity": "sha512-9PrsN6kSz79lKUlpfqAYvMtac7HYbscf4OJ5LTzTcPn2XRs24NCTZylUUpilkSY0r2DyDLY18cl+qHHjfJKnig==", "dev": true, "requires": { "debug": "^3.1.0", - "dotnet-deps-parser": "4.5.0", + "dotnet-deps-parser": "4.5.2", "jszip": "^3.1.5", "lodash": "^4.17.14", "snyk-paket-parser": "1.5.0", @@ -15974,12 +16390,12 @@ } }, "snyk-python-plugin": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.13.2.tgz", - "integrity": "sha512-G9R1cYHw0E/VSx9tFa5nZp+653FIMXheteidrF3hjUe71jRdJELEUV/z5jxqYEWEFemcwGhMfW87De91GChVIQ==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.13.3.tgz", + "integrity": "sha512-Ud7mHmpMG4uCChvYLx5jA8HwOV/FNpT65xTxSt+6wsOjIUTuLiqM86mbvgzgk3pir8vMP9yQEsCi1i0zYLBArw==", "dev": true, "requires": { - "@snyk/cli-interface": "^2.0.2", + "@snyk/cli-interface": "^2.0.3", "tmp": "0.0.33" } }, @@ -16091,37 +16507,6 @@ "then-fs": "^2.0.0" } }, - "socks": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz", - "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==", - "dev": true, - "requires": { - "ip": "^1.1.5", - "smart-buffer": "4.0.2" - } - }, - "socks-proxy-agent": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", - "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", - "dev": true, - "requires": { - "agent-base": "~4.2.1", - "socks": "~2.3.2" - }, - "dependencies": { - "agent-base": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", - "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } - } - } - }, "sorted-object": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz", @@ -16284,12 +16669,6 @@ } } }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "dev": true - }, "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -16692,6 +17071,19 @@ "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=", "dev": true }, + "tar-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", + "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", + "dev": true, + "requires": { + "bl": "^3.0.0", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, "teeny-request": { "version": "3.11.3", "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz", @@ -16910,12 +17302,6 @@ } } }, - "thunkify": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz", - "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=", - "dev": true - }, "timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", @@ -16982,12 +17368,6 @@ "is-number": "^7.0.0" } }, - "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "dev": true - }, "toml": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz", @@ -17053,6 +17433,49 @@ "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", "dev": true }, + "tsc-publish": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/tsc-publish/-/tsc-publish-0.5.1.tgz", + "integrity": "sha512-iRM1VpDacFnoghS2FPib6hTuvhfr9mylsOfGVJpYKa/ns3+2m2/93F4bNzMWIZCD2GLv+lECcYQGTrvKxjkBAA==", + "dev": true, + "requires": { + "@types/ignore-walk": "^3.0.1", + "@types/node": "^12.11.1", + "ansi-colors": "^4.1.1", + "commander": "^3.0.0", + "ignore-walk": "^3.0.3", + "strip-json-comments": "^3.0.1" + }, + "dependencies": { + "@types/node": { + "version": "12.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz", + "integrity": "sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A==", + "dev": true + }, + "commander": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz", + "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==", + "dev": true + }, + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "dev": true, + "requires": { + "minimatch": "^3.0.4" + } + }, + "strip-json-comments": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "dev": true + } + } + }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -17237,9 +17660,9 @@ } }, "typescript": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", - "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz", + "integrity": "sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==", "dev": true }, "uc.micro": { @@ -17335,12 +17758,6 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true - }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -17843,12 +18260,6 @@ "integrity": "sha512-MjGsXhKG8YjTKrDCXseFo3ClbMGvUD4en29H2Cev1dv4P/chlpw6KdYmlCWDkhosBVKRDjM836+3e3pm1cBNJA==", "dev": true }, - "xregexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", - "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=", - "dev": true - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index 0cd27666b5..d63bc7b50c 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "prettier": "^1.17.1", "semantic-release": "^15.13.12", "snyk": "^1.192.4", + "tsc-publish": "^0.5.1", "tslint": "^5.16.0", "tslint-config-prettier": "^1.18.0", "tslint-eslint-rules": "^5.4.0", @@ -102,11 +103,12 @@ "eslint:fix": "eslint . --fix", "eslint:check": "eslint . --cache", "lint": "npm run eslint:check && npm run tslint:check && dependency-lint", - "browserify": "browserify sdk.js --standalone Watson --outfile dist/watson.js", - "build": "tsc", + "browserify": "browserify dist/sdk.js --standalone Watson --outfile dist/dist/watson.js", + "build": "tsc && cp package.json dist/", "doc": "jsdoc -c scripts/jsdoc/config.json", - "minify": "uglifyjs --compress --mangle --output dist/watson.min.js --preamble \"// Watson Developer Cloud\n// JavaScript SDK$npm_package_version\n// Generated at `date`\n// Copyright IBM ($npm_package_license)\n// $npm_package_homepage\" -- dist/watson.js", - "prepublishOnly": "npm run build && npm run browserify && npm run minify", + "minify": "uglifyjs --compress --mangle --output dist/dist/watson.min.js --preamble \"// Watson Developer Cloud\n// JavaScript SDK$npm_package_version\n// Generated at `date`\n// Copyright IBM ($npm_package_license)\n// $npm_package_homepage\" -- dist/dist/watson.js", + "tsc-publish-dry": "tsc-publish --no-checks --dry-run", + "postversion": "npm run tsc-publish-dry && npm run browserify && npm run minify", "test-integration": "jest test/integration", "test-unit": "jest test/unit/", "test": "jest test/", @@ -115,7 +117,7 @@ "report-coverage": "codecov", "watch-doc": "nodemon --watch ./ --ext js,tmpl,json --ignore dist/ --ignore doc/ --ignore test/ --ignore examples/ --exec npm run doc", "watch": "npm run test-unit -- --watch", - "watchify": "watchify sdk.js --standalone Watson --outfile dist/watson.js --debug --verbose", + "watchify": "watchify dist/sdk.js --standalone Watson --outfile dist/dist/watson.js --debug --verbose", "check-packages": "installed-check -e -d", "snyk-protect": "snyk protect" }, diff --git a/test/integration/assistant.v1.test.js b/test/integration/assistant.v1.test.js index 73dcc80cbe..cfbd075ad0 100644 --- a/test/integration/assistant.v1.test.js +++ b/test/integration/assistant.v1.test.js @@ -1,7 +1,7 @@ 'use strict'; -const AssistantV1 = require('../../assistant/v1'); -const { IamAuthenticator } = require('../../auth'); +const AssistantV1 = require('../../dist/assistant/v1'); +const { IamAuthenticator } = require('../../dist/auth'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/assistant.v2.test.js b/test/integration/assistant.v2.test.js index 1944f2879f..3ba9fe0e5b 100644 --- a/test/integration/assistant.v2.test.js +++ b/test/integration/assistant.v2.test.js @@ -1,7 +1,7 @@ 'use strict'; -const AssistantV2 = require('../../assistant/v2'); -const { IamAuthenticator } = require('../../auth'); +const AssistantV2 = require('../../dist/assistant/v2'); +const { IamAuthenticator } = require('../../dist/auth'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/compare-comply.test.js b/test/integration/compare-comply.test.js index 6f575ce6a1..643135c410 100644 --- a/test/integration/compare-comply.test.js +++ b/test/integration/compare-comply.test.js @@ -1,8 +1,8 @@ 'use strict'; const fs = require('fs'); -const { IamAuthenticator } = require('../../auth'); -const CompareComply = require('../../compare-comply/v1'); +const { IamAuthenticator } = require('../../dist/auth'); +const CompareComply = require('../../dist/compare-comply/v1'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/discovery.test.js b/test/integration/discovery.test.js index 3217f255ee..f877b3b201 100644 --- a/test/integration/discovery.test.js +++ b/test/integration/discovery.test.js @@ -1,7 +1,7 @@ 'use strict'; -const { IamAuthenticator } = require('../../auth'); -const DiscoveryV1 = require('../../discovery/v1'); +const { IamAuthenticator } = require('../../dist/auth'); +const DiscoveryV1 = require('../../dist/discovery/v1'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) const async = require('async'); diff --git a/test/integration/language-translator.v3.test.js b/test/integration/language-translator.v3.test.js index d3ad9273b2..788de865e0 100644 --- a/test/integration/language-translator.v3.test.js +++ b/test/integration/language-translator.v3.test.js @@ -1,8 +1,8 @@ 'use strict'; const fs = require('fs'); -const { IamAuthenticator } = require('../../auth'); -const LanguageTranslatorV3 = require('../../language-translator/v3'); +const { IamAuthenticator } = require('../../dist/auth'); +const LanguageTranslatorV3 = require('../../dist/language-translator/v3'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) const TWENTY_SECONDS = 20000; diff --git a/test/integration/natural-language-classifier.test.js b/test/integration/natural-language-classifier.test.js index 9b5fa962ba..a71811ac47 100644 --- a/test/integration/natural-language-classifier.test.js +++ b/test/integration/natural-language-classifier.test.js @@ -1,7 +1,7 @@ 'use strict'; -const { IamAuthenticator } = require('../../auth'); -const NaturalLanguageClassifierV1 = require('../../natural-language-classifier/v1'); +const { IamAuthenticator } = require('../../dist/auth'); +const NaturalLanguageClassifierV1 = require('../../dist/natural-language-classifier/v1'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) const TWENTY_SECONDS = 20000; diff --git a/test/integration/personality-insights.v3.test.js b/test/integration/personality-insights.v3.test.js index 1464390920..5c528a19e7 100644 --- a/test/integration/personality-insights.v3.test.js +++ b/test/integration/personality-insights.v3.test.js @@ -1,8 +1,8 @@ 'use strict'; const fs = require('fs'); -const { IamAuthenticator } = require('../../auth'); -const PersonalityInsightsV3 = require('../../personality-insights/v3'); +const { IamAuthenticator } = require('../../dist/auth'); +const PersonalityInsightsV3 = require('../../dist/personality-insights/v3'); const path = require('path'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/speech-to-text.test.js b/test/integration/speech-to-text.test.js index 1d88945a85..74c48c44ae 100644 --- a/test/integration/speech-to-text.test.js +++ b/test/integration/speech-to-text.test.js @@ -1,9 +1,9 @@ 'use strict'; -const { IamAuthenticator } = require('../../auth'); +const { IamAuthenticator } = require('../../dist/auth'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) -const SpeechToTextV1 = require('../../speech-to-text/v1'); +const SpeechToTextV1 = require('../../dist/speech-to-text/v1'); const fs = require('fs'); const concat = require('concat-stream'); const path = require('path'); diff --git a/test/integration/text-to-speech.test.js b/test/integration/text-to-speech.test.js index 196d3f33a8..efccaf80ec 100644 --- a/test/integration/text-to-speech.test.js +++ b/test/integration/text-to-speech.test.js @@ -1,7 +1,7 @@ 'use strict'; -const { IamAuthenticator } = require('../../auth'); -const TextToSpeechV1 = require('../../text-to-speech/v1'); +const { IamAuthenticator } = require('../../dist/auth'); +const TextToSpeechV1 = require('../../dist/text-to-speech/v1'); const wav = require('wav'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/tone-analyzer.test.js b/test/integration/tone-analyzer.test.js index f6c587d327..be8586c8a3 100644 --- a/test/integration/tone-analyzer.test.js +++ b/test/integration/tone-analyzer.test.js @@ -1,8 +1,8 @@ 'use strict'; const fs = require('fs'); -const { IamAuthenticator } = require('../../auth'); -const ToneAnalyzerV3 = require('../../tone-analyzer/v3'); +const { IamAuthenticator } = require('../../dist/auth'); +const ToneAnalyzerV3 = require('../../dist/tone-analyzer/v3'); const path = require('path'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/visual-recognition.custom-classifiers.test.js b/test/integration/visual-recognition.custom-classifiers.test.js index 96f400decb..ffa0aecd3d 100644 --- a/test/integration/visual-recognition.custom-classifiers.test.js +++ b/test/integration/visual-recognition.custom-classifiers.test.js @@ -1,7 +1,7 @@ 'use strict'; const fs = require('fs'); -const { IamAuthenticator } = require('../../auth'); -const VisualRecognitionV3 = require('../../visual-recognition/v3'); +const { IamAuthenticator } = require('../../dist/auth'); +const VisualRecognitionV3 = require('../../dist/visual-recognition/v3'); const path = require('path'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/visual-recognition.v3.test.js b/test/integration/visual-recognition.v3.test.js index 579977cdf5..68ba911381 100644 --- a/test/integration/visual-recognition.v3.test.js +++ b/test/integration/visual-recognition.v3.test.js @@ -1,7 +1,7 @@ 'use strict'; const fs = require('fs'); -const { IamAuthenticator } = require('../../auth'); -const VisualRecognitionV3 = require('../../visual-recognition/v3'); +const { IamAuthenticator } = require('../../dist/auth'); +const VisualRecognitionV3 = require('../../dist/visual-recognition/v3'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/integration/visual-recognition.v4.test.js b/test/integration/visual-recognition.v4.test.js index c7dc542cb5..d7178ad030 100644 --- a/test/integration/visual-recognition.v4.test.js +++ b/test/integration/visual-recognition.v4.test.js @@ -17,8 +17,8 @@ const fs = require('fs'); const isStream = require('isstream'); -const { IamAuthenticator } = require('../../auth'); -const VisualRecognitionV4 = require('../../visual-recognition/v4'); +const { IamAuthenticator } = require('../../dist/auth'); +const VisualRecognitionV4 = require('../../dist/visual-recognition/v4'); const authHelper = require('../resources/auth_helper.js'); const describe = authHelper.describe; // this runs describe.skip if there is no auth.js file :) diff --git a/test/unit/assistant.v1.test.js b/test/unit/assistant.v1.test.js index a2d28dc9e8..98f100a473 100644 --- a/test/unit/assistant.v1.test.js +++ b/test/unit/assistant.v1.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const AssistantV1 = require('../../assistant/v1'); +const AssistantV1 = require('../../dist/assistant/v1'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/assistant.v2.test.js b/test/unit/assistant.v2.test.js index 78c17f4988..93e9c1572b 100644 --- a/test/unit/assistant.v2.test.js +++ b/test/unit/assistant.v2.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const AssistantV2 = require('../../assistant/v2'); +const AssistantV2 = require('../../dist/assistant/v2'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/authorization.test.js b/test/unit/authorization.test.js index 03dad5f710..bfb6f9670e 100644 --- a/test/unit/authorization.test.js +++ b/test/unit/authorization.test.js @@ -1,6 +1,6 @@ 'use strict'; -const Authorization = require('../../authorization/v1'); +const Authorization = require('../../dist/authorization/v1'); const { BasicAuthenticator, IamAuthenticator } = require('ibm-cloud-sdk-core'); describe('authorization', function() { diff --git a/test/unit/compare-comply.v1.test.js b/test/unit/compare-comply.v1.test.js index 922c0804bc..ef39082941 100644 --- a/test/unit/compare-comply.v1.test.js +++ b/test/unit/compare-comply.v1.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const CompareComplyV1 = require('../../compare-comply/v1'); +const CompareComplyV1 = require('../../dist/compare-comply/v1'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/discovery.v1.test.js b/test/unit/discovery.v1.test.js index 3e3a9b281c..6959c30b2c 100644 --- a/test/unit/discovery.v1.test.js +++ b/test/unit/discovery.v1.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const DiscoveryV1 = require('../../discovery/v1'); +const DiscoveryV1 = require('../../dist/discovery/v1'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/iam-token-manager.test.js b/test/unit/iam-token-manager.test.js index ebf6da34f2..128339f37b 100644 --- a/test/unit/iam-token-manager.test.js +++ b/test/unit/iam-token-manager.test.js @@ -1,5 +1,5 @@ 'use strict'; -const { IamTokenManager } = require('../../auth'); +const { IamTokenManager } = require('../../dist/auth'); describe('iam token manager', () => { it('should correctly export the token manager from the core module', () => { diff --git a/test/unit/language-translator.v3.test.js b/test/unit/language-translator.v3.test.js index 84eb18af40..4cd4706191 100644 --- a/test/unit/language-translator.v3.test.js +++ b/test/unit/language-translator.v3.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const LanguageTranslatorV3 = require('../../language-translator/v3'); +const LanguageTranslatorV3 = require('../../dist/language-translator/v3'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/natural-language-classifier.v1.test.js b/test/unit/natural-language-classifier.v1.test.js index 0408be069d..8998c54ac4 100644 --- a/test/unit/natural-language-classifier.v1.test.js +++ b/test/unit/natural-language-classifier.v1.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const NaturalLanguageClassifierV1 = require('../../natural-language-classifier/v1'); +const NaturalLanguageClassifierV1 = require('../../dist/natural-language-classifier/v1'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/natural-language-understanding.v1.test.js b/test/unit/natural-language-understanding.v1.test.js index a9bc5a279c..a57fbd4694 100644 --- a/test/unit/natural-language-understanding.v1.test.js +++ b/test/unit/natural-language-understanding.v1.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const NaturalLanguageUnderstandingV1 = require('../../natural-language-understanding/v1'); +const NaturalLanguageUnderstandingV1 = require('../../dist/natural-language-understanding/v1'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/personality-insights.v3.test.js b/test/unit/personality-insights.v3.test.js index 35aaa79837..e4072ad29a 100644 --- a/test/unit/personality-insights.v3.test.js +++ b/test/unit/personality-insights.v3.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const PersonalityInsightsV3 = require('../../personality-insights/v3'); +const PersonalityInsightsV3 = require('../../dist/personality-insights/v3'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/speech-helpers.test.js b/test/unit/speech-helpers.test.js index 8d002dd527..3fcdfc2a39 100644 --- a/test/unit/speech-helpers.test.js +++ b/test/unit/speech-helpers.test.js @@ -3,8 +3,8 @@ const { BasicAuthenticator } = require('ibm-cloud-sdk-core'); const isStream = require('isstream'); const websocket = require('websocket'); -const SpeechToTextV1 = require('../../speech-to-text/v1'); -const TextToSpeechV1 = require('../../text-to-speech/v1'); +const SpeechToTextV1 = require('../../dist/speech-to-text/v1'); +const TextToSpeechV1 = require('../../dist/text-to-speech/v1'); const url = 'http://ibm.com:80'; const version = 'v1'; diff --git a/test/unit/speech-to-text.v1.test.js b/test/unit/speech-to-text.v1.test.js index a694abd96a..48094b8882 100644 --- a/test/unit/speech-to-text.v1.test.js +++ b/test/unit/speech-to-text.v1.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const SpeechToTextV1 = require('../../speech-to-text/v1'); +const SpeechToTextV1 = require('../../dist/speech-to-text/v1'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/text-to-speech.v1.test.js b/test/unit/text-to-speech.v1.test.js index 5f730af70b..fee31fd1e5 100644 --- a/test/unit/text-to-speech.v1.test.js +++ b/test/unit/text-to-speech.v1.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const TextToSpeechV1 = require('../../text-to-speech/v1'); +const TextToSpeechV1 = require('../../dist/text-to-speech/v1'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/tone-analyzer.v3.test.js b/test/unit/tone-analyzer.v3.test.js index 18def53d77..aa2ac05c8e 100644 --- a/test/unit/tone-analyzer.v3.test.js +++ b/test/unit/tone-analyzer.v3.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const ToneAnalyzerV3 = require('../../tone-analyzer/v3'); +const ToneAnalyzerV3 = require('../../dist/tone-analyzer/v3'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/visual-recognition.v3.test.js b/test/unit/visual-recognition.v3.test.js index dfb0786f84..fe8aee8ba9 100644 --- a/test/unit/visual-recognition.v3.test.js +++ b/test/unit/visual-recognition.v3.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const VisualRecognitionV3 = require('../../visual-recognition/v3'); +const VisualRecognitionV3 = require('../../dist/visual-recognition/v3'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/visual-recognition.v4.test.js b/test/unit/visual-recognition.v4.test.js index 2a03ce182a..07364a7dbf 100644 --- a/test/unit/visual-recognition.v4.test.js +++ b/test/unit/visual-recognition.v4.test.js @@ -17,7 +17,7 @@ const helper = require('ibm-cloud-sdk-core'); // for mocking `getMissingParams` const { NoAuthAuthenticator } = require('ibm-cloud-sdk-core'); -const VisualRecognitionV4 = require('../../visual-recognition/v4'); +const VisualRecognitionV4 = require('../../dist/visual-recognition/v4'); const utils = require('../resources/unitTestUtils'); const { diff --git a/test/unit/websocket-utils.test.js b/test/unit/websocket-utils.test.js index bc7e4d0fe7..b8fdae959f 100644 --- a/test/unit/websocket-utils.test.js +++ b/test/unit/websocket-utils.test.js @@ -16,7 +16,7 @@ 'use strict'; -const { processUserParameters } = require('../../lib/websocket-utils'); +const { processUserParameters } = require('../../dist/lib/websocket-utils'); describe('websocket utility functions', () => { describe('processUserParameters', () => { diff --git a/tsconfig.json b/tsconfig.json index e22c9ffddd..85c5f6b400 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,7 @@ "declaration": true, /* Generates corresponding '.d.ts' file. */ // "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./", /* Redirect output structure to the directory. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "removeComments": true, /* Do not emit comments to output. */ // "noEmit": true, /* Do not emit outputs. */