Fix debugging issues when some packages was installed on RN 0.61 app (#…

…1129) * Fix RegExp * Add more test scenarios
microsoft · Oct 9, 2019 · 62a3a50 · 62a3a50
1 parent e19e677
commit 62a3a50
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/debugger/sourceMap.ts b/src/debugger/sourceMap.ts
@@ -23,7 +23,7 @@ export interface IStrictUrl extends url.Url {
 
 export class SourceMapUtil {
     private static SourceMapURLRegex: RegExp = /\/\/(#|@) sourceMappingURL=((?!data:).+?)\s*$/m;
-    private static SourceURLRegex: RegExp = /\/\/(#|@) sourceURL=((?!data:).+?)\s*$/m;
+    private static SourceURLRegex: RegExp = /\/\/(#|@) sourceURL=((?!data:).+?)\s*$/;
 
     /**
      * Given a script body and URL, this method parses the body and finds the corresponding source map URL.

diff --git a/test/debugger/sourceMap.test.ts b/test/debugger/sourceMap.test.ts
@@ -111,9 +111,26 @@ suite("sourceMap", function() {
         });
 
         test("should remove sourceURL from the bundle script body correctly", function() {
-            const scriptBody: string = `//# sourceMappingURL=index.map
+            const scriptBody: string = `//# sourceURL=http://localhost:8081/index.bundle?platform=android&dev=true&minify=false
+var sourceURL = '//# sourceURL=' + (hasOwnProperty.call(options, 'sourceURL') ? (options.sourceURL + '').replace(/[\\r\\n]/g, ' ') : 'lodash.templateSources[' + ++templateCounter + ']') + '\\n';
+//# sourceMappingURL=index.map
 //# sourceURL=http://localhost:8081/index.bundle?platform=android&dev=true&minify=false`;
-            const expectedScriptBody = "//# sourceMappingURL=index.map\n";
+            const expectedScriptBody = `//# sourceURL=http://localhost:8081/index.bundle?platform=android&dev=true&minify=false
+var sourceURL = '//# sourceURL=' + (hasOwnProperty.call(options, 'sourceURL') ? (options.sourceURL + '').replace(/[\\r\\n]/g, ' ') : 'lodash.templateSources[' + ++templateCounter + ']') + '\\n';
+//# sourceMappingURL=index.map\n`;
+            const sourceMap = new SourceMapUtil();
+
+            const result = sourceMap.removeSourceURL(scriptBody);
+            assert.equal(expectedScriptBody, result);
+        });
+
+        test("should not remove anything if sourceURL is not in the end of the bundle script", function() {
+            const scriptBody: string = `//# sourceURL=http://localhost:8081/index.bundle?platform=android&dev=true&minify=false
+var sourceURL = '//# sourceURL=' + (hasOwnProperty.call(options, 'sourceURL') ? (options.sourceURL + '').replace(/[\\r\\n]/g, ' ') : 'lodash.templateSources[' + ++templateCounter + ']') + '\\n';
+//# sourceMappingURL=index.map`;
+            const expectedScriptBody = `//# sourceURL=http://localhost:8081/index.bundle?platform=android&dev=true&minify=false
+var sourceURL = '//# sourceURL=' + (hasOwnProperty.call(options, 'sourceURL') ? (options.sourceURL + '').replace(/[\\r\\n]/g, ' ') : 'lodash.templateSources[' + ++templateCounter + ']') + '\\n';
+//# sourceMappingURL=index.map`;
             const sourceMap = new SourceMapUtil();
 
             const result = sourceMap.removeSourceURL(scriptBody);