Skip to content

Commit

Permalink
Depend on language-extensions instead of tstl (#77)
Browse files Browse the repository at this point in the history
* Depend on language-extensions instead of tstl

* Add missing dependency

* Fix prettier and use new node version in CI

* Actually fix CI

* Maybe actually fix ci?

* Ignore test project lua
  • Loading branch information
Perryvw authored Sep 4, 2022
1 parent 40a55bf commit 9019b3c
Show file tree
Hide file tree
Showing 15 changed files with 223 additions and 319 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 12
- name: Use Node.js 16
uses: actions/setup-node@v1
with:
node-version: 12
node-version: 16
- run: npm ci
- run: npm run lint

Expand All @@ -22,9 +22,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 12
- name: Use Node.js 16
uses: actions/setup-node@v1
with:
node-version: 12
node-version: 16
- run: npm ci
- run: npm test
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 12.13.1
- name: Use Node.js 16
uses: actions/setup-node@v1
with:
node-version: 12.13.1
node-version: 16
registry-url: 'https://registry.npmjs.org'
- run: npm ci
- run: npm test
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ node_modules
.vscode
*.log
*.js
test/testproject/*.lua
2 changes: 1 addition & 1 deletion core/index-5.0.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference types="typescript-to-lua/language-extensions" />
/// <reference types="@typescript-to-lua/language-extensions" />

/// <reference path="./coroutine.d.ts" />
/// <reference path="./5.0/debug.d.ts" />
Expand Down
2 changes: 1 addition & 1 deletion core/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference types="typescript-to-lua/language-extensions" />
/// <reference types="@typescript-to-lua/language-extensions" />

/// <reference path="./coroutine.d.ts" />
/// <reference path="./debug.d.ts" />
Expand Down
136 changes: 74 additions & 62 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"**/*.d.ts"
],
"scripts": {
"test": "jest",
"test": "jest && npm run test:test-project",
"test:test-project": "npm --prefix test/testproject ci && npm --prefix test/testproject run build",
"lint": "prettier --check ."
},
"prettier": {
Expand All @@ -23,16 +24,18 @@
"proseWrap": "never",
"singleQuote": true
},
"peerDependencies": {
"typescript-to-lua": "^1.0.0"
},
"devDependencies": {
"@types/jest": "^26.0.20",
"@types/node": "^14.14.34",
"jest": "^26.6.3",
"jest-circus": "^26.6.3",
"prettier": "^2.0.5",
"ts-jest": "^26.5.3",
"typescript-to-lua": "^1.0.1"
"typescript": "4.7.3",
"typescript-to-lua": "^1.9.0",
"@typescript-to-lua/language-extensions": "^1.0.0"
},
"peer-dependencies": {
"@typescript-to-lua/language-extensions": "^1.0.0"
}
}
Loading

0 comments on commit 9019b3c

Please sign in to comment.