8000 Remove code paths for ES 5.1 from the build. · scala-js/scala-js@aabf827 · GitHub
[go: up one dir, main page]
Skip to content

Commit aabf827

Browse files
sjrdsjrd
committed
Remove code paths for ES 5.1 from the build.
1 parent 7f6835c commit aabf827

File tree

3 files changed

+1
-51
lines changed

3 files changed

+1
-51
lines changed

‎project/Build.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,8 +2252,6 @@ object Build {
22522252
val isWebAssembly = linkerConfig.experimentalUseWebAssembly
22532253

22542254
collectionsEraDependentDirectory(scalaV, testDir) ::
2255-
includeIf(testDir / "require-new-target",
2256-
esVersion >= ESVersion.ES2015) :::
22572255
includeIf(testDir / "require-exponent-op",
22582256
esVersion >= ESVersion.ES2016) :::
22592257
includeIf(testDir / "require-modules",

‎project/NodeJSEnvForcePolyfills.scala

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@ final class NodeJSEnvForcePolyfills(esVersion: ESVersion, config: NodeJSEnv.Conf
1515

1616
val name: String = s"Node.js forcing polyfills for $esVersion"
1717

18-
// Deactivate source maps if esVersion < ES2015 because source-map-support requires `Map`
19-
private val nodeJSEnv = {
20-
val config1 =
21-
if (esVersion >= ESVersion.ES2015) config
22-
else config.withSourceMap(false)
23-
new NodeJSEnv(config1)
24-
}
18+
private val nodeJSEnv = new NodeJSEnv(config)
2519

2620
def start(input: Seq[Input], runConfig: RunConfig): JSRun =
2721
nodeJSEnv.start(forcePolyfills +: input, runConfig)
@@ -43,42 +37,6 @@ final class NodeJSEnvForcePolyfills(esVersion: ESVersion, config: NodeJSEnv.Conf
4337

4438
var script = ""
4539

46-
if (esVersion < ES2015) {
47-
script += """
48-
|delete Object.is;
49-
|
50-
|delete Reflect.ownKeys;
51-
|
52-
|delete Math.fround;
53-
|delete Math.imul;
54-
|delete Math.clz32;
55-
|delete Math.log10;
56-
|delete Math.log1p;
57-
|delete Math.cbrt;
58-
|delete Math.hypot;
59-
|delete Math.expm1;
60-
|delete Math.sinh;
61-
|delete Math.cosh;
62-
|delete Math.tanh;
63-
|
64-
|delete global.Map;
65-
|delete global.Promise;
66-
|delete global.Set;
67-
|delete global.Symbol;
68-
|
69-
|delete global.Int8Array;
70-
|delete global.Int16Array;
71-
|delete global.Int32Array;
72-
|delete global.Uint8Array;
73-
|delete global.Uint16Array;
74-
|delete global.Uint32Array;
75-
|delete global.Float32Array;
76-
|delete global.Float64Array;
77-
|
78-
|delete String.prototype.repeat;
79-
""".stripMargin
80-
}
81-
8240
if (esVersion < ES2017) {
8341
script += """
8442
|delete Object.getOwnPropertyDescriptors;
@@ -90,12 +48,6 @@ final class NodeJSEnvForcePolyfills(esVersion: ESVersion, config: NodeJSEnv.Conf
9048
|global.RegExp = (function(OrigRegExp) {
9149
| return function RegExp(pattern, flags) {
9250
| if (typeof flags === 'string') {
93-
|${cond(ES2015, """
94-
| if (flags.indexOf('u') >= 0)
95-
| throw new SyntaxError("unsupported flag 'u'");
96-
| if (flags.indexOf('y') >= 0)
97-
| throw new SyntaxError("unsupported flag 'y'");
98-
|""".stripMargin)}
9951
|${cond(ES2018, """
10052
| if (flags.indexOf('s') >= 0)
10153
| throw new SyntaxError("unsupported flag 's'");

‎test-suite/js/src/test/require-new-target/org/scalajs/testsuite/jsinterop/NewTargetTest.scala renamed to ‎test-suite/js/src/test/scala/org/scalajs/testsuite/jsinterop/NewTargetTest.scala

File renamed without changes.

0 commit comments

Comments
 (0)
0