Delete lerna.json

Auto-updated using release-website.sh

.eslintignore

@@ -5,6 +5,7 @@ _releases/
 *.min.js
 **/commands/index.ts
 **/node_modules/
+.yarn/
 Assets/
 docs/
 highlight.pack.js
@@ -12,6 +13,8 @@ Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/JoplinLists/
 Modules/TinyMCE/langs/
 node_modules/
+packages/app-desktop/build/
+packages/app-cli/tests/test data/
 packages/app-cli/build
 packages/app-cli/build/
 packages/app-cli/locales
@@ -705,9 +708,6 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
-packages/app-desktop/gui/utils/SyncScrollMap.d.ts
-packages/app-desktop/gui/utils/SyncScrollMap.js
-packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
@@ -1512,9 +1512,6 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
-packages/lib/services/plugins/sandboxProxy.d.ts
-packages/lib/services/plugins/sandboxProxy.js
-packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1944,9 +1941,6 @@ packages/tools/generate-images.js.map
 packages/tools/git-changelog.d.ts
 packages/tools/git-changelog.js
 packages/tools/git-changelog.js.map
-packages/tools/lerna-add.d.ts
-packages/tools/lerna-add.js
-packages/tools/lerna-add.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -1977,9 +1971,18 @@ packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
+packages/tools/updateMarkdownDoc.d.ts
+packages/tools/updateMarkdownDoc.js
+packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
+packages/tools/website/updateDownloadPage.d.ts
+packages/tools/website/updateDownloadPage.js
+packages/tools/website/updateDownloadPage.js.map
+packages/tools/website/utils/frontMatter.d.ts
+packages/tools/website/utils/frontMatter.js
+packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

.github/scripts/run_ci.sh

@@ -46,13 +46,14 @@ echo "IS_MACOS=$IS_MACOS"
 
 echo "Node $( node -v )"
 echo "Npm $( npm -v )"
+echo "Yarn $( yarn -v )"
 
 # =============================================================================
 # Install packages
 # =============================================================================
 
 cd "$ROOT_DIR"
-npm install
+yarn install
 
 # =============================================================================
 # Run test units. Only do it for pull requests and dev branch because we don't
@@ -78,7 +79,7 @@ if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	#
 	# https://stackoverflow.com/questions/38558989
 	export NODE_OPTIONS="--max-old-space-size=4096"
-	npm run test-ci
+	yarn run test-ci
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -93,7 +94,7 @@ fi
 if [ "$IS_PULL_REQUEST" == "1" ] || [ "$IS_DEV_BRANCH" = "1" ]; then
 	echo "Step: Running linter..."
 
-	npm run linter-ci ./
+	yarn run linter-ci ./
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -166,12 +167,12 @@ cd "$ROOT_DIR/packages/app-desktop"
 
 if [[ $GIT_TAG_NAME = v* ]]; then
 	echo "Step: Building and publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist
+	USE_HARD_LINKS=false yarn run dist
 elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
 	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	npm run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
+	yarn run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
 else
 	echo "Step: Building but *not* publishing desktop application..."
-	USE_HARD_LINKS=false npm run dist -- --publish=never
+	USE_HARD_LINKS=false yarn run dist -- --publish=never
 fi

.github/workflows/github-actions-main.yml

@@ -49,6 +49,11 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
+
+      - name: Install Yarn
+        run: |
+          # https://yarnpkg.com/getting-started/install
+          corepack enable
       
       # Login to Docker only if we're on a server release tag. If we run this on
       # a pull request it will fail because the PR doesn't have access to
@@ -80,6 +85,44 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
         run: |
-          npm install
+          yarn install
           cd packages/app-desktop
-          npm run dist
+          yarn run dist
+
+  ServerDockerImage:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    steps:
+
+      - name: Install Docker Engine
+        run: |
+          sudo apt-get install -y apt-transport-https
+          sudo apt-get install -y ca-certificates
+          sudo apt-get install -y curl
+          sudo apt-get install -y gnupg
+          sudo apt-get install -y lsb-release
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+          echo \
+              "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+              $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          sudo apt-get update || true
+          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - name: Install Yarn
+        run: |
+          # https://yarnpkg.com/getting-started/install
+          corepack enable
+
+      - name: Build Docker Image
+        run: |
+          yarn install
+          yarn run buildServerDocker --tag-name server-v0.0.0
+          

.gitignore

@@ -51,6 +51,17 @@ lerna-debug.log
 .env
 docs/**/*.mustache
 
+# Yarn stuff
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
@@ -688,9 +699,6 @@ packages/app-desktop/gui/style/StyledTextInput.js.map
 packages/app-desktop/gui/utils/NoteListUtils.d.ts
 packages/app-desktop/gui/utils/NoteListUtils.js
 packages/app-desktop/gui/utils/NoteListUtils.js.map
-packages/app-desktop/gui/utils/SyncScrollMap.d.ts
-packages/app-desktop/gui/utils/SyncScrollMap.js
-packages/app-desktop/gui/utils/SyncScrollMap.js.map
 packages/app-desktop/gui/utils/convertToScreenCoordinates.d.ts
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js
 packages/app-desktop/gui/utils/convertToScreenCoordinates.js.map
@@ -1495,9 +1503,6 @@ packages/lib/services/plugins/api/types.js.map
 packages/lib/services/plugins/reducer.d.ts
 packages/lib/services/plugins/reducer.js
 packages/lib/services/plugins/reducer.js.map
-packages/lib/services/plugins/sandboxProxy.d.ts
-packages/lib/services/plugins/sandboxProxy.js
-packages/lib/services/plugins/sandboxProxy.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
@@ -1927,9 +1932,6 @@ packages/tools/generate-images.js.map
 packages/tools/git-changelog.d.ts
 packages/tools/git-changelog.js
 packages/tools/git-changelog.js.map
-packages/tools/lerna-add.d.ts
-packages/tools/lerna-add.js
-packages/tools/lerna-add.js.map
 packages/tools/release-android.d.ts
 packages/tools/release-android.js
 packages/tools/release-android.js.map
@@ -1960,9 +1962,18 @@ packages/tools/update-readme-download.js.map
 packages/tools/update-readme-sponsors.d.ts
 packages/tools/update-readme-sponsors.js
 packages/tools/update-readme-sponsors.js.map
+packages/tools/updateMarkdownDoc.d.ts
+packages/tools/updateMarkdownDoc.js
+packages/tools/updateMarkdownDoc.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
+packages/tools/website/updateDownloadPage.d.ts
+packages/tools/website/updateDownloadPage.js
+packages/tools/website/updateDownloadPage.js.map
+packages/tools/website/utils/frontMatter.d.ts
+packages/tools/website/utils/frontMatter.js
+packages/tools/website/utils/frontMatter.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map

.yarnrc.yml

@@ -0,0 +1,9 @@
+nmHoistingLimits: workspaces
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

Assets/WebsiteAssets/css/site.css

@@ -523,12 +523,17 @@ div.navbar-mobile-content a.sponsor-button {
 
 .bottom-links {
 	display: flex;
+	flex-direction: row;
 	justify-content: center;
 	border-top: 1px solid #d4d4d4;
 	margin-top: 30px;
 	padding-top: 25px;
 }
 
+.bottom-links .bottom-link {
+	margin-right: 20px;
+}
+
 /* TOC */
 
 #toc ul {
@@ -652,6 +657,24 @@ footer .bottom-links-row p {
 	font-size: 1.1em;
 }
 
+/*****************************************************************
+ WHAT'S NEW PAGE
+*****************************************************************/
+
+.news-page      .container > .content-wrapper,
+.news-item-page .container > .content-wrapper {
+	/* Set the line width so that there's no more than 75 characters per line */
+	/* https://baymard.com/blog/line-length-readability */
+	max-width: 650px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.news-page     img,
+.news-item-page img {
+	max-width: 650px;
+}
+
 /*****************************************************************
  IN THE PRESS
  The "In the press" section height needs to be adjusted as the