Skip to content
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

Jump to bottom

Prepare for separation of JS from PHP; header.inc.php done #3939

Merged
merged 3 commits into from
May 2, 2024
Merged

Prepare for separation of JS from PHP; header.inc.php done #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b5d4e1
Prepare for separation of js from php; header.inc.php done
mitchray Apr 25, 2024
8913c1d
php-cs-fixer
mitchray Apr 27, 2024
52d52ea
early return if false
mitchray Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ web.config
*~
.php-cs-fixer.cache
.phpunit.result.cache
public/dist/
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"doctrine/cache": "^2",
"gettext/gettext": "^5",
"gettext/translator": "^1.2",
"idleberg/vite-manifest": "^1.0",
"james-heinrich/getid3": "dev-master",
"jwilsson/spotify-web-api-php": "^6",
"krixon/xbmc-php-rpc": "dev-master",
Expand Down
238 changes: 236 additions & 2 deletions composer.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ There are a few docker files I've been using to build and test that have helped
Anyone with a bit of docker knowledge should be able to get up and running but here's the gist.

* Run `docker-compose up` to start the container
* Don't forget to run `composer install` & `npm install` in the project root
* Don't forget to run `composer install` & `npm install` & `npm run build` in the project root

After you're up and running you should be able to install as normal. (MySQL is not included in the docker files)

Expand Down
3 changes: 2 additions & 1 deletion docs/RELEASE-PROCESS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ php7.4 /usr/local/bin/composer install
php8.0 /usr/local/bin/composer install
```

* Install npm packages
* Install npm packages & build javascript files

```shell
npm install
npm run build
```

* Remove broken symbolic links
Expand Down
3 changes: 2 additions & 1 deletion docs/examples/update_from_git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ php bin/cli run:updateCatalog -t
### You don't always need to do this but some people might want to keep composer packages updated here
#composer install --prefer-source --no-interaction

### NPM install is now required to copy all the javascript packages
### NPM is now required to handle all the javascript packages
npm install
npm run build