From bee43d1ad7a7e031aaa0820d0fd1323480d9a766 Mon Sep 17 00:00:00 2001 From: Olivier Cardinaux Date: Thu, 24 Aug 2023 19:16:59 +0200 Subject: [PATCH] chore: esbuild copy to destination --- README.md | 95 +++++++--------------------------------------- esbuild.config.mjs | 35 +++++++++++++++-- main.ts | 2 +- package.json | 4 +- plugin-data.json | 10 +++++ 5 files changed, 59 insertions(+), 87 deletions(-) create mode 100644 plugin-data.json diff --git a/README.md b/README.md index bb0348e..5da8a04 100644 --- a/README.md +++ b/README.md @@ -1,96 +1,29 @@ # Obsidian Sample Plugin -This is a sample plugin for Obsidian (https://obsidian.md). +This is a sample plugin for Obsidian [https://obsidian.md](https://obsidian.md). This project uses Typescript to provide type checking and documentation. The repo depends on the latest plugin API (obsidian.d.ts) in Typescript Definition format, which contains TSDoc comments describing what it does. -**Note:** The Obsidian API is still in early alpha and is subject to change at any time! - This sample plugin demonstrates some of the basic functionality the plugin API can do. + - Adds a ribbon icon, which shows a Notice when clicked. - Adds a command "Open Sample Modal" which opens a Modal. - Adds a plugin setting tab to the settings page. - Registers a global click event and output 'click' to the console. - Registers a global interval which logs 'setInterval' to the console. -## First time developing plugins? - -Quick starting guide for new plugin devs: - -- Check if [someone already developed a plugin for what you want](https://obsidian.md/plugins)! There might be an existing plugin similar enough that you can partner up with. -- Make a copy of this repo as a template with the "Use this template" button (login to GitHub if you don't see it). -- Clone your repo to a local development folder. For convenience, you can place this folder in your `.obsidian/plugins/your-plugin-name` folder. -- Install NodeJS, then run `npm i` in the command line under your repo folder. -- Run `npm run dev` to compile your plugin from `main.ts` to `main.js`. -- Make changes to `main.ts` (or create new `.ts` files). Those changes should be automatically compiled into `main.js`. -- Reload Obsidian to load the new version of your plugin. -- Enable plugin in settings window. -- For updates to the Obsidian API run `npm update` in the command line under your repo folder. - -## Releasing new releases - -- Update your `manifest.json` with your new version number, such as `1.0.1`, and the minimum Obsidian version required for your latest release. -- Update your `versions.json` file with `"new-plugin-version": "minimum-obsidian-version"` so older versions of Obsidian can download an older version of your plugin that's compatible. -- Create new GitHub release using your new version number as the "Tag version". Use the exact version number, don't include a prefix `v`. See here for an example: https://github.com/obsidianmd/obsidian-sample-plugin/releases -- Upload the files `manifest.json`, `main.js`, `styles.css` as binary attachments. Note: The manifest.json file must be in two places, first the root path of your repository and also in the release. -- Publish the release. - -> You can simplify the version bump process by running `npm version patch`, `npm version minor` or `npm version major` after updating `minAppVersion` manually in `manifest.json`. -> The command will bump version in `manifest.json` and `package.json`, and add the entry for the new version to `versions.json` - -## Adding your plugin to the community plugin list - -- Check https://github.com/obsidianmd/obsidian-releases/blob/master/plugin-review.md -- Publish an initial version. -- Make sure you have a `README.md` file in the root of your repo. -- Make a pull request at https://github.com/obsidianmd/obsidian-releases to add your plugin. - -## How to use - -- Clone this repo. -- Make sure your NodeJS is at least v16 (`node --version`). -- `npm i` or `yarn` to install dependencies. -- `npm run dev` to start compilation in watch mode. - -## Manually installing the plugin - -- Copy over `main.js`, `styles.css`, `manifest.json` to your vault `VaultFolder/.obsidian/plugins/your-plugin-id/`. - -## Improve code quality with eslint (optional) -- [ESLint](https://eslint.org/) is a tool that analyzes your code to quickly find problems. You can run ESLint against your plugin to find common bugs and ways to improve your code. -- To use eslint with this project, make sure to install eslint from terminal: - - `npm install -g eslint` -- To use eslint to analyze this project use this command: - - `eslint main.ts` - - eslint will then create a report with suggestions for code improvement by file and line number. -- If your source code is in a folder, such as `src`, you can use eslint with this command to analyze all files in that folder: - - `eslint .\src\` - -## Funding URL - -You can include funding URLs where people who use your plugin can financially support it. - -The simple way is to set the `fundingUrl` field to your link in your `manifest.json` file: - -```json -{ - "fundingUrl": "https://buymeacoffee.com" -} -``` - -If you have multiple URLs, you can also do: - -```json -{ - "fundingUrl": { - "Buy Me a Coffee": "https://buymeacoffee.com", - "GitHub Sponsor": "https://github.com/sponsors", - "Patreon": "https://www.patreon.com/" - } -} -``` - ## API Documentation -See https://github.com/obsidianmd/obsidian-api +See [here](https://github.com/obsidianmd/obsidian-api) + +## Local changes (ocx) + +1. Add [husky](https://typicode.github.io/husky/getting-started.html) and commitlint + +- `npx husky-init && npm install` +- `npm i @commitlint/cli @commitlint/config-convential -D` + +2. Add esbuild internal 'plugin' to copy files to right place (dev and prod) + + diff --git a/esbuild.config.mjs b/esbuild.config.mjs index b13282b..71d956e 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -1,6 +1,9 @@ -import esbuild from "esbuild"; -import process from "process"; import builtins from "builtin-modules"; +import { copyFile } from "fs/promises"; +import esbuild from "esbuild"; +import path from "path"; +import process from "process"; +import { readFileSync } from "fs"; const banner = `/* @@ -11,6 +14,26 @@ if you want to view the source, please visit the github repository of this plugi const prod = (process.argv[2] === "production"); +// Use variables to copy build to good directory +const data = JSON.parse(readFileSync("plugin-data.json", "utf8")); + +const { plugin_id, plugin_files, dev_root, prod_root } = data; + +async function copyPluginFiles() { + for (const file of plugin_files) { + await copyFile(file, path.join(dest, file)); + } +} + +const copyFilesToDestination = { + name: "copy", + setup(build) { + build.onEnd((result) => { + copyPluginFiles() + }); + }, +}; + const context = await esbuild.context({ banner: { js: banner, @@ -37,12 +60,18 @@ const context = await esbuild.context({ logLevel: "info", sourcemap: prod ? false : "inline", treeShaking: true, + plugins: [ + copyFilesToDestination + ], outfile: "main.js", }); +let dest = path.join(dev_root, plugin_id); + if (prod) { + dest = path.join(prod_root, plugin_id); await context.rebuild(); process.exit(0); } else { await context.watch(); -} \ No newline at end of file +} diff --git a/main.ts b/main.ts index 2d07212..1b21e5a 100644 --- a/main.ts +++ b/main.ts @@ -26,7 +26,7 @@ export default class MyPlugin extends Plugin { // This adds a status bar item to the bottom of the app. Does not work on mobile apps. const statusBarItemEl = this.addStatusBarItem(); - statusBarItemEl.setText('Status Bar Text'); + statusBarItemEl.setText('Fucking Text'); // This adds a simple command that can be triggered anywhere this.addCommand({ diff --git a/package.json b/package.json index efc35e0..ccd85d6 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "main": "main.js", "scripts": { "dev": "node esbuild.config.mjs", - "build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production", + "build": "node esbuild.config.mjs production", "version": "node version-bump.mjs && git add manifest.json versions.json", "prepare": "husky install" }, "keywords": [], - "author": "", + "author": "Olivier Cardinaux", "license": "MIT", "devDependencies": { "@commitlint/cli": "^17.7.1", diff --git a/plugin-data.json b/plugin-data.json new file mode 100644 index 0000000..5a3907c --- /dev/null +++ b/plugin-data.json @@ -0,0 +1,10 @@ +{ + "plugin_id": "sample-plugin", + "plugin_files": [ + "main.js", + "styles.css", + "manifest.json" + ], + "dev_root": "D:\\Olivier\\plugintest\\.obsidian\\plugins\\", + "prod_root": "D:\\Olivier\\ThisLife\\.obsidian.desktop\\plugins\\" +}