Skip to content

Commit 8750dad

Browse files
author
TW-IT-Jerry Liu
committed
chore: remove RENDER_ID
1 parent 83c535b commit 8750dad

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

inc/class/admin/cpt/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function add_metabox( string $post_type ): void {
184184
*/
185185
public function render_meta_box(): void {
186186
// phpcs:ignore
187-
echo '<div id="' . Utils::RENDER_ID_2 . '"></div>';
187+
echo '<div id="' . Utils::APP2_SELECTOR . '"></div>';
188188
}
189189

190190

inc/class/front-end/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __construct() {
2424
*/
2525
public function render_app(): void {
2626
// phpcs:ignore
27-
echo '<div id="' . Utils::RENDER_ID_1 . '"></div>';
27+
echo '<div id="' . Utils::APP1_SELECTOR . '"></div>';
2828
}
2929
}
3030

inc/utils/class-utils.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,5 @@ abstract class Utils {
1515
const APP1_SELECTOR = 'my_app';
1616
const APP2_SELECTOR = 'my_app_metabox';
1717
const API_TIMEOUT = '30000';
18-
19-
const RENDER_ID_1 = 'my_app';
20-
const RENDER_ID_2 = 'my_app_metabox';
21-
2218
const DEFAULT_IMAGE = 'http://1.gravatar.com/avatar/1c39955b5fe5ae1bf51a77642f052848?s=96&d=mm&r=g';
2319
}

js/src/types/global.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ declare global {
1515
KEBAB: string
1616
SNAKE: string
1717
BASE_URL: string
18-
RENDER_ID_1: string
19-
RENDER_ID_2: string
18+
APP1_SELECTOR: string
19+
APP2_SELECTOR: string
2020
API_TIMEOUT: string
2121
}
2222
}

js/src/utils/env.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
/* eslint-disable @typescript-eslint/ban-ts-comment */
22
// @ts-nocheck
33

4+
import { removeTrailingSlash } from '@/utils'
5+
46
const APP_DOMAIN = 'my_app_data' as string
57
export const snake = window?.[APP_DOMAIN]?.env?.SNAKE || 'my_app'
68
export const appName = window?.[APP_DOMAIN]?.env?.APP_NAME || 'My App'
79
export const kebab = window?.[APP_DOMAIN]?.env?.KEBAB || 'my-app'
810
export const app1Selector = window?.[APP_DOMAIN]?.env?.APP1_SELECTOR || 'my_app'
911
export const app2Selector =
1012
window?.[APP_DOMAIN]?.env?.APP2_SELECTOR || 'my_app_metabox'
11-
export const apiUrl = window?.wpApiSettings?.root || '/wp-json'
13+
export const apiUrl =
14+
removeTrailingSlash(window?.wpApiSettings?.root) || '/wp-json'
1215
export const ajaxUrl =
13-
window?.[APP_DOMAIN]?.env?.ajaxUrl || '/wp-admin/admin-ajax.php'
14-
export const siteUrl = window?.[APP_DOMAIN]?.env?.siteUrl || '/'
16+
removeTrailingSlash(window?.[APP_DOMAIN]?.env?.ajaxUrl) ||
17+
'/wp-admin/admin-ajax.php'
18+
export const siteUrl =
19+
removeTrailingSlash(window?.[APP_DOMAIN]?.env?.siteUrl) || '/'
1520
export const currentUserId = window?.[APP_DOMAIN]?.env?.userId || '0'
1621
export const postId = window?.[APP_DOMAIN]?.env?.postId || '0'
17-
export const permalink = window?.[APP_DOMAIN]?.env?.permalink || '/'
18-
export const apiTimeout = import.meta.env.API_TIMEOUT || '30000'
22+
export const permalink =
23+
removeTrailingSlash(window?.[APP_DOMAIN]?.env?.permalink) || '/'
24+
export const apiTimeout = '30000'
1925
export const ajaxNonce = window?.[APP_DOMAIN]?.env?.nonce || ''

0 commit comments

Comments
 (0)