Skip to content

Commit

Permalink
Merge branch 'release/1.10.22'
Browse files Browse the repository at this point in the history
  • Loading branch information
rhukster committed Sep 16, 2021
2 parents d73ec60 + 63f3e9e commit 129ee90
Show file tree
Hide file tree
Showing 14 changed files with 123 additions and 86 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.10.22
## 09/16/2021

1. [](#new)
* Updated SCSS compiler to v1.7

# v1.10.21
## 09/14/2021

Expand Down
2 changes: 1 addition & 1 deletion blueprints.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Admin Panel
slug: admin
type: plugin
version: 1.10.21
version: 1.10.22
description: Adds an advanced administration panel to manage your site
icon: empire
author:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"php": "^7.3.6 || ^8.0",
"ext-json": "*",
"p3k/picofeed": "@stable",
"scssphp/scssphp": "^1.5"
"scssphp/scssphp": "^1.7"
},
"require-dev": {
"codeception/codeception": "^2.4",
Expand Down
15 changes: 7 additions & 8 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit14b786715d80b97050af9c30f5c07b7c::getLoader();
return ComposerAutoloaderInitd6a520eb662703b9aa0b94d2e30cc77f::getLoader();
10 changes: 5 additions & 5 deletions vendor/composer/InstalledVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => 'ea31417d33e4e26168a4130260ce0c727f0f8fbc',
'reference' => '879819123303cf642c0552339cc2e1b46e94aab1',
'name' => 'getgrav/grav-plugin-admin',
),
'versions' =>
Expand All @@ -41,7 +41,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => 'ea31417d33e4e26168a4130260ce0c727f0f8fbc',
'reference' => '879819123303cf642c0552339cc2e1b46e94aab1',
),
'laminas/laminas-xml' =>
array (
Expand Down Expand Up @@ -79,12 +79,12 @@ class InstalledVersions
),
'scssphp/scssphp' =>
array (
'pretty_version' => 'v1.6.0',
'version' => '1.6.0.0',
'pretty_version' => 'v1.7.0',
'version' => '1.7.0.0',
'aliases' =>
array (
),
'reference' => 'b83594e2323c5d6e80785df3f91b9d1d32aad530',
'reference' => '797f76527c72bc4fe4ee32a94c4732e8d94517ae',
),
'symfony/polyfill-php72' =>
array (
Expand Down
14 changes: 7 additions & 7 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit14b786715d80b97050af9c30f5c07b7c
class ComposerAutoloaderInitd6a520eb662703b9aa0b94d2e30cc77f
{
private static $loader;

Expand All @@ -24,15 +24,15 @@ public static function getLoader()

require __DIR__ . '/platform_check.php';

spl_autoload_register(array('ComposerAutoloaderInit14b786715d80b97050af9c30f5c07b7c', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitd6a520eb662703b9aa0b94d2e30cc77f', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit14b786715d80b97050af9c30f5c07b7c', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitd6a520eb662703b9aa0b94d2e30cc77f', 'loadClassLoader'));

$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';

call_user_func(\Composer\Autoload\ComposerStaticInit14b786715d80b97050af9c30f5c07b7c::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitd6a520eb662703b9aa0b94d2e30cc77f::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
Expand All @@ -53,19 +53,19 @@ public static function getLoader()
$loader->register(true);

if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit14b786715d80b97050af9c30f5c07b7c::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitd6a520eb662703b9aa0b94d2e30cc77f::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire14b786715d80b97050af9c30f5c07b7c($fileIdentifier, $file);
composerRequired6a520eb662703b9aa0b94d2e30cc77f($fileIdentifier, $file);
}

return $loader;
}
}

function composerRequire14b786715d80b97050af9c30f5c07b7c($fileIdentifier, $file)
function composerRequired6a520eb662703b9aa0b94d2e30cc77f($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
Expand Down
10 changes: 5 additions & 5 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInit14b786715d80b97050af9c30f5c07b7c
class ComposerStaticInitd6a520eb662703b9aa0b94d2e30cc77f
{
public static $files = array (
'7e9bd612cc444b3eed788ebbe46263a0' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/autoload.php',
Expand Down Expand Up @@ -63,10 +63,10 @@ class ComposerStaticInit14b786715d80b97050af9c30f5c07b7c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit14b786715d80b97050af9c30f5c07b7c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit14b786715d80b97050af9c30f5c07b7c::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit14b786715d80b97050af9c30f5c07b7c::$prefixesPsr0;
$loader->classMap = ComposerStaticInit14b786715d80b97050af9c30f5c07b7c::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitd6a520eb662703b9aa0b94d2e30cc77f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd6a520eb662703b9aa0b94d2e30cc77f::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInitd6a520eb662703b9aa0b94d2e30cc77f::$prefixesPsr0;
$loader->classMap = ComposerStaticInitd6a520eb662703b9aa0b94d2e30cc77f::$classMap;

}, null, ClassLoader::class);
}
Expand Down
14 changes: 7 additions & 7 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,17 @@
},
{
"name": "scssphp/scssphp",
"version": "v1.6.0",
"version_normalized": "1.6.0.0",
"version": "v1.7.0",
"version_normalized": "1.7.0.0",
"source": {
"type": "git",
"url": "https://github.com/scssphp/scssphp.git",
"reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530"
"reference": "797f76527c72bc4fe4ee32a94c4732e8d94517ae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/b83594e2323c5d6e80785df3f91b9d1d32aad530",
"reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530",
"url": "https://api.github.com/repos/scssphp/scssphp/zipball/797f76527c72bc4fe4ee32a94c4732e8d94517ae",
"reference": "797f76527c72bc4fe4ee32a94c4732e8d94517ae",
"shasum": ""
},
"require": {
Expand All @@ -223,7 +223,7 @@
"ext-iconv": "Can be used as fallback when ext-mbstring is not available",
"ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
},
"time": "2021-07-02T16:28:10+00:00",
"time": "2021-09-15T21:57:30+00:00",
"bin": [
"bin/pscss"
],
Expand Down Expand Up @@ -261,7 +261,7 @@
],
"support": {
"issues": "https://github.com/scssphp/scssphp/issues",
"source": "https://github.com/scssphp/scssphp/tree/v1.6.0"
"source": "https://github.com/scssphp/scssphp/tree/v1.7.0"
},
"install-path": "../scssphp/scssphp"
}
Expand Down
10 changes: 5 additions & 5 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'aliases' =>
array (
),
'reference' => 'ea31417d33e4e26168a4130260ce0c727f0f8fbc',
'reference' => '879819123303cf642c0552339cc2e1b46e94aab1',
'name' => 'getgrav/grav-plugin-admin',
),
'versions' =>
Expand All @@ -18,7 +18,7 @@
'aliases' =>
array (
),
'reference' => 'ea31417d33e4e26168a4130260ce0c727f0f8fbc',
'reference' => '879819123303cf642c0552339cc2e1b46e94aab1',
),
'laminas/laminas-xml' =>
array (
Expand Down Expand Up @@ -56,12 +56,12 @@
),
'scssphp/scssphp' =>
array (
'pretty_version' => 'v1.6.0',
'version' => '1.6.0.0',
'pretty_version' => 'v1.7.0',
'version' => '1.7.0.0',
'aliases' =>
array (
),
'reference' => 'b83594e2323c5d6e80785df3f91b9d1d32aad530',
'reference' => '797f76527c72bc4fe4ee32a94c4732e8d94517ae',
),
'symfony/polyfill-php72' =>
array (
Expand Down
8 changes: 4 additions & 4 deletions vendor/scssphp/scssphp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@
"type": "package",
"package": {
"name": "sass/sass-spec",
"version": "2021.06.30",
"version": "2021.09.15",
"source": {
"type": "git",
"url": "https://github.com/sass/sass-spec.git",
"reference": "e348959657f1e274cef658283436a311a925a673"
"reference": "eb2d7a0865c1faf0b55a39ff962b24aca9b4c955"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sass/sass-spec/zipball/e348959657f1e274cef658283436a311a925a673",
"reference": "e348959657f1e274cef658283436a311a925a673",
"url": "https://api.github.com/repos/sass/sass-spec/zipball/eb2d7a0865c1faf0b55a39ff962b24aca9b4c955",
"reference": "eb2d7a0865c1faf0b55a39ff962b24aca9b4c955",
"shasum": ""
}
}
Expand Down
Loading

0 comments on commit 129ee90

Please sign in to comment.