inhji/chiya
inhji/chiya
1
1
Fork 0
Code Issues 8 Pull requests 9 Activity

Merge pull request 'devel' (#296) from devel into main

Browse source 
Reviewed-on: #296
This commit is contained in:
inhji 2023-09-09 13:15:01 +02:00
commit 01846f6b8f
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/js/app.js
View file

@ -22,7 +22,7 @@ import { Socket } from "phoenix"
import { LiveSocket } from "phoenix_live_view"
import topbar from "../vendor/topbar"
import React from "react"
import { createRoot } from 'react-dom/client'
import { createRoot } from 'react-dom'
import KBar from "./kbar"
let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content")

13
assets/package-lock.json generated
View file

@ -18,11 +18,9 @@
"autoprefixer": "^10.4.15",
"esbuild": "^0.18.0",
"esbuild-style-plugin": "^1.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"tailwindcss": "^3.3.3"
},
"peerDependencies": {
"react": "^17.0",
"react-dom": "^17.0"
}
},
"../deps/phoenix": {
@ -1308,8 +1306,7 @@
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
"peer": true
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
},
"node_modules/kbar": {
"version": "0.1.0-beta.43",
@ -1375,7 +1372,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"peer": true,
"dependencies": {
"js-tokens": "^3.0.0 || ^4.0.0"
},
@ -1838,7 +1834,6 @@
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
"peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
@ -1851,7 +1846,6 @@
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
"integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
"peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
@ -1958,7 +1952,6 @@
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
"peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"

6
assets/package.json
View file

@ -3,6 +3,8 @@
"autoprefixer": "^10.4.15",
"esbuild": "^0.18.0",
"esbuild-style-plugin": "^1.6.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"tailwindcss": "^3.3.3"
},
"dependencies": {
@ -14,9 +16,5 @@
"phoenix_html": "file:../deps/phoenix_html",
"phoenix_live_view": "file:../deps/phoenix_live_view",
"tablesort": "^5.3.0"
},
"peerDependencies": {
"react": "^17.0",
"react-dom": "^17.0"
}
}