Merge pull request #965 from elliot-nelson/license-comments

jrburke · web-flow · commit a5752b005319 · 2017-07-30T14:50:09.000-07:00
Fix license comment "doubling" issue
diff --git a/.gitignore b/.gitignore
@@ -97,6 +97,8 @@ build/tests/lib/sourcemap/onejs/www/js/built.js
 build/tests/lib/sourcemap/onejs/www/js/built.js.map
 build/tests/lib/sourcemap/twojs/www-built
 build/tests/lib/sourcemapWrap/built
+build/tests/lib/sourcemapComments/main-built.js
+build/tests/lib/sourcemapComments/main-built.js.map
 build/tests/lib/stubModules/create/foobar-built.js
 build/tests/lib/stubModules/main-built.js
 build/tests/lib/stubModules/perModule/built
diff --git a/build/jslib/optimize.js b/build/jslib/optimize.js
@@ -461,7 +461,7 @@ function (lang,   logger,   envOptimize,        file,           parse,
                 } catch (e) {
                     throw new Error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + e.toString());
                 }
-                return preamble + fileContents;
+                return fileContents;
             }
         }
     };
diff --git a/build/tests/builds.js b/build/tests/builds.js
@@ -2284,6 +2284,26 @@ define(['build', 'env!env/file', 'env', 'lang'], function (build, file, env, lan
     );
     doh.run();
 
+    //Test a single file with optimize, preserve license comments, and source maps
+    doh.register("sourcemapComments",
+        [
+            function sourcemapComments(t) {
+                file.deleteFile("lib/sourcemapComments/main-built.js");
+                file.deleteFile("lib/sourcemapComments/main-built.js.map");
+
+                build(["lib/sourcemapComments/build.js"]);
+
+                t.is(nol(c("lib/sourcemapComments/expected-main-built.js")),
+                     nol(c("lib/sourcemapComments/main-built.js")));
+                sourcemapEquals(t, c("lib/sourcemapComments/expected-main-built.js.map"), c("lib/sourcemapComments/main-built.js.map"));
+
+                require._buildReset();
+            }
+
+        ]
+    );
+    doh.run();
+
     // The output in rhino is slightly different, but enough to cause the
     // text compare to fail. So just disabling it for now. Long term,
     // a fancier sourcemap diff checking would be nice.
diff --git a/build/tests/lib/sourcemapComments/a.js b/build/tests/lib/sourcemapComments/a.js
@@ -0,0 +1,10 @@
+/**
+ * Module A
+ */
+define({
+    name: 'a',
+    doSomething: function (name) {
+        console.log('Hello ' + name);
+    }
+});
+console.log('a is done');
diff --git a/build/tests/lib/sourcemapComments/b.js b/build/tests/lib/sourcemapComments/b.js
@@ -0,0 +1,9 @@
+/**
+ * Module B
+ */
+define(function () {
+    var name = 'b';
+    return {
+        name: name
+    };
+});
diff --git a/build/tests/lib/sourcemapComments/build.js b/build/tests/lib/sourcemapComments/build.js
@@ -0,0 +1,8 @@
+({
+    baseUrl: '.',
+    optimize: 'uglify',
+    generateSourceMaps: true,
+    preserveLicenseComments: true,
+    name: 'main',
+    out: 'main-built.js'
+})
diff --git a/build/tests/lib/sourcemapComments/expected-main-built.js b/build/tests/lib/sourcemapComments/expected-main-built.js
diff --git a/build/tests/lib/sourcemapComments/expected-main-built.js.map b/build/tests/lib/sourcemapComments/expected-main-built.js.map
diff --git a/build/tests/lib/sourcemapComments/index.html b/build/tests/lib/sourcemapComments/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <script data-main="main-built" src="../../../../require.js"></script>
+    </head>
+    <body>
+        <h1>Hello World</h1>
+    </body>
+</html>
diff --git a/build/tests/lib/sourcemapComments/main.js b/build/tests/lib/sourcemapComments/main.js
@@ -0,0 +1,8 @@
+/**
+ * A test of source maps with preserved license comments on an uglified file.
+ */
+require(['a', 'b'], function (a, b) {
+    console.log('a message below:');
+    a.doSomething('world');
+    console.log('b name: ' + b.name);
+});

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ function (lang, logger, envOptimize, file, parse,`
`461`	`461`	`} catch (e) {`
`462`	`462`	`throw new Error('Cannot uglify file: ' + fileName + '. Skipping it. Error is:\n' + e.toString());`
`463`	`463`	`}`
`464`		`- return preamble + fileContents;`
	`464`	`+ return fileContents;`
`465`	`465`	`}`
`466`	`466`	`}`
`467`	`467`	`};`