clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-02-01 22:47:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin2/master' into fix/priority-style-issues

Browse Source 
# Conflicts:
#	package.json
#	resources/css/common.css
#	src/main/frontend/components/block.cljs
#	src/main/frontend/components/page.cljs
#	src/main/frontend/components/sidebar.css
#	yarn.lock
This commit is contained in:
charlie
2020-12-07 10:14:16 +08:00
parent 0a979b7b2c 959aabecd2
commit e2949a5a2b
48 changed files with 1983 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@@ -19,7 +19,7 @@
"tailwindcss": "2.0.1"
},
"scripts": {
"watch": "run-p cljs:watch gulp:watch",
"watch": "run-p cljs:watch gulp:build gulp:watch",
"release": "run-s cljs:release gulp:build",
"watch-app": "run-p cljs:watch-app gulp:watch",
"release-app": "run-s cljs:release-app gulp:build",
@@ -27,8 +27,9 @@
"dev-release-app": "run-s cljs:dev-release-app gulp:build",
"clean": "gulp clean",
"test": "run-s cljs:test cljs:run-test",
"report": "run-s cljs:report",
"gulp:watch": "gulp watch",
"gulp:build": "NODE_ENV=production gulp build",
"gulp:build": "cross-env NODE_ENV=production gulp build",
"cljs:watch": "clojure -M:cljs watch app publishing",
"cljs:release": "clojure -M:cljs release app publishing",
"cljs:test": "clojure -A:test compile test",
@@ -44,6 +45,7 @@
"codemirror": "^5.58.1",
"diff": "^4.0.2",
"dropbox": "^5.2.0",
"ignore": "^5.1.8",
"jszip": "^3.5.0",
"localforage": "^1.7.3",
"mousetrap": "^1.6.5",