Skip to content

Commit

Permalink
Merge pull request #38 from thinknathan/master
Browse files Browse the repository at this point in the history
feat: Add prettier formatting, update dependencies
  • Loading branch information
thinknathan authored Jun 26, 2024
2 parents a839d79 + a8ce425 commit d975628
Show file tree
Hide file tree
Showing 20 changed files with 2,984 additions and 2,794 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

32 changes: 0 additions & 32 deletions .eslintrc

This file was deleted.

13 changes: 8 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: github-actions
directory: '/'
schedule:
interval: "daily"
interval: monthly
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'daily'
allow:
- dependency-name: "@ts-defold*"

- dependency-name: '@ts-defold*'
51 changes: 25 additions & 26 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,31 @@ on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

- name: Setup Defold
uses: dapetcu21/setup-defold@v3.0.3
- name: Install Dependencies
run: npm install
- name: Genrate lua w/ ts-defold
run: npm run build

- name: Build
run: 'java -jar $BOB --root ./app --archive --platform js-web --verbose resolve distclean build bundle'
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 'lts/*'

- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'

- name: Setup Defold
uses: dapetcu21/setup-defold@v3.0.3

- name: Install Dependencies
run: npm install

- name: Genrate lua w/ ts-defold
run: npm run build

- name: Build
run: 'java -jar $BOB --root ./app --archive --platform js-web --verbose resolve distclean build bundle'
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
app
.git
node_modules
package-lock.json
6 changes: 6 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://json.schemastore.org/prettierrc",
"semi": true,
"singleQuote": true,
"useTabs": true
}
5 changes: 3 additions & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"dbaeumer.vscode-eslint",
"thejustinwalsh.textproto-grammer",
"ts-defold.defold-vscode-build",
],
}
"esbenp.prettier-vscode"
]
}
43 changes: 20 additions & 23 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Debug",
"type": "lua-local",
"request": "launch",
"stopOnEntry": false,
"verbose": false,
"internalConsoleOptions": "openOnSessionStart",
"program": { "command": "bash" },
"osx": { "args": [".vscode/defold.sh", "launch", "macOS"] },
"linux": { "args": [".vscode/defold.sh", "launch", "Linux"] },
"windows": {
"args": [".vscode/defold.sh", "launch", "Windows"],
"program": { "command": "C:/Program Files/Git/bin/bash" }
},
"scriptRoots": [
"app",
"src"
]
}
]
}
"version": "0.2.0",
"configurations": [
{
"name": "Debug",
"type": "lua-local",
"request": "launch",
"stopOnEntry": false,
"verbose": false,
"internalConsoleOptions": "openOnSessionStart",
"program": { "command": "bash" },
"osx": { "args": [".vscode/defold.sh", "launch", "macOS"] },
"linux": { "args": [".vscode/defold.sh", "launch", "Linux"] },
"windows": {
"args": [".vscode/defold.sh", "launch", "Windows"],
"program": { "command": "C:/Program Files/Git/bin/bash" }
},
"scriptRoots": ["app", "src"]
}
]
}
102 changes: 59 additions & 43 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,60 @@
{
"files.associations": {
"*.script": "lua",
"*.gui_script": "lua",
"*.render_script": "lua",
"*.editor_script": "lua",
"*.lua_": "lua",
"*.fp": "glsl",
"*.vp": "glsl",
"*.go": "textproto",
"*.animationset": "textproto",
"*.atlas": "textproto",
"*.buffer": "json",
"*.camera": "textproto",
"*.collection": "textproto",
"*.collectionfactory": "textproto",
"*.collectionproxy": "textproto",
"*.collisionobject": "textproto",
"*.display_profiles": "textproto",
"*.factory": "textproto",
"*.gamepads": "textproto",
"*.gui": "textproto",
"*.input_binding": "textproto",
"*.label": "textproto",
"*.material": "textproto",
"*.mesh": "textproto",
"*.model": "textproto",
"*.particlefx": "textproto",
"*.project": "ini",
"*.render": "textproto",
"*.sound": "textproto",
"*.spinemodel": "textproto",
"*.spinescene": "textproto",
"*.sprite": "textproto",
"*.texture_profiles": "textproto",
"*.tilemap": "textproto",
"*.tilesource": "textproto",
},
"files.exclude": {
"node_modules/": true,
"patches/": true,
},
"typescript.tsdk": "node_modules\\typescript\\lib"
}
"editor.insertSpaces": false,
"editor.tabSize": 2,
"editor.detectIndentation": false,
"eslint.experimental.useFlatConfig": true,
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[md]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"files.associations": {
"*.script": "lua",
"*.gui_script": "lua",
"*.render_script": "lua",
"*.editor_script": "lua",
"*.lua_": "lua",
"*.fp": "glsl",
"*.vp": "glsl",
"*.go": "textproto",
"*.animationset": "textproto",
"*.atlas": "textproto",
"*.buffer": "json",
"*.camera": "textproto",
"*.collection": "textproto",
"*.collectionfactory": "textproto",
"*.collectionproxy": "textproto",
"*.collisionobject": "textproto",
"*.display_profiles": "textproto",
"*.factory": "textproto",
"*.gamepads": "textproto",
"*.gui": "textproto",
"*.input_binding": "textproto",
"*.label": "textproto",
"*.material": "textproto",
"*.mesh": "textproto",
"*.model": "textproto",
"*.particlefx": "textproto",
"*.project": "ini",
"*.render": "textproto",
"*.sound": "textproto",
"*.spinemodel": "textproto",
"*.spinescene": "textproto",
"*.sprite": "textproto",
"*.texture_profiles": "textproto",
"*.tilemap": "textproto",
"*.tilesource": "textproto"
},
"files.exclude": {
"node_modules/": true,
"patches/": true
},
"typescript.tsdk": "node_modules\\typescript\\lib"
}
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
"detail": "tstl --watch"
}
]
}
}
2 changes: 1 addition & 1 deletion @types/lldebugger-0.0.1.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

/** @noResolution */
declare module 'lldebugger.debug' {
export function start(): void;
export function start(): void;
}
7 changes: 3 additions & 4 deletions @types/lldebugger.debug.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/** @noResolution */
declare module 'lldebugger.debug' {

/**@noself */
export function start(): void;
}
/**@noself */
export function start(): void;
}
Loading

0 comments on commit d975628

Please sign in to comment.