Merge pull request scala-js#4524 from sjrd/no-require-es2018-in-linker-interface-js

gzm0 · web-flow · commit 08de1e371303 · 2021-07-09T11:42:22.000+02:00
Avoid using the (?m) flag in the regexes in linker-interface.
diff --git a/linker-interface/shared/src/main/scala/org/scalajs/linker/interface/ReportToLinkerOutputAdapter.scala b/linker-interface/shared/src/main/scala/org/scalajs/linker/interface/ReportToLinkerOutputAdapter.scala
@@ -151,7 +151,10 @@ object ReportToLinkerOutputAdapter {
     }
   }
 
-  private val sourceMapRe = """(?m)^//# sourceMappingURL=.*$""".r
+  /* This regex would normally be written with the (?m) flag, but that would
+   * require ES2018, so we work around it.
+   */
+  private val sourceMapRe = """(?:^|\n)(//# sourceMappingURL=[^\n]*)(?:\n|$)""".r
 
   /** Patches the JS file content to have the provided source map link (or none)
    *
@@ -170,14 +173,14 @@ object ReportToLinkerOutputAdapter {
     } { reMatch =>
       val res = new StringBuilder
 
-      res.append(reMatch.before)
+      res.append(reMatch.before(1))
 
       /* If there is no source map link, keep an empty line to not break a
        * potential (unlinked) source map
        */
       newLine.foreach(res.append(_))
 
-      res.append(reMatch.after)
+      res.append(reMatch.after(1))
 
       res.toString()
     }
@@ -193,7 +196,7 @@ object ReportToLinkerOutputAdapter {
    * So as a legacy mechanism, this is OK-ish. It keeps us from having to build
    * the infrastructure to parse JSON cross platform.
    */
-  private val fileFieldRe = """(?m)([,{])\s*"file"\s*:\s*".*"\s*([,}])""".r
+  private val fileFieldRe = """([,{])\s*"file"\s*:\s*"[^"]*"\s*([,}])""".r
 
   /** Patches the source map content to have the provided JS file link (or none).
    *
diff --git a/project/Build.scala b/project/Build.scala
@@ -869,9 +869,6 @@ object Build {
 
         fileSet.toSeq.filter(_.getPath().endsWith(".scala"))
       }.taskValue,
-
-      // Required for the regex (?m) flag in ReportToLinkerOutputAdapter.scala
-      scalaJSLinkerConfig ~= { _.withESFeatures(_.withESVersion(ESVersion.ES2018)) },
   ).withScalaJSCompiler.withScalaJSJUnitPlugin.dependsOn(
       library, irProjectJS, jUnitRuntime % "test", testBridge % "test", jUnitAsyncJS % "test",
   )
@@ -1046,9 +1043,6 @@ object Build {
         }.taskValue,
       },
 
-      // Required for the regex (?m) flag in ReportToLinkerOutputAdapter.scala
-      scalaJSLinkerConfig ~= { _.withESFeatures(_.withESVersion(ESVersion.ES2018)) },
-
       scalaJSLinkerConfig in Test ~= (_.withModuleKind(ModuleKind.CommonJSModule))
   ).withScalaJSCompiler.withScalaJSJUnitPlugin.dependsOn(
       linkerInterfaceJS, library, irProjectJS, jUnitRuntime % "test", testBridge % "test", jUnitAsyncJS % "test"

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,10 @@ object ReportToLinkerOutputAdapter {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- private val sourceMapRe = """(?m)^//# sourceMappingURL=.*$""".r`
	`154`	`+ /* This regex would normally be written with the (?m) flag, but that would`
	`155`	`+ * require ES2018, so we work around it.`
	`156`	`+ */`
	`157`	`+ private val sourceMapRe = """(?:^\|\n)(//# sourceMappingURL=[^\n]*)(?:\n\|$)""".r`
`155`	`158`
`156`	`159`	`/** Patches the JS file content to have the provided source map link (or none)`
`157`	`160`	`*`
`@@ -170,14 +173,14 @@ object ReportToLinkerOutputAdapter {`
`170`	`173`	`} { reMatch =>`
`171`	`174`	`val res = new StringBuilder`
`172`	`175`
`173`		`- res.append(reMatch.before)`
	`176`	`+ res.append(reMatch.before(1))`
`174`	`177`
`175`	`178`	`/* If there is no source map link, keep an empty line to not break a`
`176`	`179`	`* potential (unlinked) source map`
`177`	`180`	`*/`
`178`	`181`	`newLine.foreach(res.append(_))`
`179`	`182`
`180`		`- res.append(reMatch.after)`
	`183`	`+ res.append(reMatch.after(1))`
`181`	`184`
`182`	`185`	`res.toString()`
`183`	`186`	`}`
`@@ -193,7 +196,7 @@ object ReportToLinkerOutputAdapter {`
`193`	`196`	`* So as a legacy mechanism, this is OK-ish. It keeps us from having to build`
`194`	`197`	`* the infrastructure to parse JSON cross platform.`
`195`	`198`	`*/`
`196`		`- private val fileFieldRe = """(?m)([,{])\s"file"\s:\s"."\s*([,}])""".r`
	`199`	`+ private val fileFieldRe = """([,{])\s"file"\s:\s"[^"]"\s*([,}])""".r`
`197`	`200`
`198`	`201`	`/** Patches the source map content to have the provided JS file link (or none).`
`199`	`202`	`*`