Skip to content

Commit

Permalink
Merge pull request #16 from MikeRatcliffe/add-prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Fenopy committed Sep 9, 2024
1 parent 2489144 commit 1b539f8
Show file tree
Hide file tree
Showing 39 changed files with 6,505 additions and 4,470 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: sidenoder-darwin-x64-zip
path: /tmp/builds/darwin/zip/
path: /tmp/builds/darwin/zip/
Empty file added .husky/pre-commit
Empty file.
12 changes: 12 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.github/
node_modules/
syncedversion.txt
synced.txt
com.sample.android.apk
/dist/*
/out/*
**/*.min.css
**/*.min.css.map
**/*.min.js
**/*.min.js.map
**/*.custom.js
14 changes: 14 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": false,
"trailingComma": "all",
"bracketSpacing": true,
"arrowParens": "always",
"requirePragma": false,
"insertPragma": false,
"proseWrap": "preserve",
"plugins": ["@destination/prettier-plugin-twig"]
}
29 changes: 20 additions & 9 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,28 @@
"version": "0.2.0",
"configurations": [
{
"name": "Launch",
"name": "Electron: Main",
"type": "node",
"request": "launch",
"program": "${workspaceFolder}/main.js",
"stopOnEntry": false,
"args": [],
"cwd": "${workspaceRoot}",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
"runtimeArgs": [".", "--enable-logging"],
"env": {},
"sourceMaps": false
"runtimeExecutable": "npm",
"runtimeArgs": ["run", "start"],
"env": {
"MAIN_ARGS": "--inspect=5858 --remote-debugging-port=9223"
}
},
{
"name": "Electron: Renderer",
"type": "chrome",
"request": "attach",
"port": 9223,
"webRoot": "${workspaceFolder}",
"timeout": 60000
}
],
"compounds": [
{
"name": "Electron: All",
"configurations": ["Electron: Main", "Electron: Renderer"]
}
]
}
22 changes: 11 additions & 11 deletions bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ image: node:10.15.3

pipelines:
default:
- step:
name: Build and Test
caches:
- node
script:
- npm install
- npm run-script pack
- npm run-script dist
artifacts:
- dist/SideNoder*.AppImage
- dist/SideNoder*.snap
- step:
name: Build and Test
caches:
- node
script:
- npm install
- npm run-script pack
- npm run-script dist
artifacts:
- dist/SideNoder*.AppImage
- dist/SideNoder*.snap
Loading

0 comments on commit 1b539f8

Please sign in to comment.