Release Version 0.2.1

Author: Elias Sundqvist

.github/workflows/ci.yml

@@ -4,7 +4,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout repository and submodules
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
     - name: Install modules
       run: yarn
     - name: Run ESLint

.github/workflows/release.yml

@@ -14,16 +14,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository and submodules
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: "16.x" # You might need to adjust this value to your own version
       - name: Build
         id: build
         run: |
-          npm install
-          npm run build --if-present
+          yarn
+          yarn build
           mkdir ${{ env.PLUGIN_NAME }}
           cp main.js manifest.json ${{ env.PLUGIN_NAME }}
           zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}

Modified Resources.md

@@ -1,7 +1,7 @@
 The following resources have been modified in the (`resources`) folder, and will need to be reapplied when updating hypothesis version. 
 
 * `hypothes.is\app.html` and `hypothes.is\app.html` 
-    > remove "dsn" from the sentry object. This prevents crash logs from being sent to the hypothes.is theme.  (See issue #97)
+    > remove "dsn" from the sentry object. This prevents crash logs from being sent to the hypothes.is team.  (See issue #97)
 
 * `cdn.hypothes.is\demos\epub\epub.js\js\reader.js`
     > Expose `start()` function as `window.epubReader(readerSettings)`. It allows to pass settings to reader from `annotatorView`
@@ -141,19 +141,4 @@ The following resources have been modified in the (`resources`) folder, and will
         //  return; //(comment out this check)
         }
         ...
-    ```
-* `cdn.hypothes.is\hypothesis\1.853.0\build\scripts\annotator.bundle.js`
-    > This is needed for reliable navigation and focusing of highlights. 
-    ```js
-    /*expose the guest object for annotation navigation.*//*START EDIT HERE*/window.guests=[...(window.guests??[]),this]/*END EDIT HERE*/
-    ```
-    > This fixes an issue with highlights not working:
-      Replace `if(l||(l=new Set,this._sentChannels.set(i,l)),l.has(a))return;` from annotator.bundle.js
-      with `if(l||(l=new Set,this._sentChannels.set(i,l)),l.has(a)){};`
-
-
-* `cdn.hypothes.is\hypothesis\1.960.0\build\scripts\sidebar.bundle.js`
-   > This is needed for custom markdown rendering (replace in the part that corresponds to `renderMathAndMarkdown`)
-   ```js
-   /*REPLACE THE MARKDOWN RENDERING FUNCTION*/return window.renderObsidianMarkdown(e);
-   ``` 
+    ```

README.md

@@ -69,6 +69,14 @@ You can make a [pull request](https://github.com/elias-sundqvist/obsidian-annota
 
 ## Changelog
 
+### 0.2.1 (2022-03-06) **[BRAT](https://github.com/TfTHacker/obsidian42-brat) release** *Basic web and video annotation* 
+* `annotation-target-type` can now take on the values `web` and `video`. 
+  * With `web` the annotation target can (in theory) be any website. Some work better than others. Link navigation does not work. 
+  * With `video`, only youtube links are supported. In order to use this feature, a link to a zip file with the annotator.tv resources must be provided in the plugin settings. It cannot be bundled with the plugin since that would most likely violate copyright. 
+    * You can ask someone for a link, or generate it yourself by making an account at annotate.tv, signing in, going to https://annotate.tv/videos/620d5a42b9ab630009bf3e31#, and downloading the website using the [Save All Resources](https://chrome.google.com/webstore/detail/save-all-resources/abpdnfjocnmdomablahdcfnoggeeiedb?hl=en) chrome extension, uploading it to google drive, and [generating a direct link](https://sites.google.com/site/gdocs2direct/). 
+  * Other improvements:
+    * Some behind-the-scenes changes have been made so that the hypothes.is version can be more easily upgraded in the future. 
+
 ### 0.2.0 (2022-01-26) **[BRAT](https://github.com/TfTHacker/obsidian42-brat) release** *Improved markdown rendering, epub reader* 
 * Markdown in the hypothesis sidebar should now fully support the regular obsidian syntax. (including links, embeds, custom codeblocks etc.)
 * Several Epub improvements, Thanks to @aladmit for these!

README_DEV.md

@@ -0,0 +1,7 @@
+
+> Note: 
+> 
+>   If you are on windows, you must make the following small changes 
+>   1. Go to .\submodules\hypothesis-client-annotator-fork\node_modules\@hypothesis\frontend-build\lib\rollup.js
+>   2. Add `import { pathToFileURL } from 'url'` to the top of the file. 
+>   3. Replace `import(resolve(path))` with `import(pathToFileURL(resolve(path)))`

manifest-beta.json

@@ -1,8 +1,8 @@
 {
 	"id": "obsidian-annotator",
 	"name": "Annotator",
-	"version": "0.2.0",
-	"minAppVersion": "0.13.19",
+	"version": "0.2.1",
+	"minAppVersion": "0.13.29",
 	"description": "This is a sample plugin for Obsidian. It allows you to open and annotate PDF and EPUB files.",
 	"author": "Obsidian",
 	"authorUrl": "https://obsidian.md/about",

package.json

@@ -1,14 +1,16 @@
 {
   "name": "obsidian-annotator",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "This is a sample plugin for Obsidian (https://obsidian.md)",
   "main": "main.js",
   "scripts": {
     "prettier-format": "prettier --config .prettierrc.js src/**/*.tsx --write",
     "lint": "eslint src --ext .ts,.tsx",
     "dev": "rollup --config rollup.config.js -w",
     "test": "jest",
-    "build": "rollup --config rollup.config.js --environment BUILD:production"
+    "quick-build": "rollup --config rollup.config.js --environment BUILD:production",
+    "build": "yarn build-hypothesis && yarn quick-build",
+    "build-hypothesis": "rimraf resources/cdn.hypothes.is/hypothesis/build && cd submodules/hypothesis-client-annotator-fork && yarn && yarn build && move-cli build ../../resources/cdn.hypothes.is/hypothesis/build && cd ../.."
   },
   "keywords": [],
   "author": "",
@@ -26,7 +28,6 @@
     "@codemirror/rangeset": "^0.19.0",
     "@codemirror/search": "^0.19.0",
     "@codemirror/state": "^0.19.0",
-    "@codemirror/stream-parser": "https://github.com/lishid/stream-parser",
     "@codemirror/view": "^0.19.0",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-json": "^4.1.0",
@@ -39,15 +40,18 @@
     "@typescript-eslint/eslint-plugin": "^4.29.3",
     "@typescript-eslint/parser": "^4.29.3",
     "babel-jest": "^27.1.1",
+    "cross-env": "^7.0.3",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-react": "^7.24.0",
     "jest": "^27.1.1",
     "magic-string": "^0.25.7",
     "minify": "^7.0.2",
+    "move-cli": "^2.0.0",
     "obsidian": "^0.13.11",
     "prettier": "^2.3.2",
+    "rimraf": "^3.0.2",
     "rollup": "^2.32.1",
     "rollup-plugin-analyzer": "^4.0.0",
     "rollup-plugin-base64": "^1.0.1",

rollup.config.js

@@ -1,5 +1,6 @@
 import typescript from '@rollup/plugin-typescript';
 import {nodeResolve} from '@rollup/plugin-node-resolve';
+import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 import copy from 'rollup-plugin-copy'
 import fs from 'fs';
@@ -58,6 +59,7 @@ export default {
   "@lezer/lr"],
   plugins: [
     typescript(),
+    json(),
     nodeResolve({browser: true}),
     replace({
       'process.env.NODE_ENV': JSON.stringify('production')