Skip to content

Письменов Дмитрий Иванович / yourroomads

Go to a project
Commit 14352710 by Jonathan Reinink
Options

Update to tagged Inertia dependencies

1 parent 9a6b453d
Inline Side-by-side
Showing with 76 additions and 77 deletions
composer.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"php": "^7.1.3", "php": "^7.1.3",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
"fzaninotto/faker": "^1.4", "fzaninotto/faker": "^1.4",
"inertiajs/inertia-laravel": "dev-master", "inertiajs/inertia-laravel": "^0.1",
"laravel/framework": "5.8.*", "laravel/framework": "5.8.*",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"league/glide": "2.0.x-dev", "league/glide": "2.0.x-dev",
......
composer.lock
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "aafc954371d0b2fa7b41fe7aaaf06002", "content-hash": "e3a03697cfba963e1bd23acff848c897",
"packages": [ "packages": [
{ {
"name": "dnoegel/php-xdg-base-dir", "name": "dnoegel/php-xdg-base-dir",
...@@ -503,16 +503,16 @@ ...@@ -503,16 +503,16 @@
}, },
{ {
"name": "inertiajs/inertia-laravel", "name": "inertiajs/inertia-laravel",
"version": "dev-master", "version": "v0.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/inertiajs/inertia-laravel.git", "url": "https://github.com/inertiajs/inertia-laravel.git",
"reference": "cb84170a9a3a1eee5afa1842b292446571f78f48" "reference": "2bdd1af10f488007a8981b66982d011054464e88"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/cb84170a9a3a1eee5afa1842b292446571f78f48", "url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/2bdd1af10f488007a8981b66982d011054464e88",
"reference": "cb84170a9a3a1eee5afa1842b292446571f78f48", "reference": "2bdd1af10f488007a8981b66982d011054464e88",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
"inertia", "inertia",
"laravel" "laravel"
], ],
"time": "2019-08-10T13:02:20+00:00" "time": "2019-08-10T13:58:04+00:00"
}, },
{ {
"name": "intervention/image", "name": "intervention/image",
...@@ -712,16 +712,16 @@ ...@@ -712,16 +712,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.8.31", "version": "v5.8.32",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "24cc1786bd55876fa52380306354772355345efd" "reference": "ee16d719516dfd77ed6c9538000bca49ded284e2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/24cc1786bd55876fa52380306354772355345efd", "url": "https://api.github.com/repos/laravel/framework/zipball/ee16d719516dfd77ed6c9538000bca49ded284e2",
"reference": "24cc1786bd55876fa52380306354772355345efd", "reference": "ee16d719516dfd77ed6c9538000bca49ded284e2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -855,20 +855,20 @@ ...@@ -855,20 +855,20 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2019-08-06T15:09:02+00:00" "time": "2019-08-13T14:11:52+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v1.0.9", "version": "v1.0.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/tinker.git", "url": "https://github.com/laravel/tinker.git",
"reference": "eb0075527fdeeb1cc1d68bd4ca7d50256b30a827" "reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/eb0075527fdeeb1cc1d68bd4ca7d50256b30a827", "url": "https://api.github.com/repos/laravel/tinker/zipball/ad571aacbac1539c30d480908f9d0c9614eaf1a7",
"reference": "eb0075527fdeeb1cc1d68bd4ca7d50256b30a827", "reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -918,7 +918,7 @@ ...@@ -918,7 +918,7 @@
"laravel", "laravel",
"psysh" "psysh"
], ],
"time": "2019-07-29T18:09:25+00:00" "time": "2019-08-07T15:10:45+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
...@@ -1213,16 +1213,16 @@ ...@@ -1213,16 +1213,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.2.2", "version": "v4.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420" "reference": "e612609022e935f3d0337c1295176505b41188c8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8",
"reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420", "reference": "e612609022e935f3d0337c1295176505b41188c8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1230,7 +1230,7 @@ ...@@ -1230,7 +1230,7 @@
"php": ">=7.0" "php": ">=7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.5 || ^7.0" "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
}, },
"bin": [ "bin": [
"bin/php-parse" "bin/php-parse"
...@@ -1260,7 +1260,7 @@ ...@@ -1260,7 +1260,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2019-05-25T20:07:01+00:00" "time": "2019-08-12T20:17:41+00:00"
}, },
{ {
"name": "opis/closure", "name": "opis/closure",
...@@ -3442,22 +3442,22 @@ ...@@ -3442,22 +3442,22 @@
}, },
{ {
"name": "beyondcode/laravel-dump-server", "name": "beyondcode/laravel-dump-server",
"version": "1.2.2", "version": "1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/beyondcode/laravel-dump-server.git", "url": "https://github.com/beyondcode/laravel-dump-server.git",
"reference": "8864b9efcb48e0a79e83014dd7f0a5481f5c808f" "reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/8864b9efcb48e0a79e83014dd7f0a5481f5c808f", "url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
"reference": "8864b9efcb48e0a79e83014dd7f0a5481f5c808f", "reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"illuminate/console": "5.6.*|5.7.*|5.8.*", "illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0",
"illuminate/http": "5.6.*|5.7.*|5.8.*", "illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0",
"illuminate/support": "5.6.*|5.7.*|5.8.*", "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0",
"php": "^7.1", "php": "^7.1",
"symfony/var-dumper": "^4.1.1" "symfony/var-dumper": "^4.1.1"
}, },
...@@ -3488,9 +3488,9 @@ ...@@ -3488,9 +3488,9 @@
"authors": [ "authors": [
{ {
"name": "Marcel Pociot", "name": "Marcel Pociot",
"role": "Developer",
"email": "marcel@beyondco.de", "email": "marcel@beyondco.de",
"homepage": "https://beyondcode.de", "homepage": "https://beyondco.de"
"role": "Developer"
} }
], ],
"description": "Symfony Var-Dump Server for Laravel", "description": "Symfony Var-Dump Server for Laravel",
...@@ -3499,7 +3499,7 @@ ...@@ -3499,7 +3499,7 @@
"beyondcode", "beyondcode",
"laravel-dump-server" "laravel-dump-server"
], ],
"time": "2018-10-04T07:22:24+00:00" "time": "2019-08-11T13:17:40+00:00"
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
...@@ -4777,16 +4777,16 @@ ...@@ -4777,16 +4777,16 @@
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
"version": "3.1.0", "version": "3.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git", "url": "https://github.com/sebastianbergmann/exporter.git",
"reference": "234199f4528de6d12aaa58b612e98f7d36adb937" "reference": "06a9a5947f47b3029d76118eb5c22802e5869687"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687",
"reference": "234199f4528de6d12aaa58b612e98f7d36adb937", "reference": "06a9a5947f47b3029d76118eb5c22802e5869687",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4814,6 +4814,10 @@ ...@@ -4814,6 +4814,10 @@
], ],
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "Jeff Welch", "name": "Jeff Welch",
"email": "whatthejeff@gmail.com" "email": "whatthejeff@gmail.com"
}, },
...@@ -4822,16 +4826,12 @@ ...@@ -4822,16 +4826,12 @@
"email": "github@wallbash.com" "email": "github@wallbash.com"
}, },
{ {
"name": "Bernhard Schussek",
"email": "bschussek@2bepublished.at"
},
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "Adam Harvey", "name": "Adam Harvey",
"email": "aharvey@php.net" "email": "aharvey@php.net"
},
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
} }
], ],
"description": "Provides the functionality to export PHP variables for visualization", "description": "Provides the functionality to export PHP variables for visualization",
...@@ -4840,7 +4840,7 @@ ...@@ -4840,7 +4840,7 @@
"export", "export",
"exporter" "exporter"
], ],
"time": "2017-04-03T13:19:02+00:00" "time": "2019-08-11T12:43:14+00:00"
}, },
{ {
"name": "sebastian/global-state", "name": "sebastian/global-state",
...@@ -5218,7 +5218,6 @@ ...@@ -5218,7 +5218,6 @@
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"inertiajs/inertia-laravel": 20,
"league/glide": 20 "league/glide": 20
}, },
"prefer-stable": true, "prefer-stable": true,
......
package-lock.json
...@@ -833,6 +833,22 @@ ...@@ -833,6 +833,22 @@
"to-fast-properties": "^2.0.0" "to-fast-properties": "^2.0.0"
} }
}, },
"@inertiajs/inertia": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@inertiajs/inertia/-/inertia-0.1.0.tgz",
"integrity": "sha512-YfyvCREedJpd5Wm5NGgRjzc9a+lFJWLEOpSz7I2bEAN0fb87+7CB4BHqpV7j6lkz6eN0m0qojWzVww+HnVzuOQ==",
"dev": true,
"requires": {
"axios": "^0.18.0",
"nprogress": "^0.2.0"
}
},
"@inertiajs/inertia-vue": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/@inertiajs/inertia-vue/-/inertia-vue-0.1.1.tgz",
"integrity": "sha512-YVtfoBxawI0mnoAdbRgRlRsUK/2pcjL6U4Y8Um38lvKY0hXb3hN3xFyqhCh451SUV+5YjJo19vNydZDk4n6i7g==",
"dev": true
},
"@mrmlnc/readdir-enhanced": { "@mrmlnc/readdir-enhanced": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
...@@ -3191,9 +3207,9 @@ ...@@ -3191,9 +3207,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.224", "version": "1.3.225",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.224.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.225.tgz",
"integrity": "sha512-vTH9UcMbi53x/pZKQrEcD83obE8agqQwUIx/G03/mpE1vzLm0KA3cHwuZXCysvxI1gXfNjV7Nu7Vjtp89kDzmg==", "integrity": "sha512-7W/L3jw7HYE+tUPbcVOGBmnSrlUmyZ/Uyg24QS7Vx0a9KodtNrN0r0Q/LyGHrcYMtw2rv7E49F/vTXwlV/fuaA==",
"dev": true "dev": true
}, },
"elliptic": { "elliptic": {
...@@ -3274,9 +3290,9 @@ ...@@ -3274,9 +3290,9 @@
} }
}, },
"error-stack-parser": { "error-stack-parser": {
"version": "2.0.2", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.2.tgz", "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.3.tgz",
"integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==", "integrity": "sha512-vRC4rKv87twMZy92X4+TmUdv3iYMsmePbpG/YguHsfzmZ8bYJZYYep7yrXH09yFUaCEPKgNK5X79+Yq7hwLVOA==",
"dev": true, "dev": true,
"requires": { "requires": {
"stackframe": "^1.0.4" "stackframe": "^1.0.4"
...@@ -3419,9 +3435,9 @@ ...@@ -3419,9 +3435,9 @@
} }
}, },
"eslint-visitor-keys": { "eslint-visitor-keys": {
"version": "1.0.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
"integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
"dev": true "dev": true
}, },
"espree": { "espree": {
...@@ -5249,23 +5265,6 @@ ...@@ -5249,23 +5265,6 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true "dev": true
}, },
"inertia": {
"version": "github:inertiajs/inertia#807157ed86815e7d468f11a49f2f796a364292fe",
"from": "github:inertiajs/inertia",
"dev": true,
"requires": {
"axios": "^0.18.0",
"nprogress": "^0.2.0"
}
},
"inertia-vue": {
"version": "github:inertiajs/inertia-vue#e644cfa77064aab3a2ba4b2dcf893566095bf405",
"from": "github:inertiajs/inertia-vue",
"dev": true,
"requires": {
"inertia": "github:inertiajs/inertia#807157ed86815e7d468f11a49f2f796a364292fe"
}
},
"infer-owner": { "infer-owner": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
......
package.json
...@@ -11,13 +11,14 @@ ...@@ -11,13 +11,14 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@inertiajs/inertia": "^0.1.0",
"@inertiajs/inertia-vue": "^0.1.0",
"autosize": "^4.0.2", "autosize": "^4.0.2",
"axios": "^0.18", "axios": "^0.18",
"cross-env": "^5.1", "cross-env": "^5.1",
"eslint": "^5.14.1", "eslint": "^5.14.1",
"eslint-plugin-vue": "^5.2.2", "eslint-plugin-vue": "^5.2.2",
"fuse.js": "^3.4.2", "fuse.js": "^3.4.2",
"inertia-vue": "inertiajs/inertia-vue",
"laravel-mix": "^4.0.7", "laravel-mix": "^4.0.7",
"lodash": "^4.17.5", "lodash": "^4.17.5",
"popper.js": "^1.12", "popper.js": "^1.12",
......
resources/js/app.js
import Inertia from 'inertia-vue' import { InertiaApp } from '@inertiajs/inertia-vue'
import PortalVue from 'portal-vue' import PortalVue from 'portal-vue'
import Vue from 'vue' import Vue from 'vue'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.mixin({ methods: { route: window.route } }) Vue.mixin({ methods: { route: window.route } })
Vue.use(Inertia) Vue.use(InertiaApp)
Vue.use(PortalVue) Vue.use(PortalVue)
let app = document.getElementById('app') let app = document.getElementById('app')
new Vue({ new Vue({
render: h => h(Inertia, { render: h => h(InertiaApp, {
props: { props: {
initialPage: JSON.parse(app.dataset.page), initialPage: JSON.parse(app.dataset.page),
resolveComponent: name => import(`@/Pages/${name}`).then(module => module.default), resolveComponent: name => import(`@/Pages/${name}`).then(module => module.default),
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!