Merge ~mpontillo/maas:use-built-javascript-for-tests into maas:master
- Git
- lp:~mpontillo/maas
- use-built-javascript-for-tests
- Merge into master
Proposed by
Mike Pontillo
Status: | Merged |
---|---|
Merge reported by: | Mike Pontillo |
Merged at revision: | 9e45ddcf996efa1c8f501db1a5d9f9d770df4ef7 |
Proposed branch: | ~mpontillo/maas:use-built-javascript-for-tests |
Merge into: | maas:master |
Diff against target: |
483 lines (+93/-69) 13 files modified
Makefile (+7/-1) debian/rules (+1/-1) package.json (+3/-2) setup.py (+1/-1) src/maasserver/static/js/yui/io.js (+0/-0) src/maasserver/static/js/yui/os_distro_select.js (+0/-0) src/maasserver/static/js/yui/prefs.js (+0/-0) src/maasserver/static/js/yui/reveal.js (+0/-0) src/maasserver/static/js/yui/shortpoll.js (+0/-0) src/maasserver/templates/maasserver/js-conf.html (+3/-0) src/maastesting/karma.conf.js (+6/-5) webpack.config.js (+4/-2) yarn.lock (+68/-57) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
MAAS Lander | unittests | Pending | |
Review via email: mp+341098@code.launchpad.net |
Commit message
Reorganize legacy YUI code. Use built JavaScript and sourcemaps during testing. Remove react and react-dom from vendor bundle.
Description of the change
To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote : | # |
LANDING
-b use-built-
STATUS: FAILED BUILD
LOG: http://
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/Makefile b/Makefile |
2 | index 533934d..b5ba5ea 100644 |
3 | --- a/Makefile |
4 | +++ b/Makefile |
5 | @@ -23,7 +23,7 @@ endif |
6 | # Python enum modules. |
7 | py_enums := $(wildcard src/*/enum.py) |
8 | # JavaScript enum module (not modules). |
9 | -js_enums := src/maasserver/static/js/enums.js |
10 | +js_enums := src/maasserver/static/js/yui/enums.js |
11 | |
12 | # MAAS SASS stylesheets. The first input file (maas-styles.css) imports |
13 | # the others, so is treated specially in the target definitions. |
14 | @@ -40,6 +40,8 @@ javascript_deps := \ |
15 | javascript_output := \ |
16 | src/maasserver/static/js/bundle/maas-min.js \ |
17 | src/maasserver/static/js/bundle/maas-min.js.map \ |
18 | + src/maasserver/static/js/bundle/maas-yui-min.js \ |
19 | + src/maasserver/static/js/bundle/maas-yui-min.js.map \ |
20 | src/maasserver/static/js/bundle/vendor-min.js \ |
21 | src/maasserver/static/js/bundle/vendor-min.js.map |
22 | |
23 | @@ -249,6 +251,7 @@ define node_packages |
24 | karma-ng-html2js-preprocessor |
25 | karma-opera-launcher |
26 | karma-phantomjs-launcher |
27 | + karma-sourcemap-loader |
28 | node-sass |
29 | phantomjs-prebuilt |
30 | prop-types |
31 | @@ -286,6 +289,9 @@ test: bin/test.parallel bin/coverage |
32 | @bin/test.parallel --with-coverage --subprocess-per-core |
33 | @bin/coverage combine |
34 | |
35 | +test-js: bin/test.js javascript |
36 | + @bin/test.js |
37 | + |
38 | test-serial: $(strip $(test-scripts)) |
39 | @bin/maas-region makemigrations --dry-run --exit && exit 1 ||: |
40 | @$(RM) .coverage .coverage.* .failed |
41 | diff --git a/debian/rules b/debian/rules |
42 | index 36c7be7..2f83647 100755 |
43 | --- a/debian/rules |
44 | +++ b/debian/rules |
45 | @@ -53,7 +53,7 @@ override_dh_auto_install: |
46 | rm -rf $(CURDIR)/debian/tmp/usr/share/maas/web/scss |
47 | |
48 | # Install built enums.js file. |
49 | - cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/ |
50 | + cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/yui |
51 | |
52 | # install the apparmor profile |
53 | install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d |
54 | diff --git a/package.json b/package.json |
55 | index dd52b6d..2398e05 100644 |
56 | --- a/package.json |
57 | +++ b/package.json |
58 | @@ -5,7 +5,7 @@ |
59 | "@babel/preset-react": "^7.0.0-beta.40", |
60 | "@types/prop-types": "^15.5.2", |
61 | "@types/react": "^16.0.40", |
62 | - "@types/react-dom": "^16.0.4", |
63 | + "@types/react-dom": "^15.5.7", |
64 | "babel-loader": "^8.0.0-beta.0", |
65 | "glob": "^7.1.2", |
66 | "jasmine-core": "=2.99.1", |
67 | @@ -17,6 +17,7 @@ |
68 | "karma-ng-html2js-preprocessor": "^1.0.0", |
69 | "karma-opera-launcher": "^1.0.0", |
70 | "karma-phantomjs-launcher": "^1.0.4", |
71 | + "karma-sourcemap-loader": "^0.3.7", |
72 | "node-sass": "^4.7.2", |
73 | "phantomjs-prebuilt": "^2.1.16", |
74 | "prop-types": "^15.6.1", |
75 | @@ -27,7 +28,7 @@ |
76 | "uglifyjs-webpack-plugin": "^1.2.2", |
77 | "vanilla-framework": "^1.6.6", |
78 | "vanilla-framework-react": "^0.1.2", |
79 | - "webpack": "^4.0.1", |
80 | + "webpack": "^4.1.1", |
81 | "webpack-cli": "^2.0.10", |
82 | "webpack-merge": "^4.1.2" |
83 | } |
84 | diff --git a/setup.py b/setup.py |
85 | index cd6ad7a..8e35adb 100644 |
86 | --- a/setup.py |
87 | +++ b/setup.py |
88 | @@ -56,7 +56,7 @@ class EnumJSCommand(Command): |
89 | py_files = glob('src/*/enum.py') |
90 | jsenums = import_jsenums() |
91 | js_content = jsenums.dump(py_files) |
92 | - with open('src/maasserver/static/js/enums.js', 'w') as fp: |
93 | + with open('src/maasserver/static/js/yui/enums.js', 'w') as fp: |
94 | fp.write(js_content) |
95 | |
96 | |
97 | diff --git a/src/maasserver/static/js/io.js b/src/maasserver/static/js/yui/io.js |
98 | index 86b15ef..86b15ef 100644 |
99 | --- a/src/maasserver/static/js/io.js |
100 | +++ b/src/maasserver/static/js/yui/io.js |
101 | diff --git a/src/maasserver/static/js/os_distro_select.js b/src/maasserver/static/js/yui/os_distro_select.js |
102 | index 2fe0958..2fe0958 100644 |
103 | --- a/src/maasserver/static/js/os_distro_select.js |
104 | +++ b/src/maasserver/static/js/yui/os_distro_select.js |
105 | diff --git a/src/maasserver/static/js/prefs.js b/src/maasserver/static/js/yui/prefs.js |
106 | index cff5636..cff5636 100644 |
107 | --- a/src/maasserver/static/js/prefs.js |
108 | +++ b/src/maasserver/static/js/yui/prefs.js |
109 | diff --git a/src/maasserver/static/js/reveal.js b/src/maasserver/static/js/yui/reveal.js |
110 | index 7ab922a..7ab922a 100644 |
111 | --- a/src/maasserver/static/js/reveal.js |
112 | +++ b/src/maasserver/static/js/yui/reveal.js |
113 | diff --git a/src/maasserver/static/js/shortpoll.js b/src/maasserver/static/js/yui/shortpoll.js |
114 | index 886ba93..886ba93 100644 |
115 | --- a/src/maasserver/static/js/shortpoll.js |
116 | +++ b/src/maasserver/static/js/yui/shortpoll.js |
117 | diff --git a/src/maasserver/templates/maasserver/js-conf.html b/src/maasserver/templates/maasserver/js-conf.html |
118 | index 9999281..cae0420 100644 |
119 | --- a/src/maasserver/templates/maasserver/js-conf.html |
120 | +++ b/src/maasserver/templates/maasserver/js-conf.html |
121 | @@ -47,6 +47,9 @@ var MAAS_config = { |
122 | <script type="text/javascript" |
123 | src="{{STATIC_URL}}/js/bundle/maas-min.js?v={{files_version}}"> |
124 | </script> |
125 | +<script type="text/javascript" |
126 | + src="{{STATIC_URL}}/js/bundle/maas-yui-min.js?v={{files_version}}"> |
127 | +</script> |
128 | |
129 | {% if global_options.enable_analytics %} |
130 | <script async src='https://www.google-analytics.com/analytics.js'></script> |
131 | diff --git a/src/maastesting/karma.conf.js b/src/maastesting/karma.conf.js |
132 | index 79a25a0..abc1026 100644 |
133 | --- a/src/maastesting/karma.conf.js |
134 | +++ b/src/maastesting/karma.conf.js |
135 | @@ -21,10 +21,9 @@ module.exports = function(config) { |
136 | '/usr/share/javascript/angular.js/angular-mocks.js', |
137 | '/usr/share/javascript/angular.js/angular-cookies.js', |
138 | '/usr/share/javascript/angular.js/angular-sanitize.js', |
139 | - '../../src/maasserver/static/js/ui/maas-ui.js', |
140 | - '../../src/maasserver/static/js/angular/maas.js', |
141 | + '../../src/maasserver/static/js/bundle/vendor-min.js', |
142 | + '../../src/maasserver/static/js/bundle/maas-min.js', |
143 | '../../src/maasserver/static/js/angular/testing/*.js', |
144 | - '../../src/maasserver/static/js/angular/*/*.js', |
145 | '../../src/maasserver/static/js/angular/*/tests/test_*.js', |
146 | '../../src/maasserver/static/partials/*.html' |
147 | ], |
148 | @@ -38,7 +37,8 @@ module.exports = function(config) { |
149 | // preprocess matching files before serving them to the browser |
150 | // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor |
151 | preprocessors: { |
152 | - '../../src/maasserver/static/partials/*.html': ['ng-html2js'] |
153 | + '../../src/maasserver/static/partials/*.html': ['ng-html2js'], |
154 | + '**/*.js': ['sourcemap'] |
155 | }, |
156 | |
157 | ngHtml2JsPreprocessor: { |
158 | @@ -91,7 +91,8 @@ module.exports = function(config) { |
159 | 'karma-opera-launcher', |
160 | 'karma-phantomjs-launcher', |
161 | 'karma-failed-reporter', |
162 | - 'karma-ng-html2js-preprocessor' |
163 | + 'karma-ng-html2js-preprocessor', |
164 | + 'karma-sourcemap-loader' |
165 | ] |
166 | }); |
167 | }; |
168 | diff --git a/webpack.config.js b/webpack.config.js |
169 | index e8613b5..549f1f9 100644 |
170 | --- a/webpack.config.js |
171 | +++ b/webpack.config.js |
172 | @@ -5,8 +5,10 @@ const UglifyJSPlugin = require('uglifyjs-webpack-plugin'); |
173 | module.exports = { |
174 | entry: { |
175 | vendor: [].concat( |
176 | - glob.sync('./src/maasserver/static/js/angular/3rdparty/*.js'), |
177 | - ['react', 'react-dom'] |
178 | + glob.sync('./src/maasserver/static/js/angular/3rdparty/*.js') |
179 | + ), |
180 | + 'maas-yui': [].concat( |
181 | + glob.sync('./src/maasserver/static/js/yui/*.js') |
182 | ), |
183 | maas: [].concat( |
184 | glob.sync('./src/maasserver/static/js/*.js'), |
185 | diff --git a/yarn.lock b/yarn.lock |
186 | index 90c4cea..3804cfb 100644 |
187 | --- a/yarn.lock |
188 | +++ b/yarn.lock |
189 | @@ -393,10 +393,6 @@ |
190 | version "4.14.104" |
191 | resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80" |
192 | |
193 | -"@types/node@*": |
194 | - version "9.4.6" |
195 | - resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e" |
196 | - |
197 | "@types/node@^6.0.46": |
198 | version "6.0.101" |
199 | resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.101.tgz#0c5911cfb434af4a51c0a499931fe6423207d921" |
200 | @@ -409,14 +405,17 @@ |
201 | version "0.0.32" |
202 | resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5" |
203 | |
204 | -"@types/react-dom@^16.0.4": |
205 | - version "16.0.4" |
206 | - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.4.tgz#2e8fd45f5443780ed49bf2cdd9809e6091177a7d" |
207 | +"@types/react-dom@^15.5.7": |
208 | + version "15.5.7" |
209 | + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-15.5.7.tgz#a5c1c8b315e925d84d59db5ee88ca7e31c5030f9" |
210 | dependencies: |
211 | - "@types/node" "*" |
212 | - "@types/react" "*" |
213 | + "@types/react" "^15" |
214 | + |
215 | +"@types/react@^15": |
216 | + version "15.6.14" |
217 | + resolved "https://registry.yarnpkg.com/@types/react/-/react-15.6.14.tgz#fe176209b9de3514f9782fa41a239bffd26a3b56" |
218 | |
219 | -"@types/react@*", "@types/react@^16.0.40": |
220 | +"@types/react@^16.0.40": |
221 | version "16.0.40" |
222 | resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9" |
223 | |
224 | @@ -460,8 +459,8 @@ acorn@^4.0.3: |
225 | resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" |
226 | |
227 | acorn@^5.0.0, acorn@^5.2.1, acorn@^5.4.1: |
228 | - version "5.5.0" |
229 | - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298" |
230 | + version "5.5.1" |
231 | + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.1.tgz#84e05a9ea0acbe131227da50301e62464dc9c1d8" |
232 | |
233 | addressparser@1.0.1: |
234 | version "1.0.1" |
235 | @@ -507,8 +506,8 @@ ajv@^5.1.0: |
236 | json-schema-traverse "^0.3.0" |
237 | |
238 | ajv@^6.1.0: |
239 | - version "6.2.0" |
240 | - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2" |
241 | + version "6.2.1" |
242 | + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671" |
243 | dependencies: |
244 | fast-deep-equal "^1.0.0" |
245 | fast-json-stable-stringify "^2.0.0" |
246 | @@ -552,9 +551,9 @@ ansi-styles@^2.2.1: |
247 | version "2.2.1" |
248 | resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" |
249 | |
250 | -ansi-styles@^3.2.0: |
251 | - version "3.2.0" |
252 | - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" |
253 | +ansi-styles@^3.2.1: |
254 | + version "3.2.1" |
255 | + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" |
256 | dependencies: |
257 | color-convert "^1.9.0" |
258 | |
259 | @@ -1786,12 +1785,12 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: |
260 | supports-color "^2.0.0" |
261 | |
262 | chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1: |
263 | - version "2.3.1" |
264 | - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796" |
265 | + version "2.3.2" |
266 | + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" |
267 | dependencies: |
268 | - ansi-styles "^3.2.0" |
269 | + ansi-styles "^3.2.1" |
270 | escape-string-regexp "^1.0.5" |
271 | - supports-color "^5.2.0" |
272 | + supports-color "^5.3.0" |
273 | |
274 | chalk@~0.4.0: |
275 | version "0.4.0" |
276 | @@ -1934,12 +1933,12 @@ clone@^2.1.1: |
277 | resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" |
278 | |
279 | cloneable-readable@^1.0.0: |
280 | - version "1.0.0" |
281 | - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" |
282 | + version "1.1.1" |
283 | + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.1.tgz#c27a4f3a943ca37bed9b01c7d572ee61b1302b15" |
284 | dependencies: |
285 | inherits "^2.0.1" |
286 | - process-nextick-args "^1.0.6" |
287 | - through2 "^2.0.1" |
288 | + process-nextick-args "^2.0.0" |
289 | + readable-stream "^2.3.5" |
290 | |
291 | co@^4.6.0: |
292 | version "4.6.0" |
293 | @@ -2021,8 +2020,8 @@ combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: |
294 | delayed-stream "~1.0.0" |
295 | |
296 | commander@^2.9.0: |
297 | - version "2.14.1" |
298 | - resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" |
299 | + version "2.15.0" |
300 | + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322" |
301 | |
302 | commander@~2.13.0: |
303 | version "2.13.0" |
304 | @@ -2200,8 +2199,8 @@ cross-spawn@^5.0.1: |
305 | which "^1.2.9" |
306 | |
307 | cross-spawn@^6.0.4: |
308 | - version "6.0.4" |
309 | - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.4.tgz#bbf44ccb30fb8314a08f178b62290c669c36d808" |
310 | + version "6.0.5" |
311 | + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" |
312 | dependencies: |
313 | nice-try "^1.0.4" |
314 | path-key "^2.0.1" |
315 | @@ -2430,8 +2429,8 @@ diff@^2.1.2: |
316 | resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99" |
317 | |
318 | diff@^3.3.0, diff@^3.3.1: |
319 | - version "3.4.0" |
320 | - resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c" |
321 | + version "3.5.0" |
322 | + resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" |
323 | |
324 | diffie-hellman@^5.0.0: |
325 | version "5.0.2" |
326 | @@ -2477,8 +2476,8 @@ duplexer3@^0.1.4: |
327 | resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" |
328 | |
329 | duplexify@^3.4.2, duplexify@^3.5.3: |
330 | - version "3.5.3" |
331 | - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e" |
332 | + version "3.5.4" |
333 | + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4" |
334 | dependencies: |
335 | end-of-stream "^1.0.0" |
336 | inherits "^2.0.1" |
337 | @@ -2934,8 +2933,8 @@ first-chunk-stream@^2.0.0: |
338 | readable-stream "^2.0.2" |
339 | |
340 | flow-parser@^0.*: |
341 | - version "0.66.0" |
342 | - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.66.0.tgz#be583fefb01192aa5164415d31a6241b35718983" |
343 | + version "0.67.1" |
344 | + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.67.1.tgz#191fed56ccfd8d097dc9d487f2da3b0dae745849" |
345 | |
346 | flush-write-stream@^1.0.0: |
347 | version "1.0.2" |
348 | @@ -3494,8 +3493,8 @@ homedir-polyfill@^1.0.1: |
349 | parse-passwd "^1.0.0" |
350 | |
351 | hosted-git-info@^2.1.4: |
352 | - version "2.5.0" |
353 | - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" |
354 | + version "2.6.0" |
355 | + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" |
356 | |
357 | htmlescape@^1.1.0: |
358 | version "1.1.1" |
359 | @@ -4219,6 +4218,12 @@ karma-phantomjs-launcher@^1.0.4: |
360 | lodash "^4.0.1" |
361 | phantomjs-prebuilt "^2.1.7" |
362 | |
363 | +karma-sourcemap-loader@^0.3.7: |
364 | + version "0.3.7" |
365 | + resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8" |
366 | + dependencies: |
367 | + graceful-fs "^4.1.2" |
368 | + |
369 | karma@^2.0.0: |
370 | version "2.0.0" |
371 | resolved "https://registry.yarnpkg.com/karma/-/karma-2.0.0.tgz#a02698dd7f0f05ff5eb66ab8f65582490b512e58" |
372 | @@ -5529,14 +5534,14 @@ private@^0.1.6, private@^0.1.7, private@~0.1.5: |
373 | version "0.1.8" |
374 | resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" |
375 | |
376 | -process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: |
377 | - version "1.0.7" |
378 | - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" |
379 | - |
380 | -process-nextick-args@~2.0.0: |
381 | +process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: |
382 | version "2.0.0" |
383 | resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" |
384 | |
385 | +process-nextick-args@~1.0.6: |
386 | + version "1.0.7" |
387 | + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" |
388 | + |
389 | process@^0.11.10, process@~0.11.0: |
390 | version "0.11.10" |
391 | resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" |
392 | @@ -5802,9 +5807,9 @@ read-pkg@^2.0.0: |
393 | normalize-package-data "^2.3.2" |
394 | path-type "^2.0.0" |
395 | |
396 | -"readable-stream@1 || 2", readable-stream@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.0, readable-stream@^2.3.3: |
397 | - version "2.3.4" |
398 | - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071" |
399 | +"readable-stream@1 || 2", readable-stream@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.0, readable-stream@^2.3.3, readable-stream@^2.3.5: |
400 | + version "2.3.5" |
401 | + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d" |
402 | dependencies: |
403 | core-util-is "~1.0.0" |
404 | inherits "~2.0.3" |
405 | @@ -6743,9 +6748,9 @@ string-width@^2.0.0, string-width@^2.1.0: |
406 | is-fullwidth-code-point "^2.0.0" |
407 | strip-ansi "^4.0.0" |
408 | |
409 | -string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3: |
410 | - version "1.0.3" |
411 | - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" |
412 | +string_decoder@^1.0.0: |
413 | + version "1.1.0" |
414 | + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403" |
415 | dependencies: |
416 | safe-buffer "~5.1.0" |
417 | |
418 | @@ -6753,6 +6758,12 @@ string_decoder@~0.10.x: |
419 | version "0.10.31" |
420 | resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" |
421 | |
422 | +string_decoder@~1.0.0, string_decoder@~1.0.3: |
423 | + version "1.0.3" |
424 | + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" |
425 | + dependencies: |
426 | + safe-buffer "~5.1.0" |
427 | + |
428 | stringstream@~0.0.4, stringstream@~0.0.5: |
429 | version "0.0.5" |
430 | resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" |
431 | @@ -6814,9 +6825,9 @@ supports-color@^2.0.0: |
432 | version "2.0.0" |
433 | resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" |
434 | |
435 | -supports-color@^5.2.0: |
436 | - version "5.2.0" |
437 | - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a" |
438 | +supports-color@^5.2.0, supports-color@^5.3.0: |
439 | + version "5.3.0" |
440 | + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" |
441 | dependencies: |
442 | has-flag "^3.0.0" |
443 | |
444 | @@ -6878,7 +6889,7 @@ throttleit@^1.0.0: |
445 | version "1.0.0" |
446 | resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" |
447 | |
448 | -through2@^2.0.0, through2@^2.0.1: |
449 | +through2@^2.0.0: |
450 | version "2.0.3" |
451 | resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" |
452 | dependencies: |
453 | @@ -7292,7 +7303,7 @@ void-elements@^2.0.0: |
454 | version "2.0.1" |
455 | resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" |
456 | |
457 | -watchpack@^1.4.0: |
458 | +watchpack@^1.5.0: |
459 | version "1.5.0" |
460 | resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed" |
461 | dependencies: |
462 | @@ -7376,9 +7387,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0: |
463 | source-list-map "^2.0.0" |
464 | source-map "~0.6.1" |
465 | |
466 | -webpack@^4.0.1: |
467 | - version "4.0.1" |
468 | - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.0.1.tgz#768d708beeca4c5f77f6c2d38a240fb6ff50ba5d" |
469 | +webpack@^4.1.1: |
470 | + version "4.1.1" |
471 | + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.1.1.tgz#44e4d6a869dd36fdfc0b227f9bd865a4bccfd81c" |
472 | dependencies: |
473 | acorn "^5.0.0" |
474 | acorn-dynamic-import "^3.0.0" |
475 | @@ -7397,7 +7408,7 @@ webpack@^4.0.1: |
476 | schema-utils "^0.4.2" |
477 | tapable "^1.0.0" |
478 | uglifyjs-webpack-plugin "^1.1.1" |
479 | - watchpack "^1.4.0" |
480 | + watchpack "^1.5.0" |
481 | webpack-sources "^1.0.1" |
482 | |
483 | whatwg-fetch@>=0.10.0: |
Looks good.