Skip to content

Commit

Permalink
Merge pull request #85 from conedevelopment/vite
Browse files Browse the repository at this point in the history
Vite
  • Loading branch information
iamgergo authored Aug 3, 2022
2 parents fdf9c6f + 9b08707 commit 5a4cb39
Show file tree
Hide file tree
Showing 54 changed files with 567 additions and 3,058 deletions.
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Fake APP_URL for Vite
APP_URL=
2 changes: 1 addition & 1 deletion .github/workflows/install-laravel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ jobs:
run: "npm install --production"

- name: "Build front-end"
run: "npm run production"
run: "npm run build"
2 changes: 1 addition & 1 deletion .github/workflows/vuejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ jobs:
run: "yarn install --non-interactive --pure-lockfile --production"

- name: "Build front-end"
run: "yarn run production"
run: "yarn run build"
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/public/storage
/storage/*.key
/vendor
.env
# .env
.env.backup
.phpunit.result.cache
docker-compose.override.yml
Expand Down
14 changes: 6 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
{
"private": true,
"scripts": {
"dev": "yarn run development",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "yarn run production",
"production": "mix --production",
"dev": "vite",
"build": "vite build",
"test": "jest",
"lint": "eslint resources/js/",
"lint-sass": "stylelint resources/sass/"
Expand All @@ -16,18 +11,21 @@
"@inertiajs/inertia": "^0.11.0",
"@inertiajs/inertia-vue3": "^0.6.0",
"@inertiajs/progress": "^0.2.7",
"@vitejs/plugin-vue": "^3.0.1",
"@vue/compiler-sfc": "^3.0.5",
"laravel-mix": "^6.0.6",
"laravel-vite-plugin": "^0.5.0",
"postcss": "^8.2.4",
"quill": "^1.3.7",
"resolve-url-loader": "^3.1.2",
"sass": "^1.32.4",
"sass-loader": "^8.0.0",
"sprucecss": "^0.8.1",
"vite": "^3.0.0",
"vue": "^3.2.26",
"vue-loader": "^16.1.0"
},
"devDependencies": {
"@babel/preset-env": "^7.18.10",
"@vue/test-utils": "^2.0.0-rc.1",
"eslint": "^7.20.0",
"eslint-plugin-vue": "^7.6.0",
Expand Down
7 changes: 0 additions & 7 deletions public/app.css

This file was deleted.

3 changes: 0 additions & 3 deletions public/app.js

This file was deleted.

8 changes: 0 additions & 8 deletions public/app.js.LICENSE.txt

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/Actions.e3e969c7.js

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

1 change: 1 addition & 0 deletions public/build/assets/Dashboard.81b67ac4.js

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

1 change: 1 addition & 0 deletions public/build/assets/Error.57c3016b.js

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

1 change: 1 addition & 0 deletions public/build/assets/Form.30be2b75.js

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

1 change: 1 addition & 0 deletions public/build/assets/Form.439fdb4d.js

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

1 change: 1 addition & 0 deletions public/build/assets/Form.663a02f7.js

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

1 change: 1 addition & 0 deletions public/build/assets/Index.cae76a6d.js

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

1 change: 1 addition & 0 deletions public/build/assets/Index.cdbb2223.js

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

1 change: 1 addition & 0 deletions public/build/assets/Index.e02071e6.js

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

1 change: 1 addition & 0 deletions public/build/assets/Show.816a29ed.js

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

1 change: 1 addition & 0 deletions public/build/assets/Show.84cf50b4.js

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

Loading

0 comments on commit 5a4cb39

Please sign in to comment.