From 48fcf0ecfbdbc4b025eed1c735ca8eae27e22c16 Mon Sep 17 00:00:00 2001 From: Arda TANRIKULU Date: Mon, 9 Apr 2018 20:02:34 -0400 Subject: [PATCH] fix react example for HMR, now UI code will only trigger client refresh remove modules package from dependencies fix webpack client bundle in case of working without middleware --- .../webpack-dev-middleware/.versions | 2 +- .../webpack-dev-middleware/dev-server.js | 10 +- .../webpack-dev-middleware/package.js | 3 +- atmosphere-packages/webpack/.versions | 4 +- atmosphere-packages/webpack/package.js | 3 +- atmosphere-packages/webpack/plugin.js | 32 +-- examples/react/.babelrc | 3 +- examples/react/.gitignore | 1 + examples/react/.meteor/release | 2 +- examples/react/.meteor/versions | 14 +- examples/react/client/main.jsx | 7 +- .../ui/AccountsUIWrapper.jsx | 0 examples/react/{imports => client}/ui/App.jsx | 2 +- .../react/{imports => client}/ui/Task.jsx | 2 +- .../react/imports/startup/accounts-config.js | 5 - examples/react/yarn.lock | 240 +++++++++++++----- 16 files changed, 222 insertions(+), 108 deletions(-) rename examples/react/{imports => client}/ui/AccountsUIWrapper.jsx (100%) rename examples/react/{imports => client}/ui/App.jsx (98%) rename examples/react/{imports => client}/ui/Task.jsx (96%) delete mode 100644 examples/react/imports/startup/accounts-config.js diff --git a/atmosphere-packages/webpack-dev-middleware/.versions b/atmosphere-packages/webpack-dev-middleware/.versions index 0b0ef37..cbea6dc 100644 --- a/atmosphere-packages/webpack-dev-middleware/.versions +++ b/atmosphere-packages/webpack-dev-middleware/.versions @@ -1,4 +1,4 @@ -ardatan:webpack-dev-middleware@0.0.1 +ardatan:webpack-dev-middleware@0.0.2 babel-compiler@7.0.6 babel-runtime@1.2.2 base64@1.0.11 diff --git a/atmosphere-packages/webpack-dev-middleware/dev-server.js b/atmosphere-packages/webpack-dev-middleware/dev-server.js index 0e10ae9..7835b48 100644 --- a/atmosphere-packages/webpack-dev-middleware/dev-server.js +++ b/atmosphere-packages/webpack-dev-middleware/dev-server.js @@ -1,8 +1,8 @@ if (Meteor.isServer && Meteor.isDevelopment) { const path = Npm.require('path'); - - const webpack = require('webpack'); - let allWebpackConfigs = Npm.require('../../../../../../webpack.config.js'); + const projectPath = path.resolve('.').split(path.sep + '.meteor')[0]; + const webpack = Npm.require(path.join(projectPath, 'node_modules/webpack')) + const allWebpackConfigs = Npm.require(path.join(projectPath, 'webpack.config.js'), 'utf8'); if (!(allWebpackConfigs instanceof Array)) { allWebpackConfigs = [allWebpackConfigs]; @@ -21,8 +21,8 @@ if (Meteor.isServer && Meteor.isDevelopment) { }) if (webpackConfig && webpackConfig.devServer) { - const webpackDevMiddleware = require('webpack-dev-middleware'); const projectPath = path.resolve('.').split(path.sep + '.meteor')[0]; + const webpackDevMiddleware = Npm.require(path.join(projectPath, 'node_modules/webpack-dev-middleware')) webpackConfig.mode = 'development'; webpackConfig.externals = webpackConfig.externals || []; @@ -88,7 +88,7 @@ if (Meteor.isServer && Meteor.isDevelopment) { }, next) }); if (webpackConfig.devServer.hot) { - const webpackHotMiddleware = require('webpack-hot-middleware'); + const webpackHotMiddleware = Npm.require(path.join(projectPath, 'node_modules/webpack-hot-middleware')) WebApp.connectHandlers.use(webpackHotMiddleware(compiler)); } } diff --git a/atmosphere-packages/webpack-dev-middleware/package.js b/atmosphere-packages/webpack-dev-middleware/package.js index 0070ec6..306848f 100644 --- a/atmosphere-packages/webpack-dev-middleware/package.js +++ b/atmosphere-packages/webpack-dev-middleware/package.js @@ -1,7 +1,7 @@ Package.describe({ name: 'ardatan:webpack-dev-middleware', debugOnly: true, - version: '0.0.1', + version: '0.0.2', summary: 'Webpack Dev Middleware for Meteor', git: 'https://github.com/ardatan/meteor-webpack', documentation: '../../README.md' @@ -9,6 +9,5 @@ Package.describe({ Package.onUse(function (api) { api.use('webapp@1.5.0', 'server'); - api.use('modules@0.11.5', 'server'); api.addFiles('dev-server.js', 'server'); }); \ No newline at end of file diff --git a/atmosphere-packages/webpack/.versions b/atmosphere-packages/webpack/.versions index d9d254d..33013cf 100644 --- a/atmosphere-packages/webpack/.versions +++ b/atmosphere-packages/webpack/.versions @@ -1,4 +1,2 @@ -ardatan:webpack@0.0.1_1 +ardatan:webpack@0.0.2 meteor@1.8.6 -modules@0.11.5 -modules-runtime@0.9.2 diff --git a/atmosphere-packages/webpack/package.js b/atmosphere-packages/webpack/package.js index 88efdb2..4610674 100644 --- a/atmosphere-packages/webpack/package.js +++ b/atmosphere-packages/webpack/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ardatan:webpack', - version: '0.0.1_1', + version: '0.0.2', summary: 'Webpack Integration for Meteor', git: 'https://github.com/ardatan/meteor-webpack', documentation: '../../README.md' @@ -8,7 +8,6 @@ Package.describe({ Package.registerBuildPlugin({ name: 'webpack', - use: ['modules@0.11.5'], sources: ['plugin.js'], npmDependencies: { "jsdom": "11.6.2", diff --git a/atmosphere-packages/webpack/plugin.js b/atmosphere-packages/webpack/plugin.js index 74bcd69..4658229 100644 --- a/atmosphere-packages/webpack/plugin.js +++ b/atmosphere-packages/webpack/plugin.js @@ -69,14 +69,14 @@ Plugin.registerCompiler({ const targetPlatform = targetFile.getArch().includes('web') ? 'web' : 'node'; if (typeof compilerCache[targetPlatform] === 'undefined') { - targetFile = inputFiles.find(inputFile => inputFile.getPathInPackage().endsWith('webpack.config.js')); + targetFile = inputFiles.find(inputFile => inputFile.getPathInPackage().includes('webpack.config')); this.constructNewCompilerForTarget(targetPlatform, targetFile) } if (compilerCache[targetPlatform] == null) { return; } else { - targetFile = inputFiles.find(inputFile => inputFile.getPathInPackage().endsWith('webpack.config.js')); + targetFile = inputFiles.find(inputFile => inputFile.getPathInPackage().includes('webpack.config.js')); } const compiler = compilerCache[targetPlatform]; @@ -132,26 +132,26 @@ Plugin.registerCompiler({ for (const filePath of chunk.files) { const absoluteFilePath = path.join(compiler.outputPath, filePath); let data = ''; - if (targetPlatform) { + if (targetPlatform == 'node') { data = 'const require = Npm.require;' } data += outFs.readFileSync(absoluteFilePath, 'utf8'); if (chunk.initial && filePath.endsWith('.js')) { - targetFile.addJavaScript({ - path: filePath, - hash: chunk.hash, - data, - bare: true - }); - } else { - targetFile.addAsset({ - path: filePath, - hash: chunk.hash, - data - }); + targetFile.addJavaScript({ + path: filePath, + hash: chunk.hash, + data, + bare: true + }); + } else { + targetFile.addAsset({ + path: filePath, + hash: chunk.hash, + data + }); + } } } - } } diff --git a/examples/react/.babelrc b/examples/react/.babelrc index d678299..e8a5223 100644 --- a/examples/react/.babelrc +++ b/examples/react/.babelrc @@ -3,5 +3,6 @@ "env", "react", "stage-2" - ] + ], + "plugins": ["react-hot-loader/babel"] } \ No newline at end of file diff --git a/examples/react/.gitignore b/examples/react/.gitignore index c2658d7..5a451dc 100644 --- a/examples/react/.gitignore +++ b/examples/react/.gitignore @@ -1 +1,2 @@ node_modules/ +*.log \ No newline at end of file diff --git a/examples/react/.meteor/release b/examples/react/.meteor/release index d502dc0..011385b 100644 --- a/examples/react/.meteor/release +++ b/examples/react/.meteor/release @@ -1 +1 @@ -METEOR@1.6.1 +METEOR@1.6.1.1 diff --git a/examples/react/.meteor/versions b/examples/react/.meteor/versions index e8e0fa4..a68e5a1 100644 --- a/examples/react/.meteor/versions +++ b/examples/react/.meteor/versions @@ -1,12 +1,12 @@ accounts-base@1.4.2 accounts-password@1.5.1 accounts-ui@1.3.0 -accounts-ui-unstyled@1.4.0 +accounts-ui-unstyled@1.4.1 allow-deny@1.1.0 -ardatan:webpack@0.0.1_1 -ardatan:webpack-dev-middleware@0.0.1 +ardatan:webpack@0.0.2 +ardatan:webpack-dev-middleware@0.0.2 autoupdate@1.4.0 -babel-compiler@7.0.6 +babel-compiler@7.0.7 babel-runtime@1.2.2 base64@1.0.11 binary-heap@1.0.10 @@ -25,7 +25,7 @@ ddp-server@2.1.2 deps@1.0.12 diff-sequence@1.1.0 dynamic-import@0.3.0 -ecmascript@0.10.6 +ecmascript@0.10.7 ecmascript-runtime@0.5.0 ecmascript-runtime-client@0.6.2 ecmascript-runtime-server@0.5.0 @@ -51,9 +51,9 @@ minifier-js@2.3.4 minimongo@1.4.4 mobile-experience@1.0.5 mobile-status-bar@1.0.14 -modules@0.11.5 +modules@0.11.6 modules-runtime@0.9.2 -mongo@1.4.5 +mongo@1.4.7 mongo-dev-server@1.1.0 mongo-id@1.0.7 npm-bcrypt@0.9.3 diff --git a/examples/react/client/main.jsx b/examples/react/client/main.jsx index a83c23e..77e1bcc 100644 --- a/examples/react/client/main.jsx +++ b/examples/react/client/main.jsx @@ -2,11 +2,12 @@ import React from 'react'; import { Meteor } from 'meteor/meteor'; import { render } from 'react-dom'; -import '../imports/startup/accounts-config'; -import App from '../imports/ui/App'; +import App from './ui/App'; Meteor.startup(() => { render(, document.getElementById('render-target')); }); -module.hot.accept(); \ No newline at end of file +if(module.hot){ + module.hot.accept(); +} \ No newline at end of file diff --git a/examples/react/imports/ui/AccountsUIWrapper.jsx b/examples/react/client/ui/AccountsUIWrapper.jsx similarity index 100% rename from examples/react/imports/ui/AccountsUIWrapper.jsx rename to examples/react/client/ui/AccountsUIWrapper.jsx diff --git a/examples/react/imports/ui/App.jsx b/examples/react/client/ui/App.jsx similarity index 98% rename from examples/react/imports/ui/App.jsx rename to examples/react/client/ui/App.jsx index 326b050..b0be197 100644 --- a/examples/react/imports/ui/App.jsx +++ b/examples/react/client/ui/App.jsx @@ -3,7 +3,7 @@ import ReactDOM from 'react-dom'; import { Meteor } from 'meteor/meteor'; import { withTracker } from 'meteor/react-meteor-data'; -import { Tasks } from '../api/tasks'; +import { Tasks } from '../../imports/api/tasks'; import Task from './Task'; import AccountsUIWrapper from './AccountsUIWrapper'; diff --git a/examples/react/imports/ui/Task.jsx b/examples/react/client/ui/Task.jsx similarity index 96% rename from examples/react/imports/ui/Task.jsx rename to examples/react/client/ui/Task.jsx index 0cf9ff6..7d7deb6 100644 --- a/examples/react/imports/ui/Task.jsx +++ b/examples/react/client/ui/Task.jsx @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Meteor } from 'meteor/meteor'; import classnames from 'classnames'; -import { Tasks } from '../api/tasks'; +import { Tasks } from '../../imports/api/tasks'; // Task component - represents a single todo item export default class Task extends Component { diff --git a/examples/react/imports/startup/accounts-config.js b/examples/react/imports/startup/accounts-config.js deleted file mode 100644 index 7e4f7e5..0000000 --- a/examples/react/imports/startup/accounts-config.js +++ /dev/null @@ -1,5 +0,0 @@ -import { Accounts } from 'meteor/accounts-base'; - -Accounts.ui.config({ - passwordSignupFields: 'USERNAME_ONLY', -}); diff --git a/examples/react/yarn.lock b/examples/react/yarn.lock index ee11e91..2659019 100644 --- a/examples/react/yarn.lock +++ b/examples/react/yarn.lock @@ -3,8 +3,8 @@ "@babel/runtime@^7.0.0-beta.42": - version "7.0.0-beta.42" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f" + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0-beta.44.tgz#ea5ad6c6fe9a2c1187b025bf42424d28050ee696" dependencies: core-js "^2.5.3" regenerator-runtime "^0.11.1" @@ -34,6 +34,15 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" +ajv@^5.1.0: + version "5.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" + dependencies: + co "^4.6.0" + fast-deep-equal "^1.0.0" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.3.0" + ajv@^6.1.0: version "6.4.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6" @@ -153,7 +162,11 @@ aws-sign2@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" -aws4@^1.2.1: +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.2.1, aws4@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" @@ -807,6 +820,13 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +bcrypt@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-1.0.3.tgz#b02ddc6c0b52ea16b8d3cf375d5a32e780dab548" + dependencies: + nan "2.6.2" + node-pre-gyp "0.6.36" + big.js@^3.1.3: version "3.2.0" resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" @@ -839,6 +859,18 @@ boom@2.x.x: dependencies: hoek "2.x.x" +boom@4.x.x: + version "4.3.1" + resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" + dependencies: + hoek "4.x.x" + +boom@5.x.x: + version "5.2.0" + resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" + dependencies: + hoek "4.x.x" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -868,8 +900,8 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f" + version "1.2.0" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" dependencies: buffer-xor "^1.0.3" cipher-base "^1.0.0" @@ -992,8 +1024,8 @@ camel-case@3.0.x: upper-case "^1.1.1" caniuse-lite@^1.0.30000792: - version "1.0.30000821" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000821.tgz#0f3223f1e048ed96451c56ca6cf197058c42cb93" + version "1.0.30000823" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000823.tgz#b79842a5b5a48eaa416b73f5a5d7a23f52d26014" caseless@~0.12.0: version "0.12.0" @@ -1109,7 +1141,7 @@ color-name@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" -combined-stream@^1.0.5, combined-stream@~1.0.5: +combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" dependencies: @@ -1222,6 +1254,12 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" +cryptiles@3.x.x: + version "3.1.2" + resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" + dependencies: + boom "5.x.x" + crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -1414,8 +1452,8 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" electron-to-chromium@^1.3.30: - version "1.3.41" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.41.tgz#7e33643e00cd85edfd17e04194f6d00e73737235" + version "1.3.42" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9" elliptic@^6.0.0: version "6.4.0" @@ -1542,7 +1580,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.0: +extend@~3.0.0, extend@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" @@ -1641,6 +1679,14 @@ form-data@~2.1.1: combined-stream "^1.0.5" mime-types "^2.1.12" +form-data@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" + dependencies: + asynckit "^0.4.0" + combined-stream "1.0.6" + mime-types "^2.1.12" + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -1759,6 +1805,10 @@ har-schema@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + har-validator@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" @@ -1766,6 +1816,13 @@ har-validator@~4.2.1: ajv "^4.9.1" har-schema "^1.0.5" +har-validator@~5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" + dependencies: + ajv "^5.1.0" + har-schema "^2.0.0" + has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -1842,6 +1899,15 @@ hawk@3.1.3, hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" +hawk@~6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" + dependencies: + boom "4.x.x" + cryptiles "3.x.x" + hoek "4.x.x" + sntp "2.x.x" + he@1.1.x: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" @@ -1858,6 +1924,10 @@ hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" +hoek@4.x.x: + version "4.2.1" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" + hoist-non-react-statics@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40" @@ -1874,21 +1944,20 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" html-minifier@^3.2.3: - version "3.5.12" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.12.tgz#6bfad4d0327f5b8d2b62f5854654ac3703b9b031" + version "3.5.13" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.13.tgz#6bca6d533a7f18a476dc6aeb3d113071ab5c165e" dependencies: camel-case "3.0.x" clean-css "4.1.x" commander "2.15.x" he "1.1.x" - ncname "1.0.x" param-case "2.1.x" relateurl "0.2.x" uglify-js "3.3.x" html-webpack-plugin@^3.0.6: - version "3.1.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.1.0.tgz#6e02baaedb1e906310917f03239c793a75af2885" + version "3.2.0" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b" dependencies: html-minifier "^3.2.3" loader-utils "^0.2.16" @@ -1915,6 +1984,14 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + https-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" @@ -2361,15 +2438,15 @@ mime-db@~1.33.0: version "1.33.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" -mime-types@^2.1.12, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7: version "2.1.18" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" dependencies: mime-db "~1.33.0" mime@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b" + version "2.2.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.2.tgz#6b4c109d88031d7b5c23635f5b923da336d79121" min-document@^2.19.0: version "2.19.0" @@ -2442,6 +2519,10 @@ ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" +nan@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" + nan@^2.3.0: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" @@ -2463,12 +2544,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -ncname@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c" - dependencies: - xml-char-classes "^1.0.0" - neo-async@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f" @@ -2514,6 +2589,20 @@ node-libs-browser@^2.0.0: util "^0.10.3" vm-browserify "0.0.4" +node-pre-gyp@0.6.36: + version "0.6.36" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786" + dependencies: + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.0.2" + rc "^1.1.7" + request "^2.81.0" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^2.2.1" + tar-pack "^3.4.0" + node-pre-gyp@^0.6.39: version "0.6.39" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" @@ -2562,7 +2651,7 @@ number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" -oauth-sign@~0.8.1: +oauth-sign@~0.8.1, oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" @@ -2716,6 +2805,10 @@ performance-now@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" @@ -2763,7 +2856,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.6.0: +prop-types@^15.6.0, prop-types@^15.6.1: version "15.6.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" dependencies: @@ -2820,6 +2913,10 @@ qs@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" +qs@~6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" + querystring-es3@^0.2.0, querystring-es3@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -2859,8 +2956,8 @@ rc@^1.1.7: strip-json-comments "~2.0.1" react-dom@^16.1.1: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" + version "16.3.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.1.tgz#6a3c90a4fb62f915bdbcf6204422d93a7d4ca573" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -2868,18 +2965,18 @@ react-dom@^16.1.1: prop-types "^15.6.0" react-hot-loader@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.0.0.tgz#3452fa9bc0d0ba9dfc5b0ccfa25101ca8dbd2de2" + version "4.0.1" + resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.0.1.tgz#48284350ae5d7ba07dac872bd5bbc6e477352593" dependencies: fast-levenshtein "^2.0.6" global "^4.3.0" hoist-non-react-statics "^2.5.0" - prop-types "^15.6.0" + prop-types "^15.6.1" shallowequal "^1.0.2" react@^16.1.1: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" + version "16.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.3.1.tgz#4a2da433d471251c69b6033ada30e2ed1202cfd8" dependencies: fbjs "^0.8.16" loose-envify "^1.1.0" @@ -2887,15 +2984,15 @@ react@^16.1.1: prop-types "^15.6.0" "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3: - version "2.3.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d" + version "2.3.6" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: core-util-is "~1.0.0" inherits "~2.0.3" isarray "~1.0.0" process-nextick-args "~2.0.0" safe-buffer "~5.1.1" - string_decoder "~1.0.3" + string_decoder "~1.1.1" util-deprecate "~1.0.1" readable-stream@1.0: @@ -3027,6 +3124,33 @@ request@2.81.0: tunnel-agent "^0.6.0" uuid "^3.0.0" +request@^2.81.0: + version "2.85.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.6.0" + caseless "~0.12.0" + combined-stream "~1.0.5" + extend "~3.0.1" + forever-agent "~0.6.1" + form-data "~2.3.1" + har-validator "~5.0.3" + hawk "~6.0.2" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.17" + oauth-sign "~0.8.2" + performance-now "^2.1.0" + qs "~6.5.1" + safe-buffer "^5.1.1" + stringstream "~0.0.5" + tough-cookie "~2.3.3" + tunnel-agent "^0.6.0" + uuid "^3.1.0" + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -3161,6 +3285,12 @@ sntp@1.x.x: dependencies: hoek "2.x.x" +sntp@2.x.x: + version "2.1.0" + resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" + dependencies: + hoek "4.x.x" + source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" @@ -3262,9 +3392,9 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string_decoder@^1.0.0, string_decoder@^1.1.0, string_decoder@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403" +string_decoder@^1.0.0, string_decoder@^1.1.0, string_decoder@~1.1.0, string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" dependencies: safe-buffer "~5.1.0" @@ -3272,13 +3402,7 @@ string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4: +stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -3380,7 +3504,7 @@ toposort@^1.0.0: version "1.0.6" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.6.tgz#c31748e55d210effc00fdcdc7d6e68d7d7bb9cec" -tough-cookie@~2.3.0: +tough-cookie@~2.3.0, tough-cookie@~2.3.3: version "2.3.4" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" dependencies: @@ -3424,8 +3548,8 @@ uglify-es@^3.3.4: source-map "~0.6.1" uglify-js@3.3.x: - version "3.3.16" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.16.tgz#23ba13efa27aa00885be7417819e8a9787f94028" + version "3.3.18" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.18.tgz#e16df66d71638df3c9bc61cce827e46f24bdac02" dependencies: commander "~2.15.0" source-map "~0.6.1" @@ -3562,8 +3686,8 @@ watchpack@^1.5.0: neo-async "^2.5.0" webpack-dev-middleware@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.0.tgz#b354b17d0baa274ea3af38c6f005e66a16bdb76b" + version "3.1.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.1.1.tgz#82e175d6c34ff4d1851ce88284238bc97a5160a7" dependencies: loud-rejection "^1.6.0" memory-fs "~0.4.1" @@ -3599,8 +3723,8 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0: source-map "~0.6.1" webpack@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.3.0.tgz#0b0c1e211311b3995dd25aed47ab46ea658be070" + version "4.5.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.5.0.tgz#1e6f71e148ead02be265ff2879c9cd6bb30b8848" dependencies: acorn "^5.0.0" acorn-dynamic-import "^3.0.0" @@ -3623,8 +3747,8 @@ webpack@^4.1.1: webpack-sources "^1.0.1" whatwg-fetch@>=0.10.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" + version "2.0.4" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" wide-align@^1.1.0: version "1.1.2" @@ -3642,10 +3766,6 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -xml-char-classes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" - xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"