From d2a8381e80439c6f804e3010bdd431dbe8382f0c Mon Sep 17 00:00:00 2001 From: Andrii Martynov Date: Thu, 16 Jul 2020 12:53:13 +0300 Subject: [PATCH] tests added --- .travis.yml | 3 +++ README.md | 3 +++ build.sbt | 12 ++++++++---- sbt-terser-tester/build.sbt | 5 +++++ sbt-terser-tester/project/build.properties | 1 + sbt-terser-tester/project/plugins.sbt | 3 +++ sbt-terser-tester/src/main/assets/javascripts/a.js | 3 +++ sbt-terser-tester/src/main/assets/javascripts/b.js | 3 +++ sbt-terser-tester/src/main/assets/javascripts/x.js | 8 ++++++++ src/sbt-test/sbt-terser/terser/build.sbt | 5 +++++ src/sbt-test/sbt-terser/terser/project/plugins.sbt | 1 + .../terser/src/main/assets/javascripts/a.js | 3 +++ .../terser/src/main/assets/javascripts/b.js | 3 +++ .../terser/src/main/assets/javascripts/x.js | 8 ++++++++ src/sbt-test/sbt-terser/terser/test | 10 ++++++++++ 15 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 .travis.yml create mode 100644 sbt-terser-tester/build.sbt create mode 100644 sbt-terser-tester/project/build.properties create mode 100644 sbt-terser-tester/project/plugins.sbt create mode 100644 sbt-terser-tester/src/main/assets/javascripts/a.js create mode 100644 sbt-terser-tester/src/main/assets/javascripts/b.js create mode 100644 sbt-terser-tester/src/main/assets/javascripts/x.js create mode 100644 src/sbt-test/sbt-terser/terser/build.sbt create mode 100644 src/sbt-test/sbt-terser/terser/project/plugins.sbt create mode 100644 src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/a.js create mode 100644 src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/b.js create mode 100644 src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/x.js create mode 100644 src/sbt-test/sbt-terser/terser/test diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..31321aa --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +jdk: openjdk8 +language: scala +script: sbt "^ scripted" diff --git a/README.md b/README.md index c3efbd1..10888c5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ sbt-terser ========== +[![Download](https://api.bintray.com/packages/andriimartynov/maven/sbt-terser/images/download.svg) ](https://bintray.com/andriimartynov/maven/sbt-terser/_latestVersion) +[![Build Status](https://travis-ci.org/andriimartynov/sbt-terser.svg)](https://travis-ci.org/andriimartynov/sbt-terser) +[![Apache License V.2](https://img.shields.io/badge/license-Apache%20V.2-blue.svg)](https://github.com/andriimartynov/sbt-terser/blob/master/LICENSE) An sbt-web plugin to perform [terser optimization](https://github.com/terser/terser) on the asset pipeline. diff --git a/build.sbt b/build.sbt index dc8376e..bd98689 100644 --- a/build.sbt +++ b/build.sbt @@ -7,15 +7,19 @@ licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0. sbtPlugin := true scalacOptions += "-feature" -libraryDependencies ++= Seq( - "org.webjars.npm" % "terser" % "4.8.0" -) - addSbtJsEngine("1.2.3") +crossSbtVersions := Seq("1.2.8") + +crossScalaVersions := Seq("2.12.11") + credentials += Credentials( "GnuPG Key ID", "gpg", sys.env.getOrElse("GPG_PUBLIC_KEY", ""), // key identifier "ignored" // this field is ignored; passwords are supplied by pinentry ) + +libraryDependencies ++= Seq( + "org.webjars.npm" % "terser" % "4.8.0" +) diff --git a/sbt-terser-tester/build.sbt b/sbt-terser-tester/build.sbt new file mode 100644 index 0000000..50b1bfb --- /dev/null +++ b/sbt-terser-tester/build.sbt @@ -0,0 +1,5 @@ +import WebJs._ + +lazy val root = (project in file(".")).enablePlugins(SbtWeb) + +pipelineStages := Seq(terser) \ No newline at end of file diff --git a/sbt-terser-tester/project/build.properties b/sbt-terser-tester/project/build.properties new file mode 100644 index 0000000..406a7d2 --- /dev/null +++ b/sbt-terser-tester/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.16 \ No newline at end of file diff --git a/sbt-terser-tester/project/plugins.sbt b/sbt-terser-tester/project/plugins.sbt new file mode 100644 index 0000000..bcba1be --- /dev/null +++ b/sbt-terser-tester/project/plugins.sbt @@ -0,0 +1,3 @@ +lazy val root = Project("plugins", file(".")).dependsOn(plugin) + +lazy val plugin = file("../").getCanonicalFile.toURI \ No newline at end of file diff --git a/sbt-terser-tester/src/main/assets/javascripts/a.js b/sbt-terser-tester/src/main/assets/javascripts/a.js new file mode 100644 index 0000000..563f219 --- /dev/null +++ b/sbt-terser-tester/src/main/assets/javascripts/a.js @@ -0,0 +1,3 @@ +function a() { + return 1; +} \ No newline at end of file diff --git a/sbt-terser-tester/src/main/assets/javascripts/b.js b/sbt-terser-tester/src/main/assets/javascripts/b.js new file mode 100644 index 0000000..80bd12d --- /dev/null +++ b/sbt-terser-tester/src/main/assets/javascripts/b.js @@ -0,0 +1,3 @@ +function b() { + return 2; +} \ No newline at end of file diff --git a/sbt-terser-tester/src/main/assets/javascripts/x.js b/sbt-terser-tester/src/main/assets/javascripts/x.js new file mode 100644 index 0000000..3e31e05 --- /dev/null +++ b/sbt-terser-tester/src/main/assets/javascripts/x.js @@ -0,0 +1,8 @@ +(function() { + define(function() { + var number, opposite; + number = 42; + return opposite = true; + }); + +}).call(this); \ No newline at end of file diff --git a/src/sbt-test/sbt-terser/terser/build.sbt b/src/sbt-test/sbt-terser/terser/build.sbt new file mode 100644 index 0000000..d033d94 --- /dev/null +++ b/src/sbt-test/sbt-terser/terser/build.sbt @@ -0,0 +1,5 @@ +lazy val root = (project in file(".")).enablePlugins(SbtWeb) + +libraryDependencies += "org.webjars" % "bootstrap" % "3.3.7" + +pipelineStages := Seq(terser) \ No newline at end of file diff --git a/src/sbt-test/sbt-terser/terser/project/plugins.sbt b/src/sbt-test/sbt-terser/terser/project/plugins.sbt new file mode 100644 index 0000000..6d2bfae --- /dev/null +++ b/src/sbt-test/sbt-terser/terser/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.github.andriimartynov" % "sbt-terser" % sys.props("project.version")) \ No newline at end of file diff --git a/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/a.js b/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/a.js new file mode 100644 index 0000000..563f219 --- /dev/null +++ b/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/a.js @@ -0,0 +1,3 @@ +function a() { + return 1; +} \ No newline at end of file diff --git a/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/b.js b/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/b.js new file mode 100644 index 0000000..80bd12d --- /dev/null +++ b/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/b.js @@ -0,0 +1,3 @@ +function b() { + return 2; +} \ No newline at end of file diff --git a/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/x.js b/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/x.js new file mode 100644 index 0000000..3e31e05 --- /dev/null +++ b/src/sbt-test/sbt-terser/terser/src/main/assets/javascripts/x.js @@ -0,0 +1,8 @@ +(function() { + define(function() { + var number, opposite; + number = 42; + return opposite = true; + }); + +}).call(this); \ No newline at end of file diff --git a/src/sbt-test/sbt-terser/terser/test b/src/sbt-test/sbt-terser/terser/test new file mode 100644 index 0000000..2ff0096 --- /dev/null +++ b/src/sbt-test/sbt-terser/terser/test @@ -0,0 +1,10 @@ +# Minify files. + +> webStage +$ exists target/web/stage/javascripts/a.js +$ exists target/web/stage/javascripts/a.min.js +$ exists target/web/stage/javascripts/b.js +$ exists target/web/stage/javascripts/b.min.js +$ exists target/web/stage/javascripts/x.js +$ exists target/web/stage/javascripts/x.min.js +-$ exists target/web/terser/lib