Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

【2人目確認待ち】Tree Shaking を 3.2 に更新 #19

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

【2人目確認待ち】Tree Shaking を 3.2 に更新 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f13f65a
update: tree-shaking 3.2
drill-lancer Sep 26, 2024
edda64a
fix: filter name
drill-lancer Sep 27, 2024
130e90f
fix: filter hook name
drill-lancer Sep 27, 2024
4982177
fix: filter hook name
drill-lancer Sep 27, 2024
3660848
fix: filter hook name
drill-lancer Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ npx playwright test --project=chromium --trace on

## Change log

[ その他 ] Tree Shaking アップデート 3.2.0

0.2.5
[ 不具合修正 ] VK Blocks 1.85 からテーブルのスクロールヒントのCSSが TreeShaking で正しく処理できず、その影響で非表示クラスが効かなくなるなどの不具合が発生するため、見た目の不具合回避のために応急処置として強制的に TreeShaking を無効化

Expand Down
41 changes: 29 additions & 12 deletions src/VkCssOptimize.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class VkCssOptimize {
*/
public function __construct() {
add_action( 'customize_register', array( __CLASS__, 'customize_register' ) );
add_filter( 'css_tree_shaking_exclude', array( __CLASS__, 'tree_shaking_exclude' ) );
add_filter( 'css_tree_shaking_js_added_class', array( __CLASS__, 'tree_shaking_js_added_class' ) );
Copy link
Member

@kurudrive kurudrive Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@drill-lancer
css_tree_shaking_exclude フィルターは Lightning などで使用されているし、いないとは思いますが使用している他の人がいる可能性もあるので削除すると影響がでるのではないかなと思います。


$options = self::get_css_optimize_options();

Expand Down Expand Up @@ -309,12 +309,6 @@ public static function get_css_optimize_options() {
update_option( 'vk_css_optimize_options', $vk_css_optimize_options );
}

// 0.2.5
// VK Blocks 1.85 からテーブルのスクロールヒントのCSSが TreeShaking で正しく処理できず、
// その影響で非表示クラスが効かなくなるなどの不具合が発生するため、
// 見た目の不具合回避のために応急処置として強制的に TreeShaking を無効化
$vk_css_optimize_options['tree_shaking'] = '';

return $vk_css_optimize_options;
}

Expand Down Expand Up @@ -473,10 +467,33 @@ public static function css_tree_shaking_buffer( $buffer ) {
$css = $wp_filesystem->get_contents( $path_name );
}

$jsaddlist = array(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@drill-lancer この $jsaddlist は何の配列ですか？

'device-mobile',
'header_scrolled',
'active',
'menu-open',
'vk-mobile-nav-menu-btn',
'vk-mobile-nav-open',
'vk-menu-acc-active',
'acc-parent-open',
'acc-btn',
'acc-btn-open',
'acc-btn-close',
'acc-child-open',
'carousel-item-left',
'carousel-item-next',
'carousel-item-right',
'carousel-item-prev',
'form-control',
'btn',
'btn-primary',
);
$jsaddlist = apply_filters( 'css_tree_shaking_js_added_class', $jsaddlist );

// CSS の中身が取得できた場合のみ Tree Shaking を反映する
if ( ! empty( $css ) ) {
// tree shaking を実行して再格納 .
$css = CSS_tree_shaking::extended_minify( CSS_tree_shaking::simple_minify( $css ), $buffer );
$css = CSS_tree_shaking::extended_minify( CSS_tree_shaking::simple_minify( $css ), $buffer, $jsaddlist );

// ファイルで読み込んでいるCSSを直接出力に置換（バージョンパラメーターあり）.
$buffer = str_replace(
Expand Down Expand Up @@ -611,9 +628,9 @@ public static function css_preload( $tag, $handle, $href, $media ) {
/**
* Exclude CSS.
*
* @param string $inidata exclude css class.
* @param string $jsaddlist exclude css class.
*/
public static function tree_shaking_exclude( $inidata ) {
public static function tree_shaking_js_added_class( $jsaddlist ) {
$options = self::get_css_optimize_options();

$exclude_classes_array = array();
Expand All @@ -634,8 +651,8 @@ public static function tree_shaking_exclude( $inidata ) {

}

$inidata['class'] = array_merge( $inidata['class'], $exclude_classes_array );
$jsaddlist = array_merge( $jsaddlist, $exclude_classes_array );

return $inidata;
return $jsaddlist;
}
}
Loading
Loading