fix(html): limit regex to only applicable script tags for replacing content

felpi · danbucholtz · commit 93db0ef459d4 · 2017-10-12T02:34:16.000-05:00
diff --git a/src/core/inject-script.spec.ts b/src/core/inject-script.spec.ts
@@ -33,6 +33,40 @@ describe('Inject Scripts', () => {
         '</html>');
     });
 
+    it('should replace only one existed injected script tag', () => {
+      const inputHtml = '' +
+        '<html>\n' +
+        '<head>\n' +
+        '  <script data-ionic="inject">\n' +
+        '    alert(11111);\n' +
+        '  </script>\n' +
+        '  <script>\n' +
+        '    alert(222);\n' +
+        '  </script>\n' +
+        '</head>\n' +
+        '<body>\n' +
+        '</body>\n' +
+        '</html>';
+
+      const output = injectCoreHtml(inputHtml, '  <script data-ionic="inject">\n' +
+                                               '    alert(55555);\n' +
+                                               '  </script>');
+
+      expect(output).toEqual(
+        '<html>\n' +
+        '<head>\n' +
+        '  <script data-ionic="inject">\n' +
+        '    alert(55555);\n' +
+        '  </script>\n' +
+        '  <script>\n' +
+        '    alert(222);\n' +
+        '  </script>\n' +
+        '</head>\n' +
+        '<body>\n' +
+        '</body>\n' +
+        '</html>');
+    });
+
     it('should add script to top of file when no html tag', () => {
       const inputHtml = '' +
         '<body>\n' +
diff --git a/src/core/inject-scripts.ts b/src/core/inject-scripts.ts
@@ -34,7 +34,7 @@ export function injectCoreScripts(context: BuildContext, indexHtml: string) {
 
 export function injectCoreHtml(indexHtml: string, inject: string) {
   // see if we can find an existing ionic script tag and replace it entirely
-  const existingTag = indexHtml.match(/<script data-ionic="inject">[\s\S]*<\/script>/gi);
+  const existingTag = indexHtml.match(/<script data-ionic="inject">[\s\S]*?<\/script>/gi);
   if (existingTag) {
     return indexHtml.replace(existingTag[0], inject.trim());
   }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export function injectCoreScripts(context: BuildContext, indexHtml: string) {`
`34`	`34`
`35`	`35`	`export function injectCoreHtml(indexHtml: string, inject: string) {`
`36`	`36`	`// see if we can find an existing ionic script tag and replace it entirely`
`37`		`- const existingTag = indexHtml.match(/<script data-ionic="inject">[\s\S]*<\/script>/gi);`
	`37`	`+ const existingTag = indexHtml.match(/<script data-ionic="inject">[\s\S]*?<\/script>/gi);`
`38`	`38`	`if (existingTag) {`
`39`	`39`	`return indexHtml.replace(existingTag[0], inject.trim());`
`40`	`40`	`}`