Skip to content
Merged
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/create-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Npm Install
run: |
npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-linux-prod-test-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-linux-test-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-mac-m1-prod-test-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-mac-m1-test-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-mac-test-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-windows-test-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/minor-version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- uses: actions/checkout@v3
with:
ref: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/patch-version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- uses: actions/checkout@v3
with:
ref: main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-chromium-linux-community.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-chromium-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-chromium-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-chromium-windows-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-chromium-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-firefox-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-firefox-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# - name: setup node
# uses: actions/setup-node@v3
# with:
# node-version: 20
# node-version: 24
# - name: Install dependencies
# run: npm ci
# - name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright-firefox-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/playwright-staging-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down Expand Up @@ -366,7 +366,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down Expand Up @@ -455,7 +455,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm ci
- name: Build phoenix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Npm Install
run: |
npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Npm Install
run: |
npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Npm Install
run: |
npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tauri-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 24
- name: Npm Install
run: |
npm ci
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"@floating-ui/dom": "^0.5.4",
"@fortawesome/fontawesome-free": "^6.1.2",
"@highlightjs/cdn-assets": "^11.5.1",
"@phcode/fs": "^4.0.1",
"@phcode/fs": "^4.0.2",
"@phcode/language-support": "^1.1.0",
"@pixelbrackets/gfm-stylesheet": "^1.1.0",
"@prettier/plugin-php": "^0.22.2",
Expand Down
8 changes: 4 additions & 4 deletions src-node/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 src-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"_watch_src-node": "cd .. && npm run _watch_src-node"
},
"engines": {
"node": "20"
"node": "24"
},
"repository": {
"type": "git",
"url": "https://github.com/phcode-dev/phoenix"
},
"IMPORTANT!!": "Adding things here will bloat up the package size",
"dependencies": {
"@phcode/fs": "^4.0.1",
"@phcode/fs": "^4.0.2",
"open": "^10.1.0",
"npm": "10.1.0",
"ws": "^8.17.1",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/new-project/assets/js/code-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ function _attachSettingBtnEventListeners() {
function _openURLInTauri(url) {
// in tauri, the <a> tag will not open a browser window. So we have to use phcode apis to do it.
// else, the browser itself will open the url. so we dont have to do this in normal browsers.
if(window.top.__TAURI__) {
if(window.top.__IS_NATIVE_SHELL__) {
window.top.Phoenix.app.openURLInDefaultBrowser(url);
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/document/DocumentCommandHandlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2253,15 +2253,13 @@ define(function (require, exports, module) {
}
}
function attachTauriUnloadHandler() {
window.__TAURI__.window.appWindow.onCloseRequested((event)=>{
Phoenix.app.onCloseWindowRequested(()=>{
_forceQuitIfNeeded();
if(closeInProgress){
event.preventDefault();
return;
return false;
}
closeInProgress = true;
PreferencesManager.setViewState("windowClosingTime", new Date().getTime());
event.preventDefault();
_handleWindowGoingAway(null, closeSuccess=>{
console.log('close success: ', closeSuccess);
exitWaitPromises.push(_safeFlushDB());
Expand All @@ -2277,6 +2275,7 @@ define(function (require, exports, module) {
console.log('close fail: ', closeFail);
closeInProgress = false;
});
return false;
});
}

Expand Down
6 changes: 4 additions & 2 deletions src/extensions/default/HealthData/SendToAnalytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,16 @@ define(function (require, exports, module) {
_sendStorageMetrics();
}

const envName = window.__TAURI__ ? "tauri-" : (window.__ELECTRON__ ? "electron-" : "");

let bugsnagPerformanceInited = false;
function _initBugsnagPerformance() {
bugsnagPerformanceInited = true;
BugsnagPerformance.start({
apiKey: '94ef94f4daf871ca0f2fc912c6d4764d',
appVersion: AppConfig.version,
releaseStage: window.__TAURI__ ?
`tauri-${AppConfig.config.bugsnagEnv}-${Phoenix.platform}` : AppConfig.config.bugsnagEnv,
releaseStage: window.__IS_NATIVE_SHELL__ ?
`${envName}${AppConfig.config.bugsnagEnv}-${Phoenix.platform}` : AppConfig.config.bugsnagEnv,
autoInstrumentRouteChanges: false,
autoInstrumentNetworkRequests: false,
autoInstrumentFullPageLoads: false
Expand Down
Loading
Loading