Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/db
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bad3r
Bad3r committed Jul 17, 2023
2 parents 1ad21ea + 343c297 commit ad9e3e5
Show file tree
Hide file tree
Showing 12 changed files with 1,817 additions and 1,568 deletions.
328 changes: 164 additions & 164 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,166 +1,166 @@
{
"name": "logseq",
"version": "0.0.1",
"private": true,
"main": "static/electron.js",
"devDependencies": {
"@axe-core/playwright": "=4.4.4",
"@capacitor/cli": "^4.0.0",
"@playwright/test": "=1.31.0",
"@tailwindcss/aspect-ratio": "0.4.2",
"@tailwindcss/forms": "0.5.3",
"@tailwindcss/line-clamp": "0.4.2",
"@tailwindcss/typography": "0.5.7",
"@types/gulp": "^4.0.7",
"autoprefixer": "^10.4.13",
"cross-env": "^7.0.3",
"cssnano": "^5.1.13",
"del": "^6.0.0",
"gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0",
"ip": "1.1.8",
"npm-run-all": "^4.1.5",
"playwright": "=1.31.0",
"postcss": "8.4.17",
"postcss-cli": "10.0.0",
"postcss-import": "15.0.0",
"postcss-import-ext-glob": "2.0.1",
"postcss-nested": "6.0.0",
"purgecss": "4.0.2",
"shadow-cljs": "2.17.5",
"stylelint": "^13.8.0",
"stylelint-config-standard": "^20.0.0",
"tailwindcss": "3.1.8",
"typescript": "^4.4.3"
},
"scripts": {
"watch": "run-p gulp:watch cljs:watch",
"electron-watch": "run-p gulp:watch cljs:electron-watch",
"app-watch": "run-p gulp:watch cljs:app-watch",
"release": "run-s gulp:build cljs:release",
"release-app": "run-s gulp:build cljs:release-app",
"dev-release-app": "run-s gulp:build cljs:dev-release-app",
"dev-electron-app": "gulp electron",
"release-electron": "run-s gulp:build && gulp electronMaker",
"debug-electron": "cd static/ && yarn electron:debug",
"e2e-test": "cross-env CI=true npx playwright test --reporter github",
"run-android-release": "yarn clean && yarn release-app && rm -rf ./public/static && rm -rf ./static/js/*.map && mv static ./public && npx cap sync android && npx cap run android",
"run-ios-release": "yarn clean && yarn release-app && rm -rf ./public/static && rm -rf ./static/js/*.map && mv static ./public && npx cap sync ios && npx cap run ios",
"clean": "gulp clean",
"test": "run-s cljs:test cljs:run-test",
"report": "run-s cljs:report",
"style:lint": "stylelint \"src/**/*.css\"",
"gulp:watch": "gulp watch",
"gulp:build": "cross-env NODE_ENV=production gulp build",
"css:build": "postcss tailwind.all.css -o static/css/style.css --verbose --env production",
"css:watch": "cross-env TAILWIND_MODE=watch postcss tailwind.all.css -o static/css/style.css --verbose --watch",
"cljs:watch": "clojure -M:cljs watch app electron",
"cljs:app-watch": "clojure -M:cljs watch app",
"cljs:electron-watch": "clojure -M:cljs watch app electron --config-merge \"{:asset-path \\\"./js\\\"}\"",
"cljs:release": "clojure -M:cljs release app publishing electron",
"cljs:release-electron": "clojure -M:cljs release app electron --debug && clojure -M:cljs release publishing",
"cljs:release-app": "clojure -M:cljs release app --config-merge \"{:compiler-options {:output-feature-set :es6}}\"",
"cljs:release-publishing": "clojure -M:cljs release publishing",
"cljs:test": "clojure -M:test compile test",
"cljs:run-test": "node static/tests.js",
"cljs:dev-release-app": "clojure -M:cljs release app --config-merge \"{:closure-defines {frontend.config/DEV-RELEASE true}}\"",
"cljs:dev-release-electron": "clojure -M:cljs release app electron --debug --config-merge \"{:closure-defines {frontend.config/DEV-RELEASE true}}\" && clojure -M:cljs release publishing",
"cljs:debug": "clojure -M:cljs release app --debug",
"cljs:report": "clojure -M:cljs run shadow.cljs.build-report app report.html",
"cljs:build-electron": "clojure -A:cljs compile app electron",
"cljs:lint": "clojure -M:clj-kondo --parallel --lint src --cache false",
"ios:dev": "cross-env PLATFORM=ios gulp cap",
"android:dev": "cross-env PLATFORM=android gulp cap",
"tldraw:build": "yarn --cwd tldraw install",
"postinstall": "yarn tldraw:build"
},
"dependencies": {
"@capacitor/android": "^4.0.0",
"@capacitor/app": "^4.0.0",
"@capacitor/camera": "^4.0.0",
"@capacitor/clipboard": "^4.0.0",
"@capacitor/core": "^4.0.0",
"@capacitor/filesystem": "^4.0.0",
"@capacitor/haptics": "^4.0.0",
"@capacitor/ios": "^4.0.0",
"@capacitor/keyboard": "^4.0.0",
"@capacitor/share": "^4.0.0",
"@capacitor/splash-screen": "^4.0.0",
"@capacitor/status-bar": "^4.0.0",
"@capawesome/capacitor-background-task": "^2.0.0",
"@excalidraw/excalidraw": "0.12.0",
"@hugotomazi/capacitor-navigation-bar": "^2.0.0",
"@logseq/capacitor-file-sync": "0.0.32",
"@logseq/diff-merge": "0.1.0",
"@logseq/react-tweet-embed": "1.3.1-1",
"@radix-ui/colors": "^0.1.8",
"@sentry/react": "^6.18.2",
"@sentry/tracing": "^6.18.2",
"@tabler/icons": "^1.96.0",
"@tippyjs/react": "4.2.5",
"bignumber.js": "^9.0.2",
"capacitor-voice-recorder": "4.0.0",
"check-password-strength": "2.0.7",
"chokidar": "3.5.1",
"chrono-node": "2.2.4",
"codemirror": "5.58.1",
"d3-force": "3.0.0",
"diff": "5.0.0",
"dompurify": "2.4.0",
"electron": "24.3.1",
"electron-dl": "3.3.0",
"fs": "0.0.1-security",
"fs-extra": "9.1.0",
"fuse.js": "6.4.6",
"grapheme-splitter": "1.0.4",
"graphology": "0.20.0",
"highlight.js": "10.4.1",
"html2canvas": "^1.4.1",
"ignore": "5.1.8",
"inter-ui": "^3.19.3",
"interactjs": "^1.10.17",
"jszip": "3.8.0",
"katex": "^0.16.7",
"mldoc": "1.5.7",
"path": "0.12.7",
"path-complete-extname": "1.0.0",
"photoswipe": "^5.3.7",
"pixi-graph-fork": "0.2.0",
"pixi.js": "6.2.0",
"posthog-js": "1.10.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-grid-layout": "0.16.6",
"react-intersection-observer": "^9.3.5",
"react-resize-context": "3.0.0",
"react-textarea-autosize": "8.3.3",
"react-tippy": "1.4.0",
"react-transition-group": "4.3.0",
"remove-accents": "0.4.2",
"sanitize-filename": "1.6.3",
"send-intent": "3.0.11",
"tailwind-capitalize-first-letter": "^1.0.4",
"threads": "1.6.5",
"url": "^0.11.0",
"yargs-parser": "20.2.4"
},
"resolutions": {
"pixi-graph-fork/@pixi/app": "6.2.0",
"pixi-graph-fork/@pixi/constants": "6.2.0",
"pixi-graph-fork/@pixi/core": "6.2.0",
"pixi-graph-fork/@pixi/display": "6.2.0",
"pixi-graph-fork/@pixi/graphics": "6.2.0",
"pixi-graph-fork/@pixi/interaction": "6.2.0",
"pixi-graph-fork/@pixi/loaders": "6.2.0",
"pixi-graph-fork/@pixi/ticker": "6.2.0",
"pixi-graph-fork/@pixi/sprite": "6.2.0",
"pixi-graph-fork/@pixi/text": "6.2.0",
"pixi-graph-fork/@pixi/text-bitmap": "6.2.0",
"pixi-graph-fork/@pixi/utils": "6.2.0",
"pixi-graph-fork/@pixi/runner": "6.2.0",
"pixi-graph-fork/@pixi/mesh": "6.2.0",
"pixi-graph-fork/@pixi/settings": "6.2.0",
"pixi-graph-fork/@pixi/mixin-get-child-by-name": "6.2.0",
"pixi-graph-fork/@pixi/math": "6.2.0"
}
"name": "logseq",
"version": "0.0.1",
"private": true,
"main": "static/electron.js",
"devDependencies": {
"@axe-core/playwright": "=4.4.4",
"@capacitor/cli": "^4.0.0",
"@playwright/test": "=1.31.0",
"@tailwindcss/aspect-ratio": "0.4.2",
"@tailwindcss/forms": "0.5.3",
"@tailwindcss/line-clamp": "0.4.2",
"@tailwindcss/typography": "0.5.7",
"@types/gulp": "^4.0.7",
"autoprefixer": "^10.4.13",
"cross-env": "^7.0.3",
"cssnano": "^5.1.13",
"del": "^6.0.0",
"gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0",
"ip": "1.1.8",
"npm-run-all": "^4.1.5",
"playwright": "=1.31.0",
"postcss": "8.4.17",
"postcss-cli": "10.0.0",
"postcss-import": "15.0.0",
"postcss-import-ext-glob": "2.0.1",
"postcss-nested": "6.0.0",
"purgecss": "4.0.2",
"shadow-cljs": "2.17.5",
"stylelint": "^13.8.0",
"stylelint-config-standard": "^20.0.0",
"tailwindcss": "3.1.8",
"typescript": "^4.4.3"
},
"scripts": {
"watch": "run-p gulp:watch cljs:watch",
"electron-watch": "run-p gulp:watch cljs:electron-watch",
"app-watch": "run-p gulp:watch cljs:app-watch",
"release": "run-s gulp:build cljs:release",
"release-app": "run-s gulp:build cljs:release-app",
"dev-release-app": "run-s gulp:build cljs:dev-release-app",
"dev-electron-app": "gulp electron",
"release-electron": "run-s gulp:build && gulp electronMaker",
"debug-electron": "cd static/ && yarn electron:debug",
"e2e-test": "cross-env CI=true npx playwright test --reporter github",
"run-android-release": "yarn clean && yarn release-app && rm -rf ./public/static && rm -rf ./static/js/*.map && mv static ./public && npx cap sync android && npx cap run android",
"run-ios-release": "yarn clean && yarn release-app && rm -rf ./public/static && rm -rf ./static/js/*.map && mv static ./public && npx cap sync ios && npx cap run ios",
"clean": "gulp clean",
"test": "run-s cljs:test cljs:run-test",
"report": "run-s cljs:report",
"style:lint": "stylelint \"src/**/*.css\"",
"gulp:watch": "gulp watch",
"gulp:build": "cross-env NODE_ENV=production gulp build",
"css:build": "postcss tailwind.all.css -o static/css/style.css --verbose --env production",
"css:watch": "cross-env TAILWIND_MODE=watch postcss tailwind.all.css -o static/css/style.css --verbose --watch",
"cljs:watch": "clojure -M:cljs watch app electron",
"cljs:app-watch": "clojure -M:cljs watch app",
"cljs:electron-watch": "clojure -M:cljs watch app electron --config-merge \"{:asset-path \\\"./js\\\"}\"",
"cljs:release": "clojure -M:cljs release app publishing electron",
"cljs:release-electron": "clojure -M:cljs release app electron --debug && clojure -M:cljs release publishing",
"cljs:release-app": "clojure -M:cljs release app --config-merge \"{:compiler-options {:output-feature-set :es6}}\"",
"cljs:release-publishing": "clojure -M:cljs release publishing",
"cljs:test": "clojure -M:test compile test",
"cljs:run-test": "node static/tests.js",
"cljs:dev-release-app": "clojure -M:cljs release app --config-merge \"{:closure-defines {frontend.config/DEV-RELEASE true}}\"",
"cljs:dev-release-electron": "clojure -M:cljs release app electron --debug --config-merge \"{:closure-defines {frontend.config/DEV-RELEASE true}}\" && clojure -M:cljs release publishing",
"cljs:debug": "clojure -M:cljs release app --debug",
"cljs:report": "clojure -M:cljs run shadow.cljs.build-report app report.html",
"cljs:build-electron": "clojure -A:cljs compile app electron",
"cljs:lint": "clojure -M:clj-kondo --parallel --lint src --cache false",
"ios:dev": "cross-env PLATFORM=ios gulp cap",
"android:dev": "cross-env PLATFORM=android gulp cap",
"tldraw:build": "yarn --cwd tldraw install",
"postinstall": "yarn tldraw:build"
},
"dependencies": {
"@capacitor/android": "^4.0.0",
"@capacitor/app": "^4.0.0",
"@capacitor/camera": "^4.0.0",
"@capacitor/clipboard": "^4.0.0",
"@capacitor/core": "^4.0.0",
"@capacitor/filesystem": "^4.0.0",
"@capacitor/haptics": "^4.0.0",
"@capacitor/ios": "^4.0.0",
"@capacitor/keyboard": "^4.0.0",
"@capacitor/share": "^4.0.0",
"@capacitor/splash-screen": "^4.0.0",
"@capacitor/status-bar": "^4.0.0",
"@capawesome/capacitor-background-task": "^2.0.0",
"@excalidraw/excalidraw": "0.12.0",
"@hugotomazi/capacitor-navigation-bar": "^2.0.0",
"@logseq/capacitor-file-sync": "0.0.32",
"@logseq/diff-merge": "0.1.0",
"@logseq/react-tweet-embed": "1.3.1-1",
"@radix-ui/colors": "^0.1.8",
"@sentry/react": "^6.18.2",
"@sentry/tracing": "^6.18.2",
"@tabler/icons": "^1.96.0",
"@tippyjs/react": "4.2.5",
"bignumber.js": "^9.0.2",
"capacitor-voice-recorder": "4.0.0",
"check-password-strength": "2.0.7",
"chokidar": "3.5.1",
"chrono-node": "2.2.4",
"codemirror": "5.65.13",
"d3-force": "3.0.0",
"diff": "5.0.0",
"dompurify": "2.4.0",
"electron": "25.3.0",
"electron-dl": "3.3.0",
"fs": "0.0.1-security",
"fs-extra": "9.1.0",
"fuse.js": "6.4.6",
"grapheme-splitter": "1.0.4",
"graphology": "0.20.0",
"highlight.js": "10.4.1",
"html2canvas": "^1.4.1",
"ignore": "5.1.8",
"inter-ui": "^3.19.3",
"interactjs": "^1.10.17",
"jszip": "3.8.0",
"katex": "^0.16.7",
"mldoc": "1.5.7",
"path": "0.12.7",
"path-complete-extname": "1.0.0",
"photoswipe": "^5.3.7",
"pixi-graph-fork": "0.2.0",
"pixi.js": "6.2.0",
"posthog-js": "1.10.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-grid-layout": "0.16.6",
"react-intersection-observer": "^9.3.5",
"react-resize-context": "3.0.0",
"react-textarea-autosize": "8.3.3",
"react-tippy": "1.4.0",
"react-transition-group": "4.3.0",
"remove-accents": "0.4.2",
"sanitize-filename": "1.6.3",
"send-intent": "3.0.11",
"tailwind-capitalize-first-letter": "^1.0.4",
"threads": "1.6.5",
"url": "^0.11.0",
"yargs-parser": "20.2.4"
},
"resolutions": {
"pixi-graph-fork/@pixi/app": "6.2.0",
"pixi-graph-fork/@pixi/constants": "6.2.0",
"pixi-graph-fork/@pixi/core": "6.2.0",
"pixi-graph-fork/@pixi/display": "6.2.0",
"pixi-graph-fork/@pixi/graphics": "6.2.0",
"pixi-graph-fork/@pixi/interaction": "6.2.0",
"pixi-graph-fork/@pixi/loaders": "6.2.0",
"pixi-graph-fork/@pixi/ticker": "6.2.0",
"pixi-graph-fork/@pixi/sprite": "6.2.0",
"pixi-graph-fork/@pixi/text": "6.2.0",
"pixi-graph-fork/@pixi/text-bitmap": "6.2.0",
"pixi-graph-fork/@pixi/utils": "6.2.0",
"pixi-graph-fork/@pixi/runner": "6.2.0",
"pixi-graph-fork/@pixi/mesh": "6.2.0",
"pixi-graph-fork/@pixi/settings": "6.2.0",
"pixi-graph-fork/@pixi/mixin-get-child-by-name": "6.2.0",
"pixi-graph-fork/@pixi/math": "6.2.0"
}
}
14 changes: 0 additions & 14 deletions resources/css/common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,20 +694,6 @@ svg.tip {
color: var(--ls-active-primary-color);
}

/* endregion */

/* region FIXME: CodeMirror override (?) */
.CodeMirror pre.CodeMirror-line,
.CodeMirror-scroll,
.CodeMirror-sizer,
.CodeMirror-gutter,
.CodeMirror-gutters,
.CodeMirror-linenumber {
font-size: 14px;
}

/* endregion */

hr {
margin: 2rem 0;
border-color: var(--ls-border-color, #ccc);
Expand Down
6 changes: 3 additions & 3 deletions resources/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"electron:make": "electron-forge make",
"electron:make-macos-arm64": "electron-forge make --platform=darwin --arch=arm64",
"electron:publish:github": "electron-forge publish",
"rebuild:all": "electron-rebuild -v 24.3.1 -f",
"rebuild:all": "electron-rebuild -v 25.3.0 -f",
"postinstall": "install-app-deps"
},
"config": {
Expand Down Expand Up @@ -52,12 +52,12 @@
"@electron-forge/maker-squirrel": "^6.0.4",
"@electron-forge/maker-zip": "^6.0.4",
"@electron/rebuild": "3.2.10",
"electron": "24.3.1",
"electron": "25.3.0",
"electron-builder": "^22.11.7",
"electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git"
},
"resolutions": {
"**/electron": "24.3.1",
"**/electron": "25.3.0",
"**/node-gyp": "9.0.0"
}
}
Loading

0 comments on commit ad9e3e5

Please sign in to comment.