Skip to content

Commit

Permalink
Merge branch 'master' into pr/4279
Browse files Browse the repository at this point in the history
  • Loading branch information
samuveth committed Nov 17, 2023
2 parents 7c70243 + 61f77df commit ea924d1
Show file tree
Hide file tree
Showing 66 changed files with 578 additions and 10,516 deletions.
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ VITE_IPFS_GATEWAY=snapshot.mypinata.cloud
VITE_DEFAULT_NETWORK=1
VITE_PUSHER_BEAMS_INSTANCE_ID=2e080021-d495-456d-b2cf-84f9fd718442
VITE_SHUTTER_EON_PUBKEY=0x0e6493bbb4ee8b19aa9b70367685049ff01dc9382c46aed83f8bc07d2a5ba3e6030bd83b942c1fd3dff5b79bef3b40bf6b666e51e7f0be14ed62daaffad47435265f5c9403b1a801921981f7d8659a9bd91fe92fb1cf9afdb16178a532adfaf51a237103874bb03afafe9cab2118dae1be5f08a0a28bf488c1581e9db4bc23ca
VITE_ENV=develop
VITE_ENV=develop
VITE_MIXPANEL_TOKEN=2ec6cd1b19e790f45cc9a9bb83980c8d
3 changes: 0 additions & 3 deletions .env.test

This file was deleted.

3 changes: 2 additions & 1 deletion .eslintrc-auto-import.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"useFlaggedMessageStatus": true,
"useEmailSubscription": true,
"useEmailFetchClient": true,
"useStatement": true
"useStatement": true,
"useMixpanel": true
}
}
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.exports = {
node: true
},
extends: [
'plugin:cypress/recommended',
'plugin:vue/vue3-recommended',
'eslint:recommended',
'@vue/eslint-config-typescript/recommended',
Expand Down
19 changes: 16 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: 'monthly'
interval: "daily"
allow:
- dependency-name: "@snapshot-labs/*"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
ignore:
- dependency-name: "@snapshot-labs/*"
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"
1 change: 0 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
cache: 'yarn'
- run: yarn
- run: yarn test:unit:coverage
- run: yarn test:e2e
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
with:
Expand Down
7 changes: 7 additions & 0 deletions FUNDING.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"drips": {
"ethereum": {
"ownedBy": "0x8C28Cf33d9Fd3D0293f963b1cd27e3FF422B425c"
}
}
}
23 changes: 0 additions & 23 deletions cypress.config.ts

This file was deleted.

37 changes: 0 additions & 37 deletions cypress/e2e/create-proposal.spec.cy.js

This file was deleted.

163 changes: 0 additions & 163 deletions cypress/e2e/voting-proposal.spec.cy.js

This file was deleted.

25 changes: 0 additions & 25 deletions cypress/support/commands.js

This file was deleted.

14 changes: 0 additions & 14 deletions cypress/support/e2e.js

This file was deleted.

15 changes: 3 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@
"version": "0.1.4",
"scripts": {
"dev": "vite --port=8080",
"cypress:test:e2e": "start-server-and-test 'yarn cypress:serve:build' http-get://localhost:8081 'yarn cypress:run'",
"cypress:dev:e2e": "start-server-and-test 'yarn cypress:serve:dev' http-get://localhost:8081 'yarn cypress:open'",
"cypress:run": "env-cmd -f .env.test cypress run --browser chrome --headed",
"cypress:open": "env-cmd -f .env.test cypress run --browser chrome --headed --no-exit",
"cypress:serve:dev": "VITE_E2E=true vite --port=8081",
"cypress:serve:build": "VITE_E2E=true vite build && npx http-server dist -p 8081",
"preinstall": "yarn run init-submodules",
"build": "vite build",
"lint": "eslint \"*.{ts,js,vue,json}\" src/ cypress/ --ext .ts,.js,.vue,.json",
"lint": "eslint \"*.{ts,js,vue,json}\" src/ --ext .ts,.js,.vue,.json",
"lint:fix": "yarn lint --fix",
"format": "prettier \"**/*.{ts,js,vue,json}\"",
"format:check": "yarn format --check || exit 1",
"format:fix": "yarn format --write",
"postinstall": "patch-package && husky install",
"init-submodules": "git submodule update --init",
"test:unit": "vitest run",
"test:e2e": "start-server-and-test 'yarn cypress:serve:build' http-get://localhost:8081 'cypress run'",
"test:unit:coverage": "vitest run --coverage"
},
"dependencies": {
Expand All @@ -45,7 +38,7 @@
"@shutter-network/shutter-crypto": "0.1.0-beta.3",
"@snapshot-labs/lock": "^0.2.0",
"@snapshot-labs/pineapple": "^1.1.0",
"@snapshot-labs/snapshot.js": "^0.7.3",
"@snapshot-labs/snapshot.js": "^0.8.3",
"@snapshot-labs/tune": "^0.1.34",
"@vue/apollo-composable": "4.0.0-beta.4",
"@vueuse/core": "^10.4.0",
Expand All @@ -59,6 +52,7 @@
"js-sha256": "^0.9.0",
"jsonexport": "^3.2.0",
"lodash": "^4.17.21",
"mixpanel-browser": "^2.47.0",
"readable-stream": "3.6.0",
"remarkable": "^2.0.1",
"remove-markdown": "^0.5.0",
Expand All @@ -73,7 +67,6 @@
"devDependencies": {
"@iconify-json/heroicons-outline": "^1.1.7",
"@rushstack/eslint-patch": "^1.3.3",
"@synthetixio/synpress": "^3.5.1",
"@tailwindcss/forms": "^0.5.6",
"@types/bluebird": "^3.5.38",
"@types/lodash": "^4.14.198",
Expand All @@ -87,10 +80,8 @@
"@vue/eslint-config-typescript": "^9.0.0",
"@vue/test-utils": "^2.4.1",
"autoprefixer": "^10.4.15",
"cypress": "^12.11.0",
"env-cmd": "^10.1.0",
"eslint": "^8.46.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^7.15.1",
"happy-dom": "^10.11.0",
Expand Down
2 changes: 1 addition & 1 deletion snapshot-spaces
Loading

0 comments on commit ea924d1

Please sign in to comment.