Skip to content

Commit

Permalink
try switching to yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
Connoropolous committed Oct 26, 2023
1 parent 2525a8e commit 8242e33
Show file tree
Hide file tree
Showing 13 changed files with 18,600 additions and 24,246 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/dry-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
if: ${{ runner.os == 'Windows' }}
run: |
choco install wget --no-progress
- name: Install nodejs dependencies
run: |
npm ci
shell: bash
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install # will run `yarn install` command
- name: setup for codesigning (macos only)
if: ${{ runner.os == 'macOs' }}
uses: figleafteam/import-codesign-certs@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
if: ${{ runner.os == 'Windows' }}
run: |
choco install wget --no-progress
- name: Install nodejs dependencies
run: |
npm install
shell: bash
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install # will run `yarn install` command
- name: setup for codesigning (macos only)
if: ${{ runner.os == 'macOs' }}
uses: figleafteam/import-codesign-certs@v2
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install web dependencies
run: npm install -w web
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install # will run `yarn install` command
- name: Storybook static build
run: |
npm run build-storybook -w web
yarn workspace acorn-ui build-storybook
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Install nodejs dependencies
run: |
npm install -w web
shell: bash
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install # will run `yarn install` command
- name: Build zod-models dependency
run: |
npm run build -w zod-models
yarn workspace zod-models build
shell: bash
- name: run unit tests
run: |
npm run test -w web
yarn workspace acorn-ui test
shell: bash
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.yarn

binaries
node_modules
out/
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
15 changes: 9 additions & 6 deletions electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "Open source peer-to-peer project management for software teams",
"main": "dist/index.js",
"scripts": {
"start": "npx electron .",
"build": "npx electron-builder build",
"tsc": "npx tsc",
"start": "electron .",
"build": "electron-builder build",
"tsc": "tsc",
"lint": "eslint --ext .ts ."
},
"keywords": [],
Expand All @@ -15,6 +15,9 @@
"email": "[email protected]"
},
"license": "CAL-1.0",
"installConfig": {
"hoistingLimits": "workspaces"
},
"build": {
"productName": "Acorn",
"afterSign": "./afterSignHook.js",
Expand Down Expand Up @@ -44,19 +47,19 @@
}
},
"devDependencies": {
"@electron/notarize": "^2.1.0",
"@types/node": "20.8.9",
"@types/split": "^1.0.0",
"electron": "20.3.12",
"electron-builder": "24.7.0",
"@electron/notarize": "^2.1.0",
"electron-builder": "24.8.0",
"eslint": "^7.25.0",
"eslint-plugin-import": "^2.22.1"
},
"dependencies": {
"@lightningrodlabs/electron-holochain": "=0.7.8",
"electron-context-menu": "^3.5.0",
"electron-log": "^4.3.5",
"electron-default-menu": "^1.0.2",
"electron-log": "^4.3.5",
"split": "^1.0.1"
}
}
Loading

0 comments on commit 8242e33

Please sign in to comment.