From 52e24471c89b80e6208b4987bb76994e64c1e489 Mon Sep 17 00:00:00 2001
From: Timmy Willison <4timmywil@gmail.com>
Date: Mon, 15 Aug 2016 11:41:11 -0400
Subject: Core: expose noConflict in AMD mode

- For compability reasons, we had already added the global
  in AMD mode, but without noConflict. This adds back noConflict
  to AMD (which fixes noConflict mode in the tests).

Fixes gh-2930
---
 build/tasks/build.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'build/tasks')

diff --git a/build/tasks/build.js b/build/tasks/build.js
index 7f0da1d6b..1579691a0 100644
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -17,7 +17,6 @@ module.exports = function( grunt ) {
 		read = function( fileName ) {
 			return grunt.file.read( srcFolder + fileName );
 		},
-		globals = read( "exports/global.js" ),
 		wrapper = read( "wrapper.js" ).split( /\/\/ \@CODE\n\/\/[^\n]+/ ),
 		config = {
 			baseUrl: "src",
@@ -39,10 +38,7 @@ module.exports = function( grunt ) {
 			skipSemiColonInsertion: true,
 			wrap: {
 				start: wrapper[ 0 ].replace( /\/\*\s*eslint(?: |-).*\s*\*\/\n/, "" ),
-				end: globals.replace(
-					/\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
-					""
-				) + wrapper[ 1 ]
+				end: wrapper[ 1 ]
 			},
 			rawText: {},
 			onBuildWrite: convert
-- 
cgit v1.2.3