@samitouri / QOS-React-2 / commits / c6a7dc7f24

Preserve license headers from dependencies in minified build (#8803)

* Preserve license headers from dependencies in minified build Fixes #8789. * Bump minimal object-assign version

Dan Abramov committed Jan 20, 2017 at 02:29 UTC c6a7dc7f24b498d1c2cfb3aa2c04139b33012b80
3 files changed +18 -7
grunt/config/browserify.js
+12 -1
@@ -34,7 +34,18 @@ var LICENSE_TEMPLATE =
34 grunt.file.read('./grunt/data/header-template-extended.txt');
35
36 function minify(src) {
37 - return UglifyJS.minify(src, {fromString: true}).code;
37 + return UglifyJS.minify(src, {
38 + fromString: true,
39 + output: {
40 + comments(node, comment) {
41 + // Preserve license headers in dependencies like object-assign.
42 + if (comment.type === 'comment2') {
43 + return /@license/i.test(comment.value);
44 + }
45 + return false;
46 + },
47 + },
48 + }).code;
49 }
50
51 // TODO: move this out to another build step maybe.
package.json
+1 -1
@@ -67,7 +67,7 @@
67 "jest-runtime": "^18.0.0",
68 "loose-envify": "^1.1.0",
69 "merge-stream": "^1.0.0",
70 - "object-assign": "^4.1.0",
70 + "object-assign": "^4.1.1",
71 "platform": "^1.1.0",
72 "run-sequence": "^1.1.4",
73 "through2": "^2.0.0",
yarn.lock
+5 -5
@@ -859,7 +859,7 @@ babel@^5.4.7:
859 slash "^1.0.0"
860 source-map "^0.5.0"
861
862 -babylon@6.15.0:
862 +babylon@6.15.0, babylon@^6.11.0, babylon@^6.13.0:
863 version "6.15.0"
864 resolved "http://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
865
@@ -867,10 +867,6 @@ babylon@^5.8.38:
867 version "5.8.38"
868 resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
869
870 -babylon@^6.11.0, babylon@^6.13.0:
871 - version "6.14.1"
872 - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.14.1.tgz#956275fab72753ad9b3435d7afe58f8bf0a29815"
873 -
870 balanced-match@^0.4.1:
871 version "0.4.2"
872 resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -3938,6 +3934,10 @@ object-assign@^4.0.1, object-assign@^4.1.0:
3934 version "4.1.0"
3935 resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
3936
3937 +object-assign@^4.1.1:
3938 + version "4.1.1"
3939 + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
3940 +
3941 object-keys@^1.0.6:
3942 version "1.0.11"
3943 resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"