From f9ccd5c6a7af8589f4894b13b18ee02a6bd0536c Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (pragmatismo.io)" Date: Sun, 18 Nov 2018 22:03:46 -0200 Subject: [PATCH] fix(CI): default.gbui compilation issues. --- .gitignore | 28 ++++--- .npmignore | 26 +++--- package.json | 2 +- packages/default.gbui/package-lock.json | 107 ++++++++++-------------- packages/default.gbui/package.json | 8 +- 5 files changed, 79 insertions(+), 92 deletions(-) diff --git a/.gitignore b/.gitignore index 471f32856..d8b6f2096 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,15 @@ -.coveralls.yml -.env -.npmrc -.nyc_output -coverage -dist -docs -guaribas.log -guaribas.sqlite -node_modules -packages/default.gbui/build -tmp -work \ No newline at end of file +/.coveralls.yml +/.env +/.npmrc +/.nyc_output +/coverage +/dist +/docs +/guaribas.log +/guaribas.sqlite +/node_modules +/packages/default.gbui/build +/packages/default.gbui/.env +/packages/default.gbui/node_modules +/tmp +/work diff --git a/.npmignore b/.npmignore index 71da632ca..f53c5db3f 100644 --- a/.npmignore +++ b/.npmignore @@ -1,13 +1,15 @@ # This file must be a copy of .gitignore except for the WILLSHIP commented lines below. -.coveralls.yml -.env -.npmrc -# WILLSHIP .nyc_output -coverage -# WILLSHIP dist -guaribas.log -guaribas.sqlite -node_modules -# WILLSHIP packages/default.gbui/build -tmp -work \ No newline at end of file +/.coveralls.yml +/.env +/.npmrc +# WILLSHIP /.nyc_output +/coverage +# WILLSHIP /dist +/guaribas.log +/guaribas.sqlite +/node_modules +# WILLSHIP /packages/default.gbui/build +/packages/default.gbui/.env +/packages/default.gbui/node_modules +/tmp +/work diff --git a/package.json b/package.json index c9df75f23..93cfb7aed 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "tslint": "tslint --fix ./src/*.ts ./packages/**/*.ts -t verbose", "build": "npm install && npm run build-server && npm run build-gbui && npm run build-docs", "build-server": "tsc", - "build-gbui": "cd packages/default.gbui && npm install && npm run build", + "build-gbui": "cd packages/default.gbui && echo SKIP_PREFLIGHT_CHECK=true >.env && npm install && npm run build", "build-docs": "typedoc --options typedoc.json src/", "test": "nyc --reporter=html --reporter=text mocha -r ts-node/register packages/**/*.test.ts ", "pretest": "npm run build", diff --git a/packages/default.gbui/package-lock.json b/packages/default.gbui/package-lock.json index ec645addc..c787988b6 100644 --- a/packages/default.gbui/package-lock.json +++ b/packages/default.gbui/package-lock.json @@ -1144,9 +1144,9 @@ "integrity": "sha1-tfUGMfjWzsi9IMljljr7VeBsvOk=" }, "ajv": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz", - "integrity": "sha1-JH1SdBENtlNwa1UPzCt5fKKM/Fk=", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz", + "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==", "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -1745,19 +1745,6 @@ "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==" }, - "babel-eslint": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-9.0.0.tgz", - "integrity": "sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "^1.0.0" - } - }, "babel-extract-comments": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz", @@ -5698,8 +5685,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -5717,13 +5703,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5736,18 +5720,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -5850,8 +5831,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -5861,7 +5841,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5874,20 +5853,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.2.4", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -5904,7 +5880,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5977,8 +5952,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -5988,7 +5962,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6064,8 +6037,7 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -6095,7 +6067,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6113,7 +6084,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6152,13 +6122,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.2", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -8269,7 +8237,7 @@ "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stable-stringify": { "version": "1.0.1", @@ -11435,14 +11403,14 @@ } }, "react": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.6.0.tgz", - "integrity": "sha512-zJPnx/jKtuOEXCbQ9BKaxDMxR0001/hzxXwYxG8septeyYGfsgAei6NgfbVgOhbY1WOP2o3VPs/E9HaN+9hV3Q==", + "version": "16.6.3", + "resolved": "https://registry.npmjs.org/react/-/react-16.6.3.tgz", + "integrity": "sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.2" }, "dependencies": { "prop-types": { @@ -11612,14 +11580,14 @@ } }, "react-dom": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.0.tgz", - "integrity": "sha512-Stm2D9dXEUUAQdvpvhvFj/DEXwC2PAL/RwEMhoN4dvvD2ikTlJegEXf97xryg88VIAU22ZAP7n842l+9BTz6+w==", + "version": "16.6.3", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.3.tgz", + "integrity": "sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.2" }, "dependencies": { "prop-types": { @@ -11669,9 +11637,9 @@ "integrity": "sha1-TxonOv38jzSIqMUWv9p4+HI1I2I=" }, "react-player": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/react-player/-/react-player-1.6.6.tgz", - "integrity": "sha1-M23jIPyMBhDY8ikuwWsAVjEqGWQ=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/react-player/-/react-player-1.7.0.tgz", + "integrity": "sha512-cpnu9TanZ6VXCK0lABOyWfO4FK8CIFf5tEFLm4yVkzDU2OkBUcXcsA7+MmCLMaKZor6pvXUZa6uxmyJCZ+SQrw==", "requires": { "deepmerge": "^2.0.1", "load-script": "^1.0.0", @@ -11764,6 +11732,21 @@ "webpack-dev-server": "3.1.9", "webpack-manifest-plugin": "2.0.4", "workbox-webpack-plugin": "3.6.3" + }, + "dependencies": { + "babel-eslint": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-9.0.0.tgz", + "integrity": "sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==", + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.0.0", + "@babel/traverse": "^7.0.0", + "@babel/types": "^7.0.0", + "eslint-scope": "3.7.1", + "eslint-visitor-keys": "^1.0.0" + } + } } }, "react-scroll-to-bottom": { @@ -12976,9 +12959,9 @@ } }, "scheduler": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.10.0.tgz", - "integrity": "sha512-+TSTVTCBAA3h8Anei3haDc1IRwMeDmtI/y/o3iBe3Mjl2vwYF9DtPDt929HyRmV/e7au7CLu8sc4C4W0VOs29w==", + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.2.tgz", + "integrity": "sha512-+WCP3s3wOaW4S7C1tl3TEXp4l9lJn0ZK8G3W3WKRWmw77Z2cIFUW2MiNTMHn5sCjxN+t7N43HAOOgMjyAg5hlg==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -14498,7 +14481,7 @@ "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "requires": { "punycode": "^2.1.0" } diff --git a/packages/default.gbui/package.json b/packages/default.gbui/package.json index 32200ce23..1366ff36f 100644 --- a/packages/default.gbui/package.json +++ b/packages/default.gbui/package.json @@ -5,17 +5,17 @@ "license": "AGPL-3.0", "homepage": ".", "dependencies": { - "ajv": "^6.5.4", + "ajv": "^6.5.5", "botframework-directlinejs": "^0.10.0", "botframework-webchat": "4.1.0", "deep-extend": "^0.6.0", "fetch": "^1.1.0", "msal": "^0.2.3", "powerbi-client": "^2.6.5", - "react": "^16.6.0", - "react-dom": "^16.6.0", + "react": "^16.6.3", + "react-dom": "^16.6.3", "react-helmet": "^5.2.0", - "react-player": "^1.6.6", + "react-player": "^1.7.0", "react-powerbi": "^0.3.1", "react-scripts": "^2.1.1", "react-transition-group": "^2.5.0",