Skip to content

feat: Add AdminTools Smart Item #444

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.

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

Draft
wants to merge 23 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/drop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
drop_pre_release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
cache: 'npm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
cache: 'npm'
Expand All @@ -53,10 +53,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
cache: 'npm'

- run: npm i prettier
- run: npx prettier --check "**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx,vue}"
- run: npx prettier --check "**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}"
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
os: [ macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typechecking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
cache: 'npm'
Expand Down
136 changes: 27 additions & 109 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test:renderer": "vitest run -r packages/renderer --passWithNoTests",
"watch": "node scripts/watch.js",
"start": "npm run watch",
"lint": "eslint . --ext js,mjs,cjs,ts,mts,cts,vue",
"lint": "eslint . --ext js,mjs,cjs,ts,mts,cts",
"typecheck:main": "tsc --noEmit -p packages/main/tsconfig.json",
"typecheck:preload": "tsc --noEmit -p packages/preload/tsconfig.json",
"typecheck:renderer": "tsc --noEmit -p packages/renderer/tsconfig.json",
Expand All @@ -50,11 +50,11 @@
"electron": "31.1.0",
"electron-builder": "24.13.3",
"eslint": "8.57.0",
"eslint-plugin-vue": "9.27.0",
"flat": "^6.0.1",
"happy-dom": "14.12.3",
"nano-staged": "0.8.0",
"playwright": "1.45.0",
"prettier": "^3.5.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-intl": "^6.6.8",
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/modules/bin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export async function install() {
// no need to install node and npm in dev mode since they should already be in the $PATH for dev environment to work
log.info('[Install] Skipping installation of node and npm binaries in DEV mode');
}

installed.resolve();
} catch (error: any) {
log.error('[Install] Failed to install node and npm binaries:', error.message);
Expand Down
4 changes: 3 additions & 1 deletion packages/renderer/src/components/EditorPage/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ export function EditorPage() {
if (import.meta.env.VITE_ASSET_PACKS_JS_PORT && import.meta.env.VITE_ASSET_PACKS_JS_PATH) {
// this is for local development of the asset-packs repo
const b64 = btoa(import.meta.env.VITE_ASSET_PACKS_JS_PATH);
binIndexJsUrl = `http://localhost:${import.meta.env.VITE_ASSET_PACKS_JS_PORT}/content/contents/b64-${b64}`;
binIndexJsUrl = `http://localhost:${
import.meta.env.VITE_ASSET_PACKS_JS_PORT
}/content/contents/b64-${b64}`;
}

// this is the asset-packs javascript file
Expand Down
Loading