Skip to content

Commit 4634604

Browse files
committed
Merge branch 'main' of github.com:NativePHP/electron
2 parents 69b74ad + 5174edc commit 4634604

File tree

8 files changed

+106
-112
lines changed

8 files changed

+106
-112
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
11
# Changelog
22

33
All notable changes to `nativephp-laravel` will be documented in this file.
4+
5+
## 0.1.1 - 2023-07-22
6+
7+
### What's Changed
8+
9+
- fix: README badges by @bensherred in https://github.com/NativePHP/electron/pull/7
10+
- composer package local path remove for production release #14 by @AbmSourav in https://github.com/NativePHP/electron/pull/15
11+
- Package Name Update: Migrating from 'nativephp-electron' to '@nativephp/electron-plugin' by @hogus2037 in https://github.com/NativePHP/electron/pull/16
12+
- Fix install command by @bangbangda in https://github.com/NativePHP/electron/pull/17
13+
- Fix the issue of starting the development server by @mahmoudmohamedramadan in https://github.com/NativePHP/electron/pull/25
14+
15+
### New Contributors
16+
17+
- @bensherred made their first contribution in https://github.com/NativePHP/electron/pull/7
18+
- @AbmSourav made their first contribution in https://github.com/NativePHP/electron/pull/15
19+
- @hogus2037 made their first contribution in https://github.com/NativePHP/electron/pull/16
20+
- @bangbangda made their first contribution in https://github.com/NativePHP/electron/pull/17
21+
- @mahmoudmohamedramadan made their first contribution in https://github.com/NativePHP/electron/pull/25
22+
23+
**Full Changelog**: https://github.com/NativePHP/electron/compare/0.1.0...0.1.1
24+
25+
## 0.1.0 - 2023-07-20
26+
27+
### 🎉 NativePHP is here!

README.md

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,11 @@
1-
# Laravel wrapper for the NativePHP framework.
1+
# Electron "backend" for the NativePHP framework
22

3-
[![Latest Version on Packagist](https://img.shields.io/packagist/v/nativephp/nativephp-electron.svg?style=flat-square)](https://packagist.org/packages/nativephp/nativephp-electron)
4-
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/nativephp/nativephp-electron/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/nativephp/nativephp-electron/actions?query=workflow%3Arun-tests+branch%3Amain)
5-
[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/nativephp/nativephp-electron/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/nativephp/nativephp-electron/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
6-
[![Total Downloads](https://img.shields.io/packagist/dt/nativephp/nativephp-electron.svg?style=flat-square)](https://packagist.org/packages/nativephp/nativephp-electron)
3+
[![Latest Version on Packagist](https://img.shields.io/packagist/v/nativephp/electron.svg?style=flat-square)](https://packagist.org/packages/nativephp/electron)
4+
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/nativephp/electron/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/nativephp/electron/actions?query=workflow%3Arun-tests+branch%3Amain)
5+
[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/nativephp/electron/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/nativephp/electron/actions?query=workflow%3A"Fix+PHP+code+style+issues"+branch%3Amain)
6+
[![Total Downloads](https://img.shields.io/packagist/dt/nativephp/electron?style=flat-square)](https://packagist.org/packages/nativephp/electron)
77

8-
This is where your description should go. Limit it to a paragraph or two. Consider adding a small example.
9-
10-
## Installation
11-
12-
You can install the package via composer:
13-
14-
```bash
15-
composer require nativephp/electron
16-
```
17-
18-
You can publish and run the migrations with:
19-
20-
```bash
21-
php artisan vendor:publish --tag="native-php-migrations"
22-
php artisan migrate
23-
```
24-
25-
You can publish the native app provider using
26-
27-
```bash
28-
php artisan vendor:publish --tag="native-php-provider"
29-
```
8+
Visit the [official website](https://nativephp.com) to learn more about it.
309

3110
## Testing
3211

composer.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,6 @@
6969
}
7070
}
7171
},
72-
"repositories": [
73-
{
74-
"type": "path",
75-
"url": "./../nativephp-php-bin"
76-
},
77-
{
78-
"type": "path",
79-
"url": "./../nativephp-laravel"
80-
}
81-
],
8272
"minimum-stability": "dev",
8373
"prefer-stable": true
8474
}

resources/js/package-lock.json

Lines changed: 70 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@electron-toolkit/preload": "^1.0.3",
2828
"@electron-toolkit/utils": "^1.0.2",
2929
"@electron/remote": "^2.0.9",
30-
"nativephp-electron": "^1.0.0"
30+
"@nativephp/electron-plugin": "^0.1.0"
3131
},
3232
"devDependencies": {
3333
"@electron/notarize": "^1.2.3",

resources/js/src/main/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {app} from 'electron'
2-
import NativePHP from 'nativephp-electron'
2+
import NativePHP from '@nativephp/electron-plugin'
33
import defaultIcon from '../../resources/icon.png?asset&asarUnpack'
44
import phpBinary from '../../resources/php?asset&asarUnpack'
55
import certificate from '../../resources/cacert.pem?asset&asarUnpack'

src/Commands/DevelopCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function handle()
2222
'NATIVEPHP_CERTIFICATE_FILE_PATH' => base_path('vendor/nativephp/php-bin/cacert.pem'),
2323
])
2424
->forever()
25-
->run('yarn', function (string $type, string $output) {
25+
->run('npm install', function (string $type, string $output) {
2626
if ($this->getOutput()->isVerbose()) {
2727
echo $output;
2828
}
@@ -43,8 +43,8 @@ public function handle()
4343
'NATIVE_PHP_SKIP_QUEUE' => $this->option('no-queue') ? true : false,
4444
])
4545
->forever()
46-
->tty()
47-
->run('yarn run dev', function (string $type, string $output) {
46+
->tty(PHP_OS_FAMILY != 'Windows')
47+
->run('npm run dev', function (string $type, string $output) {
4848
if ($this->getOutput()->isVerbose()) {
4949
echo $output;
5050
}

src/Commands/InstallCommand.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public function handle()
1515
{
1616
$this->comment('Publishing NativePHP Service Provider...');
1717
$this->callSilent('vendor:publish', ['--tag' => 'nativephp-provider']);
18+
$this->callSilent('vendor:publish', ['--tag' => 'nativephp-config']);
1819

1920
if ($this->option('force') || $this->confirm('Would you like to install the NativePHP NPM dependencies?', true)) {
2021
$this->installNpmDependencies();

0 commit comments

Comments
 (0)