trestle-auth 0.4.4 → 0.5.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20f20a18e7d3b1ee6d2cd1249fd39f6062f53f6cbccef84fe4d511edcb6a537
-  data.tar.gz: b091455c598714024772029a647c39db37d09280918de086304e59980b20be0a
+  metadata.gz: 144e61c6788c0348620a3eff6dbebfe6ceca99fe4f7ea25033ff6bdc63fcd948
+  data.tar.gz: 919a738389172b29a037ef7a3f981efd665f67a67ec22738cf625a49e6a14c48
 SHA512:
-  metadata.gz: 51d20962a10869bd335dd768da2bfc84f90b339a7dc37f3756b117d4f316f815d6962be7556e82267b4f9d3a182b70fa711203aeb2535e831f13bf113cfc28d5
-  data.tar.gz: dc9422562f26242e5ed5dd6d16b8a2e6655c96d3b8e57ebbad06c1d0aed7cb8a70a7d430791bb9acfeffe8ccd70c1ca0e1baccf9869ceebfe367b9256f04388d
+  metadata.gz: 00a63d8741775dbf8a5a3ecbf5cb0ad1e44ea22a218db17fa83b0340ed5416e19943ff0b341af8dbb37ded9cbcc3a129b744546aa93e9c25cc0cf83a4f8f6653
+  data.tar.gz: c9c42bde70ebb2afd0194b42b34c416870f77b782c6ee95b467cdcd2ea5760a775180714888857a47a1fdecbaa741a58f6d1a3d378f4d14c91033a5d02d082c0

data/.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Publish gem
+
+on: workflow_dispatch
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    # If you configured a GitHub environment on RubyGems, you must use it here.
+    environment: release
+
+    steps:
+      # Set up
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - uses: rubygems/release-gem@v1

data/.github/workflows/rspec.yml

@@ -0,0 +1,60 @@
+name: RSpec
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - gemfile: rails-6.0
+            ruby: '2.6'
+          - gemfile: rails-6.1
+            ruby: '2.6'
+          - gemfile: rails-6.1
+            ruby: '3.0'
+          - gemfile: rails-7.0
+            ruby: '2.7'
+          - gemfile: rails-7.0
+            ruby: '3.0'
+          - gemfile: rails-7.0-propshaft
+            ruby: '3.0'
+          - gemfile: rails-7.1
+            ruby: '3.3'
+          - gemfile: rails-7.1-propshaft
+            ruby: '3.3'
+          - gemfile: rails-7.2
+            ruby: '3.3'
+          - gemfile: rails-7.2-propshaft
+            ruby: '3.3'
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - name: Run Specs
+      run: bundle exec rake
+
+    - name: Coveralls Parallel
+      uses: coverallsapp/github-action@v2
+      with:
+        flag-name: run-${{ join(matrix.*, '-') }}
+        parallel: true
+
+  finish:
+    needs: test
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@v2
+      with:
+        parallel-finished: true

data/.gitignore

@@ -13,3 +13,5 @@
 /spec/dummy/*.sqlite3-journal
 /spec/dummy/log/*.log
 /spec/dummy/tmp/*
+*.sqlite3-shm
+*.sqlite3-wal

data/.rspec

@@ -1,3 +1,2 @@
---require spec_helper
 --format documentation
 --color

data/Gemfile

@@ -1,20 +1,22 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in trestle-auth.gemspec
-gemspec
+group :development, :test do
+  gem "sprockets-rails"
+  # gem "propshaft"
+end
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
 
   gem "sqlite3", "~> 1.4"
   gem "devise"
 end
 
-gem "sassc-rails"
-
-gem "rake", "~> 12.0"
-
+gem "rails", "~> 7.1.0"
 gem "trestle", github: "TrestleAdmin/trestle"
+
+# Specify your gem's dependencies in trestle-auth.gemspec
+gemspec

data/README.md

@@ -1,7 +1,7 @@
 # Trestle Authentication (trestle-auth)
 
 [![RubyGem](https://img.shields.io/gem/v/trestle-auth.svg?style=flat&colorB=4065a9)](https://rubygems.org/gems/trestle-auth)
-[![Travis](https://img.shields.io/travis/TrestleAdmin/trestle-auth.svg?style=flat)](https://travis-ci.org/TrestleAdmin/trestle-auth)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/TrestleAdmin/trestle-auth/rspec.yml?style=flat)](https://github.com/TrestleAdmin/trestle-auth/actions)
 [![Coveralls](https://img.shields.io/coveralls/TrestleAdmin/trestle-auth.svg?style=flat)](https://coveralls.io/github/TrestleAdmin/trestle-auth)
 
 > Authentication plugin for the Trestle admin framework

data/app/assets/bundle/trestle/auth/login.css

@@ -0,0 +1 @@
+.auth-body{color:#fff;display:flex}.auth-body .container{margin:auto;width:320px}.auth-header{margin-bottom:20px;text-align:center}.auth-header h1{align-items:center;display:flex;font-size:1.75rem;font-weight:500;justify-content:center;padding:.75rem 1rem;text-shadow:rgba(0,0,0,.5) 0 1px 1px}.auth-header img{max-height:100%;max-width:80%}.auth-header span{margin-left:10px}.login-form .input-group>*{background:hsla(0,0%,100%,.1);border:0;margin-left:0!important}.login-form .form-control{color:#fff;font-size:1rem;padding:.875rem .625rem}.login-form .form-control:focus{box-shadow:none;outline-color:transparent;outline-style:none}.login-form .form-control:-ms-input-placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control::placeholder{color:hsla(0,0%,100%,.5)}.login-form .form-control:-webkit-autofill{-webkit-text-fill-color:#fff}.login-form .form-control:-webkit-autofill,.login-form .form-control:-webkit-autofill:active,.login-form .form-control:-webkit-autofill:focus,.login-form .form-control:-webkit-autofill:hover{-webkit-transition:background-color 9999999s ease-in-out 0s;transition:background-color 9999999s ease-in-out 0s}.login-form .input-group-text{color:hsla(0,0%,100%,.5);padding:.25rem .25rem .25rem .875rem}.login-form .btn-primary{box-shadow:0 0 2px rgba(0,0,0,.1);padding-bottom:.625rem;padding-top:.625rem}.login-form .alert-danger{background-color:hsla(2,62%,66%,.75)}.login-form .remember-me{font-size:.8125rem;line-height:1.5;padding-left:0}.login-form .remember-me .form-check-input{margin-left:1em;margin-top:.825em}.login-form .remember-me .form-check-label{background:rgba(0,0,0,.075);border-radius:.375rem;color:hsla(0,0%,100%,.75);cursor:pointer;display:block;padding:.75em 1.5em .75em 3.25em}.login-form .remember-me .form-check-label:hover{background:rgba(0,0,0,.125)}

data/app/assets/bundle/trestle/auth/userbox.css

@@ -1 +1 @@
-.userbox{align-items:center;display:flex;order:99;padding:2px 0}.userbox>a{color:#333;display:block;font-weight:400;line-height:40px;padding:2px 0}.userbox>a:focus,.userbox>a:hover{text-decoration:none}.userbox .avatar{margin-left:6px;vertical-align:top}.userbox .dropdown-toggle:after{vertical-align:middle}@media (max-width:767.98px){.userbox{display:block;position:relative;z-index:5}.userbox .name{display:none}.userbox .avatar{border:1px solid hsla(0,0%,100%,.25);margin-left:0}}
+.userbox{align-items:center;display:flex;order:99;padding:.125rem 0}.userbox>a{color:#333;display:block;font-weight:400;line-height:40px;padding:.125rem 0}.userbox>a:focus,.userbox>a:hover{text-decoration:none}.userbox .avatar{margin-left:.375rem;vertical-align:top}.userbox .dropdown-toggle:after{vertical-align:middle}@media(max-width:575.98px){.userbox{display:block;position:relative;z-index:5}.userbox .name{display:none}.userbox .avatar{border:1px solid hsla(0,0%,100%,.25);margin-left:0}}

data/app/assets/sprockets/trestle/auth/manifest.js

@@ -0,0 +1,3 @@
+//= link trestle/auth/login.css
+//= link trestle/auth/userbox.css
+//= link trestle/auth/custom.css

data/app/views/layouts/trestle/auth.html.erb

@@ -5,26 +5,30 @@
     <meta content='width=device-width, initial-scale=1' name='viewport'>
     <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
 
-    <% if Trestle.config.turbolinks %>
-      <meta content='no-cache' name='turbolinks-cache-control'>
-    <% end %>
+    <meta name='turbo-cache-control' content='no-cache'>
+    <meta name="turbo-prefetch" content="false" />
+    <meta name="turbo-root" content="<%= Trestle.config.path %>">
 
     <%= csrf_meta_tags %>
 
     <title><%= Trestle.config.site_title %></title>
 
-    <%= stylesheet_link_tag "trestle/admin", 'data-turbolinks-track': 'reload' %>
-    <%= stylesheet_link_tag "trestle/theme", 'data-turbolinks-track': 'reload' if Trestle.config.theme %>
-    <%= stylesheet_link_tag "trestle/custom", 'data-turbolinks-track': 'reload' %>
+    <%= favicon_link_tag Trestle.config.favicon if Trestle.config.favicon %>
 
-    <%= stylesheet_link_tag "trestle/auth", 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/admin", 'data-turbo-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/icons/font-awesome", 'data-turbo-track': 'reload' if defined?(Sprockets) %>
 
-    <%= javascript_include_tag "turbolinks" if Trestle.config.turbolinks %>
+    <%= stylesheet_link_tag "trestle/auth/login", 'data-turbo-track': 'reload' %>
+
+    <%= stylesheet_link_tag "trestle/custom", 'data-turbo-track': 'reload' %>
+    <%= stylesheet_link_tag "trestle/auth/custom", 'data-turbo-track': 'reload' %>
+
+    <%= render "trestle/theme" %>
 
     <%= hook "auth.head" %>
   </head>
 
-  <body class="auth-body theme-bg-dark">
+  <body class="auth-body theme-bg">
     <main class="container">
       <%= yield %>
     </main>

data/app/views/trestle/auth/_userbox.html.erb

@@ -10,13 +10,13 @@
   <% end %>
 
   <% if show_dropdown %>
-    <%= link_to content, "#", data: { toggle: 'dropdown' } %>
+    <%= link_to content, "#", data: { bs_toggle: 'dropdown', bs_offset: "0,7" } %>
   <% else %>
     <%= content %>
   <% end %>
 
   <% if show_dropdown -%>
-  <ul class="dropdown-menu dropdown-menu-right">
+  <ul class="dropdown-menu dropdown-menu-end">
     <% if Trestle.config.auth.user_admin && user_admin = Trestle.lookup(Trestle.config.auth.user_admin) -%>
       <li><%= admin_link_to t("admin.auth.my_account", default: "My Account"), current_user, admin: user_admin, class: "dropdown-item" %></li>
     <% end -%>

data/app/views/trestle/auth/sessions/_form.html.erb

@@ -1,17 +1,13 @@
 <div class="form-group">
   <div class="input-group">
-    <div class="input-group-prepend">
-      <span class="input-group-text"><i class="fa fa-user fa-fw"></i></span>
-    </div>
+    <span class="input-group-text"><i class="fa fa-user fa-fw"></i></span>
     <%= f.text_field Trestle.config.auth.authenticate_with, placeholder: Trestle.config.auth.human_attribute_name(Trestle.config.auth.authenticate_with), class: "form-control" %>
   </div>
 </div>
 
 <div class="form-group">
   <div class="input-group">
-    <div class="input-group-prepend">
-      <span class="input-group-text"><i class="fa fa-lock fa-fw"></i></span>
-    </div>
+    <span class="input-group-text"><i class="fa fa-lock fa-fw"></i></span>
     <%= f.password_field :password, placeholder: Trestle.config.auth.human_attribute_name(:password), class: "form-control" %>
   </div>
 </div>
@@ -20,13 +16,13 @@
 
 <% if Trestle.config.auth.remember.enabled %>
 <div class="form-group">
-  <div class="custom-control custom-checkbox remember-me">
-    <%= f.check_box :remember_me, class: "custom-control-input", include_hidden: false %>
-    <%= f.label :remember_me, t("admin.auth.remember_me", default: "Remember me"), class: "custom-control-label" %>
+  <div class="form-check remember-me">
+    <%= f.check_box :remember_me, class: "form-check-input", include_hidden: false %>
+    <%= f.label :remember_me, t("admin.auth.remember_me", default: "Remember me"), class: "form-check-label" %>
   </div>
 </div>
 <% end %>
 
 <div class="form-group">
-  <%= f.submit t("admin.auth.login", default: "Login"), class: "btn btn-primary btn-block btn-lg" %>
+  <%= f.submit t("admin.auth.login", default: "Login"), class: "btn btn-primary btn-lg d-block w-100" %>
 </div>

data/config/locales/vi.yml

@@ -0,0 +1,15 @@
+vi:
+  admin:
+    auth:
+      my_account: "Tài Khoản Của Tôi"
+      login: "Đăng Nhập"
+      logout: "Đăng Xuất"
+      error: "Thông tin đăng nhập không hợp lệ!"
+      remember_me: "Ghi nhớ phiên đăng nhập"
+
+    auth/account:
+      titles:
+        edit: "Tài Khoản Của Tôi"
+
+      breadcrumbs:
+        index: "Tài Khoản Của Tôi"

data/frontend/_form.scss

@@ -1,14 +1,15 @@
 .login-form {
-  .form-control, .input-group-text {
+  .input-group > * {
     background: $auth-form-control-bg;
     border: $auth-form-control-border;
+    margin-left: 0 !important;
   }
 
   .form-control {
     color: $auth-form-control-color;
-    font-size: 1.1rem;
+    font-size: 1rem;
 
-    padding: 1.75rem 0.75rem;
+    padding: 0.875rem 0.625rem;
 
     &:focus {
       outline-color: transparent;
@@ -29,20 +30,16 @@
     }
   }
 
-  .input-group-prepend {
-    margin-right: 0;
-  }
-
   .input-group-text {
     color: $auth-form-control-icon-color;
-    padding: 0.375rem 0.25rem 0.375rem 1rem;
+    padding: 0.25rem 0.25rem 0.25rem 0.875rem;
   }
 
   .btn-primary {
     box-shadow: rgba(black, 0.1) 0 0 2px;
 
-    padding-top: 0.75rem;
-    padding-bottom: 0.75rem;
+    padding-top: 0.625rem;
+    padding-bottom: 0.625rem;
   }
 
   .alert-danger {
@@ -50,12 +47,17 @@
   }
 
   .remember-me {
-    font-size: 0.95rem;
+    font-size: 0.8125rem;
     line-height: 1.5;
 
     padding-left: 0;
 
-    .custom-control-label {
+    .form-check-input {
+      margin-left: 1em;
+      margin-top: 0.825em;
+    }
+
+    .form-check-label {
       display: block;
       cursor: pointer;
 
@@ -68,12 +70,6 @@
       &:hover {
         background: opacify($auth-remember-me-bg, 0.05);
       }
-
-      &::before,
-      &::after {
-        top: 0.175em + 0.75em;
-        left: 1.1em;
-      }
     }
   }
 }

data/frontend/userbox.scss

@@ -2,7 +2,7 @@
 
 .userbox {
   order: 99;
-  padding: 2px 0;
+  padding: 0.125rem 0;
 
   display: flex;
   align-items: center;
@@ -11,7 +11,7 @@
     color: $body-color;
 
     display: block;
-    padding: 2px 0;
+    padding: 0.125rem 0;
 
     font-weight: normal;
     line-height: 40px;
@@ -23,7 +23,7 @@
 
   .avatar {
     vertical-align: top;
-    margin-left: 6px;
+    margin-left: 0.375rem;
   }
 
   .dropdown-toggle {

data/gemfiles/rails-6.0.gemfile

@@ -1,19 +1,16 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
-
-  gem "sqlite3", "~> 1.4"
-  gem "devise"
 end
 
 gem "rails", "~> 6.0.0"
-gem "sassc-rails"
-
-gem "rake", "~> 12.0"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.4"
+gem "devise"
 
 gem "trestle", github: "TrestleAdmin/trestle"
 

data/gemfiles/rails-6.1.gemfile

@@ -3,17 +3,14 @@ source 'https://rubygems.org'
 group :test do
   gem "rspec-rails", "~> 5.0"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
-
-  gem "sqlite3", "~> 1.4"
-  gem "devise"
 end
 
 gem "rails", "~> 6.1.0"
-gem "sassc-rails"
-
-gem "rake", "~> 12.0"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.4"
+gem "devise"
 
 gem "trestle", github: "TrestleAdmin/trestle"
 

data/gemfiles/rails-7.0-propshaft.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.0.0"
+gem "propshaft"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-7.0.gemfile

@@ -1,19 +1,16 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
-
-  gem "sqlite3", "~> 1.4"
-  gem "devise"
 end
 
 gem "rails", "~> 7.0.0"
-gem "sassc-rails"
-
-gem "rake", "~> 12.0"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.4"
+gem "devise"
 
 gem "trestle", github: "TrestleAdmin/trestle"
 

data/gemfiles/rails-7.1-propshaft.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.1.0"
+gem "propshaft"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-7.1.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.1.0"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-7.2-propshaft.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.2.0.rc1"
+gem "propshaft"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-7.2.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 7.2.0.rc1"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.4"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/lib/trestle/auth/engine.rb

@@ -1,7 +1,14 @@
 module Trestle
   module Auth
     class Engine < ::Rails::Engine
-      config.assets.precompile << "trestle/auth.css" << "trestle/auth/userbox.css"
+      initializer "trestle.sprockets" do |app|
+        # Sprockets manifest
+        config.assets.precompile << "trestle/auth/manifest.js"
+      end if defined?(Sprockets)
+
+      initializer "trestle.propshaft" do |app|
+        app.config.assets.excluded_paths << root.join("app/assets/sprockets")
+      end if defined?(Propshaft)
 
       config.before_initialize do
         Trestle::Engine.paths["app/helpers"].concat(paths["app/helpers"].existent)

data/lib/trestle/auth/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Auth
-    VERSION = "0.4.4"
+    VERSION = "0.5.0.pre2"
   end
 end

data/package.json

@@ -1,10 +1,10 @@
 {
   "name": "trestle-auth",
-  "version": "0.4.4",
+  "version": "0.5.0-pre2",
   "description": "Authentication plugin for the Trestle admin framework",
   "repository": "https://github.com/TrestleAdmin/trestle-auth.git",
   "author": "Sam Pohlenz <sam@sampohlenz.com>",
-  "license": "LGPL-3.0",
+  "license": "LGPL-3.0-only",
   "private": true,
   "scripts": {
     "dev": "webpack --mode development",
@@ -19,8 +19,8 @@
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.0.2",
     "mini-css-extract-plugin": "^2.0.0",
-    "node-sass": "^7.0.0",
     "postcss-loader": "^6.1.1",
+    "sass": "^1.77.6",
     "sass-loader": "^12.1.0",
     "webpack": "^5.42.0",
     "webpack-cli": "^4.7.2",

data/trestle-auth.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Authentication plugin for the Trestle admin framework"
   spec.homepage      = "https://www.trestle.io"
-  spec.license       = "LGPL-3.0"
+  spec.license       = "LGPL-3.0-only"
 
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
@@ -16,15 +16,15 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/TrestleAdmin/trestle-auth"
 
-  spec.add_dependency "trestle", "~> 0.9.0", ">= 0.9.3"
+  spec.add_dependency "trestle", "~> 0.10.0.pre2"
   spec.add_dependency "bcrypt",  "~> 3.1.7"
 
   spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "show_me_the_cookies", "~> 5.0"
+  spec.add_development_dependency "show_me_the_cookies", "~> 6.0"
   spec.add_development_dependency "timecop",             "~> 0.9.1"
 end

data/webpack.config.js

@@ -7,7 +7,7 @@ const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
 module.exports = {
   mode: 'production',
   entry: {
-    bundle: path.resolve(__dirname, 'frontend/index.scss'),
+    login: path.resolve(__dirname, 'frontend/index.scss'),
     userbox: path.resolve(__dirname, 'frontend/userbox.scss')
   },
   output: {
@@ -35,7 +35,14 @@ module.exports = {
               }
             }
           },
-          { loader: 'sass-loader' }
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: {
+                quietDeps: true
+              }
+            }
+          }
         ]
       }
     ]