Skip to content

Commit a75f9ec

Browse files
authored
Merge pull request metacpan#2247 from metacpan/oalders/lessc
Figure out where to find lessc
2 parents ab0f581 + 6d5e142 commit a75f9ec

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

lib/MetaCPAN/Middleware/Static.pm

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ use Cwd qw(cwd);
88

99
sub new { bless {}, $_[0] }
1010

11-
my $hour_ttl = 60 * 60;
12-
my $day_ttl = $hour_ttl * 24;
13-
my $year_ttl = $day_ttl * 365;
11+
my $hour_ttl = 60 * 60;
12+
my $day_ttl = $hour_ttl * 24;
13+
my $year_ttl = $day_ttl * 365;
14+
my $lessc_path = `which yarn` ? 'yarn lessc' : 'lessc';
1415

1516
sub wrap {
1617
my ( $self, $app, %args ) = @_;
@@ -66,21 +67,21 @@ sub wrap {
6667
enable 'Assets::FileCached' => (
6768
files => [ map "root$_", @css_files, @less_files ],
6869
extension => 'css',
69-
read_file => sub { scalar `yarn lessc -s $_[0]` },
70+
read_file => sub { scalar `$lessc_path -s $_[0]` },
7071
( $tempdir ? ( cache_dir => "$tempdir/assets" ) : () ),
7172
);
7273
}
7374
else {
7475
my @assets = (@js_files);
75-
if ( `yarn lessc --version` =~ /lessc/ ) {
76+
if ( `$lessc_path --version` =~ /lessc/ ) {
7677
enable 'Assets::Dev' => (
7778
files => [ map "root$_", @css_files, @less_files ],
7879
extension => 'css',
7980
read_file => sub {
8081
my $file = shift;
8182
my ($root_path) = $file =~ m{^root/(.*)/};
8283
scalar
83-
`yarn lessc -s --source-map-map-inline --source-map-rootpath="/$root_path/" "$file"`;
84+
`$lessc_path -s --source-map-map-inline --source-map-rootpath="/$root_path/" "$file"`;
8485
},
8586
);
8687
}

0 commit comments

Comments
 (0)