Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cf122a2

Browse files
sjrdsjrd
authored
Merge pull request scala-js#3255 from gzm0/new-jsenv
Fix scala-js#3033: Rehaul JSEnv API
2 parents e31fbcd + 1acffde commit cf122a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1880
-1647
lines changed

‎Jenkinsfile‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,12 @@ def Tasks = [
116116
sbtretry 'set scalaJSStage in Global := FullOptStage' \
117117
++$scala testingExample/testHtml \
118118
testingExample/clean &&
119-
sbtretry ++$scala library/test &&
120119
sbtretry ++$scala testSuiteJVM/test testSuiteJVM/clean &&
121120
sbtretry ++$scala testSuite/test &&
122121
sbtretry ++$scala testSuiteEx/test &&
123122
sbtretry 'set scalaJSStage in Global := FullOptStage' \
124123
++$scala testSuiteEx/test &&
125-
sbtretry ++$scala testSuite/test:doc compiler/test reversi/fastOptJS reversi/fullOptJS &&
124+
sbtretry ++$scala testSuite/test:doc library/test compiler/test reversi/fastOptJS reversi/fullOptJS &&
126125
sbtretry ++$scala compiler/compile:doc library/compile:doc \
127126
testInterface/compile:doc &&
128127
sbtretry ++$scala partest/fetchScalaSource &&
@@ -197,42 +196,34 @@ def Tasks = [
197196
setJavaVersion $java
198197
npm install &&
199198
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
200-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
201199
++$scala $testSuite/test \
202200
$testSuite/clean &&
203201
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
204-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
205202
'set scalaJSLinkerConfig in $testSuite ~= (_.withOptimizer(false))' \
206203
++$scala $testSuite/test \
207204
$testSuite/clean &&
208205
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
209-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
210206
'set scalaJSLinkerConfig in $testSuite ~= makeCompliant' \
211207
++$scala $testSuite/test \
212208
$testSuite/clean &&
213209
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
214-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
215210
'set scalaJSLinkerConfig in $testSuite ~= makeCompliant' \
216211
'set scalaJSLinkerConfig in $testSuite ~= (_.withOptimizer(false))' \
217212
++$scala $testSuite/test \
218213
$testSuite/clean &&
219214
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
220-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
221215
'set scalaJSStage in Global := FullOptStage' \
222216
++$scala $testSuite/test \
223217
$testSuite/clean &&
224218
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
225-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
226219
'set scalaJSStage in Global := FullOptStage' \
227220
'set scalaJSLinkerConfig in $testSuite ~= (_.withOptimizer(false))' \
228221
++$scala $testSuite/test \
229222
$testSuite/clean &&
230223
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
231-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
232224
'set scalaJSLinkerConfig in $testSuite ~= (_.withModuleKind(ModuleKind.CommonJSModule))' \
233225
++$scala $testSuite/test &&
234226
sbtretry 'set scalaJSLinkerConfig in $testSuite ~= (_.withESFeatures(_.withUseECMAScript2015(true)))' \
235-
'set jsEnv in $testSuite := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withSourceMap(false))' \
236227
'set scalaJSLinkerConfig in $testSuite ~= (_.withModuleKind(ModuleKind.CommonJSModule))' \
237228
'set scalaJSStage in Global := FullOptStage' \
238229
++$scala $testSuite/test
@@ -258,7 +249,7 @@ def Tasks = [
258249
setJavaVersion $java
259250
npm install &&
260251
sbt ++$scala ir/test io/test logging/compile linker/compile \
261-
stubs/package nodeJSEnv/test testAdapter/test \
252+
stubs/package jsEnvs/test nodeJSEnv/test testAdapter/test \
262253
ir/mimaReportBinaryIssues io/mimaReportBinaryIssues \
263254
logging/mimaReportBinaryIssues linker/mimaReportBinaryIssues \
264255
jsEnvs/mimaReportBinaryIssues jsEnvsTestKit/mimaReportBinaryIssues \
@@ -275,7 +266,7 @@ def Tasks = [
275266
setJavaVersion $java
276267
npm install &&
277268
sbt ++$scala ir/test io/test logging/compile linker/compile \
278-
stubs/package nodeJSEnv/test testAdapter/test \
269+
stubs/package jsEnvs/test nodeJSEnv/test testAdapter/test \
279270
sbtPlugin/package \
280271
ir/mimaReportBinaryIssues io/mimaReportBinaryIssues \
281272
logging/mimaReportBinaryIssues linker/mimaReportBinaryIssues \
@@ -290,7 +281,7 @@ def Tasks = [
290281
logging/scalastyle logging/test:scalastyle \
291282
linker/scalastyle linker/test:scalastyle \
292283
jsEnvs/scalastyle jsEnvsTestKit/scalastyle nodeJSEnv/scalastyle \
293-
nodeJSEnv/test:scalastyle testAdapter/scalastyle \
284+
jsEnvs/test:scalastyle nodeJSEnv/test:scalastyle testAdapter/scalastyle \
294285
sbtPlugin/scalastyle testInterface/scalastyle \
295286
testSuite/scalastyle testSuite/test:scalastyle \
296287
testSuiteJVM/test:scalastyle \

‎js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/AsyncTests.scala‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/BasicJSEnvTests.scala‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)