Xepo · Xepo · Dec 22, 2020 · Dec 1, 2020 · Dec 2, 2020 · Dec 2, 2020
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+open_collective: logseq
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,4 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+Please go to [Logseq forum](https://discuss.logseq.com/c/feature-requests/7) to create a feature request so that people can vote there.
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -0,0 +1,23 @@
+{
+  "extends": [
+    "stylelint-config-standard"
+  ],
+  "rules": {
+    "at-rule-no-unknown": [
+      true,
+      {
+        "ignoreAtRules": [
+          "tailwind",
+          "apply",
+          "variants",
+          "responsive",
+          "screen"
+        ]
+      }
+    ],
+    "declaration-block-trailing-semicolon": null,
+    "no-descending-specificity": null,
+    "declaration-empty-line-before": null,
+    "block-no-empty": null
+  }
+}
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,18 @@
+FROM clojure:openjdk-11-tools-deps
+
+RUN curl -sL https://deb.nodesource.com/setup_15.x | bash - && \
+    apt-get install -y nodejs
+
+RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y yarn
+
+RUN useradd -ms /bin/bash logseq
+
+USER logseq
+WORKDIR /home/logseq
+
+EXPOSE 3001
+EXPOSE 9630
+EXPOSE 8701
diff --git a/README.md b/README.md
@@ -23,6 +23,9 @@ In the unlikely event that the website is down or cannot be maintained, your dat
 
 ![Image of logseq](https://cdn.logseq.com/%2F8b9a461d-437e-4ca5-a2da-18b51077b5142020_07_25_Screenshot%202020-07-25%2013-29-49%20%2B0800.png?Expires=4749255017&Signature=Qbx6jkgAytqm6nLxVXQQW1igfcf~umV1OcG6jXUt09TOVhgXyA2Z5jHJ3AGJASNcphs31pZf4CjFQ5mRCyVKw6N8wb8Nn-MxuTJl0iI8o-jLIAIs9q1v-2cusCvuFfXH7bq6ir8Lpf0KYAprzuZ00FENin3dn6RBW35ENQwUioEr5Ghl7YOCr8bKew3jPV~OyL67MttT3wJig1j3IC8lxDDT8Ov5IMG2GWcHERSy00F3mp3tJtzGE17-OUILdeuTFz6d-NDFAmzB8BebiurYz0Bxa4tkcdLUpD5ToFHU08jKzZExoEUY8tvaZ1-t7djmo3d~BAXDtlEhC2L1YC2aVQ__&Key-Pair-Id=APKAJE5CCD6X7MP6PTEA)
 
+## Feature requests
+Please go to https://discuss.logseq.com/c/feature-requests/7.
+
 ## How can I use it?
 
 1. Make sure you have registered a [GitHub account](https://github.com/join) and already created a repository (could be an old one). _Currently we only support GitHub, but more sync  options (e.g. Gitlab, Dropbox, Google Drive, WebDAV, etc.) will be added soon._
@@ -84,3 +87,32 @@ Open <http://localhost:3001>.
 ``` bash
 yarn release
 ```
+
+## Alternative: Docker based development environment
+
+### 1. Fetch sources
+
+``` bash
+git clone https://github.com/logseq/logseq
+```
+
+### 2. Build Docker image
+
+``` bash
+cd logseq
+docker build -t logseq-docker .
+```
+
+### 3. Run Docker container
+
+``` bash
+docker run -v $(pwd):/home/logseq/logseq -p 3001:3001 -p 9630:9630 -p 8701:8701 --rm -it logseq-docker /bin/bash
+```
+
+### 4. Inside the container compile as described above
+
+``` bash
+cd logseq
+yarn
+yarn watch
+```
diff --git a/deps.edn b/deps.edn
@@ -10,8 +10,8 @@
                                :sha "7c2822565d9a114c7d8604c335af89de4640e2e5"}
   ;; datascript                  {:mvn/version "1.0.1"}
   datascript-transit/datascript-transit
-                              {:mvn/version "0.3.0"
-                               :exclusions [datascript]}
+  {:mvn/version "0.3.0"
+   :exclusions [datascript]}
   funcool/promesa             {:mvn/version "4.0.2"}
   medley/medley               {:mvn/version "1.2.0"}
   metosin/reitit-frontend     {:mvn/version "0.3.10"}
@@ -20,7 +20,7 @@
   org.clojure/core.match      {:mvn/version "1.0.0"}
   com.andrewmcveigh/cljs-time {:mvn/version "0.5.2"}
   cljs-drag-n-drop/cljs-drag-n-drop
-                              {:mvn/version "0.1.0"}
+  {:mvn/version "0.1.0"}
   borkdude/sci                {:mvn/version "0.1.1-alpha.6"}
   hickory/hickory             {:mvn/version "0.7.1"}
   hiccups/hiccups             {:mvn/version "0.3.0"}
@@ -30,7 +30,7 @@
   expound/expound             {:mvn/version "0.8.6"}
   lambdaisland/glogi          {:mvn/version "1.0.74"}}
 
- :aliases {:cljs {:extra-paths ["src/dev-cljs/"]
+ :aliases {:cljs {:extra-paths ["src/dev-cljs/" "src/test/"]
                   :extra-deps  {org.clojure/clojurescript   {:mvn/version "1.10.520"}
                                 thheller/shadow-cljs        {:mvn/version "2.8.81"}
                                 binaryage/devtools          {:mvn/version "0.9.10"}

diff --git a/externs.js b/externs.js
@@ -47,3 +47,6 @@ dummy.createWritable = function() {};
 dummy.write = function() {};
 dummy.close = function() {};
 dummy.values = function() {};
+// Do we really need those?
+dummy.filter = function() {};
+dummy.concat = function() {};
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,58 +1,79 @@
+const fs = require('fs')
 const path = require('path')
 const gulp = require('gulp')
 const postcss = require('gulp-postcss')
 const concat = require('gulp-concat')
+const cached = require('gulp-cached')
+const remember = require('gulp-remember')
 const cleanCSS = require('gulp-clean-css')
 const del = require('del')
 
 const outputPath = path.join(__dirname, 'static')
 const resourcesPath = path.join(__dirname, 'resources')
-const sourcePath = path.join(__dirname, 'src')
+const sourcePath = path.join(__dirname, 'src/main/frontend')
 const resourceFilePath = path.join(resourcesPath, '**')
 
+const tailwindCoreEntry = path.join(__dirname, 'tailwind.css')
+const tailwindBuildEntry = path.join(sourcePath, '**/*.css')
 const tailwind = {
-  paths: [path.join(__dirname, 'tailwind.css'), path.join(sourcePath, '**/*.css')],
+  paths: [tailwindCoreEntry, tailwindBuildEntry],
   outputDir: path.join(outputPath, 'css'),
   outputName: 'tailwind.build.css',
 }
 
 const css = {
-  watchCSS() {
-    return gulp.watch(tailwind.paths, { ignoreInitial: false }, css._buildTailwind)
+  async watchCSS () {
+    // remove tailwind core css
+    await new Promise((resolve) => {
+      css._buildTailwind(
+        tailwind.paths.shift(),
+        'tailwind.core.css'
+      )
+        .on('end', resolve)
+    })
+
+    return gulp.watch(
+      tailwind.paths, { ignoreInitial: false },
+      css._buildTailwind.bind(null, void 0, void 0))
   },
 
-  buildCSS(...params) {
-    return gulp.series(css._buildTailwind, css._optimizeCSSForRelease)(...params)
+  buildCSS (...params) {
+    return gulp.series(
+      css._buildTailwind.bind(null, tailwindCoreEntry, 'tailwind.core.css'),
+      css._buildTailwind.bind(null, tailwindBuildEntry, 'tailwind.build.css'),
+      css._optimizeCSSForRelease)(...params)
   },
 
-  _buildTailwind() {
-    return gulp.src(tailwind.paths)
+  _buildTailwind (entry, output) {
+    return gulp.src(entry || tailwind.paths)
+      .pipe(cached('postcss-' + entry))
       .pipe(postcss())
-      .pipe(concat(tailwind.outputName))
+      .pipe(remember('postcss-' + entry))
+      .pipe(concat(output || tailwind.outputName))
       .pipe(gulp.dest(tailwind.outputDir))
   },
 
-  _optimizeCSSForRelease() {
+  _optimizeCSSForRelease () {
     return gulp.src(path.join(outputPath, 'css', 'style.css'))
       .pipe(cleanCSS())
       .pipe(gulp.dest(path.join(outputPath, 'css')))
   },
 }
 
 const common = {
-  clean() {
+  clean () {
     return del(outputPath)
   },
 
-  syncResourceFile() {
+  syncResourceFile () {
     return gulp.src(resourceFilePath).pipe(gulp.dest(outputPath))
   },
 
-  keepSyncResourceFile() {
+  keepSyncResourceFile () {
     return gulp.watch(resourceFilePath, { ignoreInitial: false }, common.syncResourceFile)
   }
 }
 
 exports.clean = common.clean
 exports.watch = gulp.parallel(common.keepSyncResourceFile, css.watchCSS)
-exports.build = gulp.series(common.syncResourceFile, css.buildCSS)
+exports.build = gulp.series(common.clean, common.syncResourceFile, css.buildCSS)
diff --git a/package.json b/package.json
@@ -3,31 +3,37 @@
     "version": "0.0.1",
     "private": true,
     "devDependencies": {
-        "@tailwindcss/ui": "^0.1.3",
+        "@tailwindcss/ui": "0.7.2",
+        "@types/gulp": "^4.0.7",
         "cross-env": "^7.0.3",
         "cssnano": "^4.1.10",
         "del": "^6.0.0",
         "gulp": "^4.0.2",
         "gulp-clean-css": "^4.3.0",
         "gulp-concat": "^2.6.1",
         "gulp-postcss": "^9.0.0",
+        "gulp-remember": "^1.0.1",
         "npm-run-all": "^4.1.5",
-        "postcss": "^7.0.21",
-        "postcss-cli": "^6.1.3",
-        "purgecss": "^2.1.0",
+        "postcss": "8.2.1",
+        "postcss-cli": "8.3.0",
+        "postcss-nested": "^5.0.1",
+        "purgecss": "3.0.0",
         "shadow-cljs": "2.8.81",
-        "tailwindcss": "^1.3.4"
+        "stylelint": "^13.8.0",
+        "stylelint-config-standard": "^20.0.0",
+        "tailwindcss": "2.0.1"
     },
     "scripts": {
-        "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",
-        "release-publishing": "run-s cljs:release-publishing gulp:build",
-        "dev-release-app": "run-s cljs:dev-release-app gulp:build",
+        "watch": "run-p gulp:build gulp:watch cljs:watch",
+        "release": "run-s gulp:build cljs:release",
+        "watch-app": "run-p gulp:watch cljs:watch-app",
+        "release-app": "run-s gulp:build cljs:release-app",
+        "release-publishing": "run-s gulp:build cljs:release-publishing",
+        "dev-release-app": "run-s gulp:build cljs:dev-release-app",
         "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",
         "cljs:watch": "clojure -M:cljs watch app publishing",
@@ -44,17 +50,16 @@
     "dependencies": {
         "codemirror": "^5.58.1",
         "diff": "^4.0.2",
-        "dropbox": "^5.2.0",
+        "fuzzysort": "^1.1.4",
+        "gulp-cached": "^1.1.1",
         "ignore": "^5.1.8",
         "jszip": "^3.5.0",
-        "localforage": "^1.7.3",
+        "mldoc": "^0.3.0",
         "mousetrap": "^1.6.5",
-        "parinfer-codemirror": "^1.4.2",
-        "react": "^16.12.0",
-        "react-dom": "^16.12.0",
+        "react": "^17.0.1",
+        "react-dom": "^17.0.1",
         "react-textarea-autosize": "^8.0.1",
         "react-transition-group": "^4.3.0",
-        "webdav": "^3.3.0",
         "yargs-parser": "^20.2.4"
     }
 }
diff --git a/postcss.config.js b/postcss.config.js
@@ -1,7 +1,6 @@
 module.exports = (ctx) => ({
   plugins: [
-    require("autoprefixer"),
-    require("tailwindcss")("tailwind.config.js"),
-    ctx.env === "production" ? require("cssnano")({ preset: "default" }) : null,
+    require('postcss-nested'),
+    require('tailwindcss')('tailwind.config.js'),
   ],
-});
+})