Skip to content

fix: naming conflict fixes and package-lock #335

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

Open
pdavies88 wants to merge 1 commit into
base: feature/vite-plus
Choose a base branch
from
Open

fix: naming conflict fixes and package-lock #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions .lintstagedrc.json
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions mu-plugins/10up-plugin/src/Assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ public function admin_scripts() {
public function admin_styles() {
wp_enqueue_style(
'tenup_plugin_admin',
TENUP_PLUGIN_URL . 'dist/css/admin.css',
TENUP_PLUGIN_URL . 'dist/css/admin-style.css',
[],
$this->get_asset_info( 'admin', 'version' ),
// Deliberately 'admin-style', not 'admin' — see vite.config.ts.
$this->get_asset_info( 'admin-style', 'version' ),
);
}
}
7 changes: 6 additions & 1 deletion mu-plugins/10up-plugin/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@ export default defineConfig({
build: {
outDir: "dist",
rollupOptions: {
// 'css/admin-style', not 'css/admin': TenupFramework's
// get_asset_info('admin') checks dist/js/admin.asset.php before
// dist/css/admin.asset.php, so a same-named CSS entry silently
// inherited the JS entry's version/deps instead of its own (the
// style enqueue never busted cache on CSS-only edits).
input: {
"js/admin": "./assets/js/admin/admin.js",
"css/admin": "./assets/css/admin/admin-style.css",
"css/admin-style": "./assets/css/admin/admin-style.css",
},
output: {
entryFileNames: "[name].js",
Expand Down
Loading
Loading