Merge pull request #14 from thedodd/13-sass_rs

thedodd · web-flow · commit 85462cffad78 · 2020-08-27T12:01:54.000-05:00
Cut over to sass-rs, as it is a feature complete sass/scss solution.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,23 @@
+name: ci
+on: [push]
+
+jobs:
+  build:
+    name: build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+      # verify that we can actually execute the CLI and get some output
+      - uses: actions-rs/cargo@v1
+        with:
+          command: run
+          args: -- -h
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,16 @@
+changelog
+=========
+
+## Unreleased
+
+## 0.1.2
+### changed
+- Swap our `grass` for `sass-rs`.
+- Compress SASS/SCSS output when building in `--release` mode.
+
+## 0.1.1
+### fixed
+- Fix an issue with the watch system which was breaking builds on Windows.
+
+## 0.1.0
+- Initialize release. See the [release notes on Github](https://github.com/thedodd/trunk/releases/tag/v0.1.0) for more info.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "trunk"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2018"
 description = "Build, bundle & ship your Rust WASM application to the web."
 license = "MIT/Apache-2.0"
@@ -15,10 +15,10 @@ anyhow = "1.0.32"
 async-process = "0.1.1"
 async-std = { version="1.6.3", features=["attributes", "unstable"] }
 futures = "0.3.5"
-grass = "0.10.3"
 nipper = "0.1.8"
 notify = "4.0.15"
 open = "1.4.0"
+sass-rs = "0.2.2"
 seahash = "4.0.1"
 serde = { version="1", features=["derive"] }
 structopt = "0.3.16"
diff --git a/README.md b/README.md
@@ -1,5 +1,12 @@
 <h1 align="center">trunk</h1>
 <div align="center">
+
+[![Build Status](https://github.com/thedodd/trunk/workflows/ci/badge.svg?branch=master)](https://github.com/thedodd/trunk/actions)
+[![Crates.io](https://img.shields.io/crates/v/trunk.svg)](https://crates.io/crates/trunk)
+[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue)](LICENSE)
+![Crates.io](https://img.shields.io/crates/d/trunk.svg)
+![Crates.io](https://img.shields.io/crates/dv/trunk.svg)
+
   <strong>
     Build, bundle & ship your Rust WASM application to the web.
   </strong>
@@ -37,7 +44,7 @@ pub fn main() {
 }
 ```
 
-Trunk uses a source HTML file to drive all asset building and bundling. Trunk also ships with a [built-in SASS/SCSS compiler](https://github.com/connorskees/grass), so let's get started with the following example. Copy this HTML to your cargo project's `src` dir at `src/index.html`:
+Trunk uses a source HTML file to drive all asset building and bundling. Trunk also ships with a [built-in SASS/SCSS compiler](https://github.com/compass-rs/sass-rs), so let's get started with the following example. Copy this HTML to your cargo project's `src` dir at `src/index.html`:
 
 ```html
 <html>
@@ -82,7 +89,7 @@ Trunk leverages Rust's powerful concurrency primitives for maximum build speeds.
 Trunk is still a young project, and new asset types will be added as we move forward. Keep an eye on [trunk#3](https://github.com/thedodd/trunk/issues/3) for more information on planned asset types, implementation status, and please contribute to the discussion if you think something is missing.
 
 Currently supported assets:
-- ✅ `sass`: Trunk ships with a [built-in sass/scss compiler](https://github.com/connorskees/grass). Just link to your sass files from your source HTML, and Trunk will handle the rest. This content is hashed for cache control.
+- ✅ `sass`: Trunk ships with a [built-in sass/scss compiler](https://github.com/compass-rs/sass-rs). Just link to your sass files from your source HTML, and Trunk will handle the rest. This content is hashed for cache control.
 - ✅ `css`: Trunk will copy linked css files found in the source HTML without content modification. This content is hashed for cache control.
   - In the future, Trunk will resolve local `@imports`, will handle minification (see [trunk#7](https://github.com/thedodd/trunk/issues/3)), and we may even look into a pattern where any CSS found in the source tree will be bundled, which would enable a nice zero-config "component styles" pattern. See [trunk#3](https://github.com/thedodd/trunk/issues/3) for more details.
 - ✅ `icon`: Trunk will automatically copy referenced icons to the `dist` dir. This content is hashed for cache control.
diff --git a/src/build.rs b/src/build.rs
@@ -290,11 +290,16 @@ impl BuildSystem {
     /// Spawn a concurrent build pipeline for a SASS/SCSS asset.
     fn spawn_sass_pipeline(&mut self, asset: AssetFile) -> JoinHandle<Result<AssetPipelineOutput>> {
         let dist = self.dist.clone();
+        let release = self.release;
         spawn(async move {
             // Compile the target SASS/SCSS file.
             let path_str = asset.path.to_string_lossy().to_string();
+            let mut opts = sass_rs::Options::default();
+            if release {
+                opts.output_style = sass_rs::OutputStyle::Compressed;
+            }
             let css = spawn_blocking(move || {
-                match grass::from_path(&path_str, &grass::Options::default()) {
+                match sass_rs::compile_file(&path_str, opts) {
                     Ok(css) => Ok(css),
                     Err(err) => {
                         eprintln!("{}", err);
diff --git a/src/cmd/build.rs b/src/cmd/build.rs
@@ -21,7 +21,7 @@ pub struct Build {
     #[structopt(short, long, default_value="dist", parse(from_os_str))]
     dist: PathBuf,
     /// The public URL from which assets are to be served.
-    #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]
+    #[structopt(long, default_value="/", parse(from_str=parse_public_url))]
     public_url: String,
 }
 
diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs
@@ -29,7 +29,7 @@ pub struct Serve {
     #[structopt(short, long, default_value="dist", parse(from_os_str))]
     dist: PathBuf,
     /// The public URL from which assets are to be served.
-    #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]
+    #[structopt(long, default_value="/", parse(from_str=parse_public_url))]
     public_url: String,
     /// Additional paths to ignore.
     #[structopt(short, long, parse(from_os_str))]
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
@@ -21,7 +21,7 @@ pub struct Watch {
     #[structopt(short, long, default_value="dist", parse(from_os_str))]
     dist: PathBuf,
     /// The public URL from which assets are to be served.
-    #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]
+    #[structopt(long, default_value="/", parse(from_str=parse_public_url))]
     public_url: String,
     /// Additional paths to ignore.
     #[structopt(short, long, parse(from_os_str))]

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ pub struct Build {`
`21`	`21`	`#[structopt(short, long, default_value="dist", parse(from_os_str))]`
`22`	`22`	`dist: PathBuf,`
`23`	`23`	`/// The public URL from which assets are to be served.`
`24`		`- #[structopt(short, long, default_value="/", parse(from_str=parse_public_url))]`
	`24`	`+ #[structopt(long, default_value="/", parse(from_str=parse_public_url))]`
`25`	`25`	`public_url: String,`
`26`	`26`	`}`
`27`	`27`