Skip to content

Commit

Permalink
Merge branch 'release/v1.1.1-stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertCordes committed Feb 20, 2019
2 parents b4ca928 + 57f9e55 commit 1f2fd97
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/).

## [1.1.1] - 2019-02-20

### Changed

- Remove double slash in generated links [Fixes #2](https://github.com/Diverently/laravel-mix-kirby/issues/2)

## [1.1.0] - 2019-02-19

### Added
Expand Down
12 changes: 2 additions & 10 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,8 @@ function mix($path)
$manifestPath = Str::substr($manifestPath, 1);
}

// Get the correct $$assetsDirectory
$assetsDirectory = option('diverently.laravel-mix-kirby.assetsDirectory', '/assets/');

if (! Str::startsWith($assetsDirectory, '/')) {
$assetsDirectory = "/{$assetsDirectory}";
}

if (! Str::endsWith($assetsDirectory, '/')) {
$assetsDirectory = "{$assetsDirectory}/";
}
// Get the correct $assetsDirectory
$assetsDirectory = option('diverently.laravel-mix-kirby.assetsDirectory', '/assets');

// Get the manifest contents
if (!$manifest) {
Expand Down

0 comments on commit 1f2fd97

Please sign in to comment.