mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-10-18 23:32:32 +00:00
Merge branch 'main' into disenchant and run prettier
This commit is contained in:
@@ -9,6 +9,7 @@ package-lock.json
|
|||||||
# build
|
# build
|
||||||
main.js
|
main.js
|
||||||
main_org.js
|
main_org.js
|
||||||
|
main_org_*.js
|
||||||
*.js.map
|
*.js.map
|
||||||
meta.json
|
meta.json
|
||||||
meta-*.json
|
meta-*.json
|
||||||
@@ -17,3 +18,6 @@ meta-*.json
|
|||||||
# obsidian
|
# obsidian
|
||||||
data.json
|
data.json
|
||||||
.vscode
|
.vscode
|
||||||
|
|
||||||
|
# environment variables
|
||||||
|
.env
|
||||||
|
|||||||
@@ -19,6 +19,18 @@ const manifestJson = JSON.parse(fs.readFileSync("./manifest.json") + "");
|
|||||||
const packageJson = JSON.parse(fs.readFileSync("./package.json") + "");
|
const packageJson = JSON.parse(fs.readFileSync("./package.json") + "");
|
||||||
const updateInfo = JSON.stringify(fs.readFileSync("./updates.md") + "");
|
const updateInfo = JSON.stringify(fs.readFileSync("./updates.md") + "");
|
||||||
|
|
||||||
|
const PATHS_TEST_INSTALL = process.env?.PATHS_TEST_INSTALL || "";
|
||||||
|
const PATH_TEST_INSTALL = PATHS_TEST_INSTALL.split(path.delimiter).map(p => p.trim()).filter(p => p.length);
|
||||||
|
if (!prod) {
|
||||||
|
if (PATH_TEST_INSTALL) {
|
||||||
|
console.log(`Built files will be copied to ${PATH_TEST_INSTALL}`);
|
||||||
|
} else {
|
||||||
|
console.log("Development build: You can install the plug-in to Obsidian for testing by exporting the PATHS_TEST_INSTALL environment variable with the paths to your vault plugins directories separated by your system path delimiter (':' on Unix, ';' on Windows).");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log("Production build");
|
||||||
|
}
|
||||||
|
|
||||||
const moduleAliasPlugin = {
|
const moduleAliasPlugin = {
|
||||||
name: "module-alias",
|
name: "module-alias",
|
||||||
setup(build) {
|
setup(build) {
|
||||||
@@ -95,6 +107,21 @@ const plugins = [
|
|||||||
} else {
|
} else {
|
||||||
fs.copyFileSync("./main_org.js", "./main.js");
|
fs.copyFileSync("./main_org.js", "./main.js");
|
||||||
}
|
}
|
||||||
|
if (PATH_TEST_INSTALL) {
|
||||||
|
for (const installPath of PATH_TEST_INSTALL) {
|
||||||
|
const realPath = path.resolve(installPath);
|
||||||
|
console.log(`Copying built files to ${realPath}`);
|
||||||
|
if (!fs.existsSync(realPath)) {
|
||||||
|
console.warn(`Test install path ${installPath} does not exist`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const manifestX = JSON.parse(fs.readFileSync("./manifest.json") + "");
|
||||||
|
manifestX.version = manifestJson.version + "." + Date.now();
|
||||||
|
fs.writeFileSync(path.join(installPath, "manifest.json"), JSON.stringify(manifestX, null, 2));
|
||||||
|
fs.copyFileSync("./main.js", path.join(installPath, "main.js"));
|
||||||
|
fs.copyFileSync("./styles.css", path.join(installPath, "styles.css"));
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
PATHS_TEST_INSTALL=your-vault-plugin-path:and-another-path
|
||||||
Generated
+208
-76
File diff suppressed because it is too large
Load Diff
+4
-4
@@ -13,7 +13,7 @@
|
|||||||
"postbakei18n": "prettier --config ./.prettierrc ./src/lib/src/common/messages/*.ts --write --log-level error",
|
"postbakei18n": "prettier --config ./.prettierrc ./src/lib/src/common/messages/*.ts --write --log-level error",
|
||||||
"posti18n:yaml2json": "npm run prettyjson",
|
"posti18n:yaml2json": "npm run prettyjson",
|
||||||
"predev": "npm run bakei18n",
|
"predev": "npm run bakei18n",
|
||||||
"dev": "node esbuild.config.mjs",
|
"dev": "node --env-file=.env esbuild.config.mjs",
|
||||||
"prebuild": "npm run bakei18n",
|
"prebuild": "npm run bakei18n",
|
||||||
"build": "node esbuild.config.mjs production",
|
"build": "node esbuild.config.mjs production",
|
||||||
"buildDev": "node esbuild.config.mjs dev",
|
"buildDev": "node esbuild.config.mjs dev",
|
||||||
@@ -49,6 +49,7 @@
|
|||||||
"@typescript-eslint/parser": "8.25.0",
|
"@typescript-eslint/parser": "8.25.0",
|
||||||
"builtin-modules": "5.0.0",
|
"builtin-modules": "5.0.0",
|
||||||
"esbuild": "0.25.0",
|
"esbuild": "0.25.0",
|
||||||
|
"esbuild-plugin-inline-worker": "^0.1.1",
|
||||||
"esbuild-svelte": "^0.9.0",
|
"esbuild-svelte": "^0.9.0",
|
||||||
"eslint": "^9.21.0",
|
"eslint": "^9.21.0",
|
||||||
"eslint-plugin-import": "^2.31.0",
|
"eslint-plugin-import": "^2.31.0",
|
||||||
@@ -71,6 +72,7 @@
|
|||||||
"pouchdb-utils": "^9.0.0",
|
"pouchdb-utils": "^9.0.0",
|
||||||
"prettier": "3.5.2",
|
"prettier": "3.5.2",
|
||||||
"svelte": "5.28.6",
|
"svelte": "5.28.6",
|
||||||
|
"svelte-check": "^4.1.7",
|
||||||
"svelte-preprocess": "^6.0.3",
|
"svelte-preprocess": "^6.0.3",
|
||||||
"terser": "^5.39.0",
|
"terser": "^5.39.0",
|
||||||
"transform-pouch": "^2.0.0",
|
"transform-pouch": "^2.0.0",
|
||||||
@@ -88,13 +90,11 @@
|
|||||||
"@smithy/protocol-http": "^5.1.0",
|
"@smithy/protocol-http": "^5.1.0",
|
||||||
"@smithy/querystring-builder": "^4.0.2",
|
"@smithy/querystring-builder": "^4.0.2",
|
||||||
"diff-match-patch": "^1.0.5",
|
"diff-match-patch": "^1.0.5",
|
||||||
"esbuild-plugin-inline-worker": "^0.1.1",
|
|
||||||
"fflate": "^0.8.2",
|
"fflate": "^0.8.2",
|
||||||
"idb": "^8.0.3",
|
"idb": "^8.0.3",
|
||||||
"minimatch": "^10.0.1",
|
"minimatch": "^10.0.2",
|
||||||
"octagonal-wheels": "^0.1.40",
|
"octagonal-wheels": "^0.1.40",
|
||||||
"qrcode-generator": "^1.4.4",
|
"qrcode-generator": "^1.4.4",
|
||||||
"svelte-check": "^4.1.7",
|
|
||||||
"trystero": "github:vrtmrz/trystero#9e892a93ec14eeb57ce806d272fbb7c3935256d8",
|
"trystero": "github:vrtmrz/trystero#9e892a93ec14eeb57ce806d272fbb7c3935256d8",
|
||||||
"xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
|
"xxhash-wasm-102": "npm:xxhash-wasm@^1.0.2"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
Submodule src/lib updated: 868590e814...6f58b4f076
@@ -321,6 +321,8 @@ export function paneRemoteConfig(
|
|||||||
},
|
},
|
||||||
onUpdate: this.enableOnlySyncDisabled,
|
onUpdate: this.enableOnlySyncDisabled,
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
void addPanel(paneEl, "Peer-to-Peer", undefined, this.onlyOnOnlyP2P).then((paneEl) => {
|
void addPanel(paneEl, "Peer-to-Peer", undefined, this.onlyOnOnlyP2P).then((paneEl) => {
|
||||||
const syncWarnP2P = this.createEl(paneEl, "div", {
|
const syncWarnP2P = this.createEl(paneEl, "div", {
|
||||||
text: "",
|
text: "",
|
||||||
@@ -475,11 +477,10 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
|
|||||||
.addButton((button) =>
|
.addButton((button) =>
|
||||||
button.setButtonText("Generate").onClick(async () => {
|
button.setButtonText("Generate").onClick(async () => {
|
||||||
const crypto = await getWebCrypto();
|
const crypto = await getWebCrypto();
|
||||||
const keyPair = await crypto.subtle.generateKey(
|
const keyPair = await crypto.subtle.generateKey({ name: "ECDSA", namedCurve: "P-256" }, true, [
|
||||||
{ name: "ECDSA", namedCurve: "P-256" },
|
"sign",
|
||||||
true,
|
"verify",
|
||||||
["sign", "verify"]
|
]);
|
||||||
);
|
|
||||||
const pubKey = await crypto.subtle.exportKey("spki", keyPair.publicKey);
|
const pubKey = await crypto.subtle.exportKey("spki", keyPair.publicKey);
|
||||||
const privateKey = await crypto.subtle.exportKey("pkcs8", keyPair.privateKey);
|
const privateKey = await crypto.subtle.exportKey("pkcs8", keyPair.privateKey);
|
||||||
const encodedPublicKey = await arrayBufferToBase64Single(pubKey);
|
const encodedPublicKey = await arrayBufferToBase64Single(pubKey);
|
||||||
@@ -595,7 +596,6 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
|
|||||||
.addOnUpdate(this.onlyOnCouchDB);
|
.addOnUpdate(this.onlyOnCouchDB);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
|
||||||
void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleNotification"), () => {}, this.onlyOnCouchDB).then(
|
void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleNotification"), () => {}, this.onlyOnCouchDB).then(
|
||||||
(paneEl) => {
|
(paneEl) => {
|
||||||
paneEl.addClass("wizardHidden");
|
paneEl.addClass("wizardHidden");
|
||||||
|
|||||||
+10
-12
@@ -110,10 +110,10 @@
|
|||||||
div.sls-setting-menu-btn {
|
div.sls-setting-menu-btn {
|
||||||
color: var(--text-normal);
|
color: var(--text-normal);
|
||||||
background-color: var(--background-secondary-alt);
|
background-color: var(--background-secondary-alt);
|
||||||
border-radius: 4px 4px 0 0;
|
border-radius: 8px;
|
||||||
padding: 6px 10px;
|
padding: 6px 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin-right: 12px;
|
margin-right: 2px;
|
||||||
font-family: "Inter", sans-serif;
|
font-family: "Inter", sans-serif;
|
||||||
outline: none;
|
outline: none;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
@@ -140,9 +140,9 @@ div.sls-setting-menu-btn {
|
|||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
background-color: rgba(var(--background-primary), 0.3);
|
backdrop-filter: blur(15px);
|
||||||
backdrop-filter: blur(4px);
|
padding: 4px;
|
||||||
border-radius: 4px;
|
border-radius: 10px;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -437,13 +437,11 @@ div.workspace-leaf-content[data-type=bases] .livesync-status {
|
|||||||
|
|
||||||
.sls-setting-panel-title {
|
.sls-setting-panel-title {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
}
|
font-size: medium;
|
||||||
|
top: 2.5em;
|
||||||
.sls-setting-panel-title {
|
background-color: var(--background-secondary-alt);
|
||||||
top: 2em;
|
border-radius: 10px;
|
||||||
background-color: rgba(var(--background-primary), 0.3);
|
padding: 0.5em 1.0em;
|
||||||
backdrop-filter: blur(4px);
|
|
||||||
border-radius: 30%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.sls-dialogue-note-wrapper {
|
.sls-dialogue-note-wrapper {
|
||||||
|
|||||||
Reference in New Issue
Block a user