Skip to content

Commit

Permalink
chore: move plugin source into plugin/ directory
Browse files Browse the repository at this point in the history
In order to prepare making a docs folder, lets separate the packages cleanly
  • Loading branch information
jamiebrynes7 committed Feb 11, 2024
1 parent 38a23b5 commit c111487
Show file tree
Hide file tree
Showing 59 changed files with 14 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/premerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
uses: DeterminateSystems/magic-nix-cache-action@main

- name: Install dependencies
run: nix develop ./nix --impure --command npm install
run: nix develop ./nix --impure --command bash -c "cd plugin && npm install"

- name: Check
run: nix develop ./nix --impure --command npm run check
run: nix develop ./nix --impure --command bash - c"cd plugin && npm run check"

- name: Build
run: nix develop ./nix --impure --command npm run build
run: nix develop ./nix --impure --command bash -c "cd plugin && npm run build"

- name: Test
run: nix develop ./nix --impure --command npm run test
run: nix develop ./nix --impure --command bash -c "cd plugin && npm run test"
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
uses: DeterminateSystems/magic-nix-cache-action@main

- name: Install dependencies
run: nix develop ./nix --impure --command npm install
run: nix develop ./nix --impure --command bash -c "cd plugin && npm install"

- name: Build
run: nix develop ./nix --impure --command npm run build
run: nix develop ./nix --impure --command bash -c "cd plugin && npm run build"

- name: Release
id: create_release
Expand All @@ -33,6 +33,6 @@ jobs:
name: Obsidian x Todoist - v${{ github.ref }}
draft: true
files: |
dist/main.js
dist/manifest.json
dist/styles.css
plugin/dist/main.js
plugin/dist/manifest.json
plugin/dist/styles.css
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
node_modules/
dist/
package-lock.json
# Plugin things
plugin/node_modules/
plugin/dist/
plugin/package-lock.json

# Nix-related things
.direnv/
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion vite.config.mts → plugin/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default defineConfig({
dest: "",
},
{
src: "manifest.json",
src: "../manifest.json",
dest: "",
}
]
Expand Down

0 comments on commit c111487

Please sign in to comment.