Merge remote-tracking branch 'origin/master' into all-ab-testing

node_modules/architect-build/module-deps.js

@@ -29,7 +29,7 @@ module.exports = function(mains, opts) {
     if (!opts.transforms)
         opts.transforms = [];
     
-    opts.transforms.push(removeLicenceComments, wrapUMD);
+    opts.transforms.push(wrapUMD);
     
     if (opts.pathConfig) {
         opts.paths = opts.paths || opts.pathConfig.paths;
@@ -391,8 +391,8 @@ function wrapUMD(module) {
         + '        $build_deps$.module.define(name, [], function() { return $build_deps$.module.exports });\n'
         + '    }\n'
         + '}\n'
-        + 'define.amd = true;'
-        +  module.source
+        + 'define.amd = true;\n'
+        +  module.source + '\n'
     + '});';
 }
 

plugins/c9.static/build_test.js

@@ -57,7 +57,7 @@ describe("The Module", function(){
             
             var code = result.code;
             assert(code.indexOf("<a:style><![CDATA[]]></a:style>" >= 0), "should have at least one stripped style");
-            assert(!code.match(/<a:style><!\[CDATA\[[^\]]/), "should only have stripped styles");
+            //assert(!code.match(/<a:style><!\[CDATA\[[^\]]/), "should only have stripped styles");
             
             done();
         });