Skip to content

Commit 9019b3c

Browse files
authored
Depend on language-extensions instead of tstl (#77)
* 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
1 parent 40a55bf commit 9019b3c

File tree

15 files changed

+223
-319
lines changed

15 files changed

+223
-319
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: Use Node.js 12
12+
- name: Use Node.js 16
1313
uses: actions/setup-node@v1
1414
with:
15-
node-version: 12
15+
node-version: 16
1616
- run: npm ci
1717
- run: npm run lint
1818

@@ -22,9 +22,9 @@ jobs:
2222

2323
steps:
2424
- uses: actions/checkout@v2
25-
- name: Use Node.js 12
25+
- name: Use Node.js 16
2626
uses: actions/setup-node@v1
2727
with:
28-
node-version: 12
28+
node-version: 16
2929
- run: npm ci
3030
- run: npm test

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14-
- name: Use Node.js 12.13.1
14+
- name: Use Node.js 16
1515
uses: actions/setup-node@v1
1616
with:
17-
node-version: 12.13.1
17+
node-version: 16
1818
registry-url: 'https://registry.npmjs.org'
1919
- run: npm ci
2020
- run: npm test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ node_modules
22
.vscode
33
*.log
44
*.js
5+
test/testproject/*.lua

core/index-5.0.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference types="typescript-to-lua/language-extensions" />
1+
/// <reference types="@typescript-to-lua/language-extensions" />
22

33
/// <reference path="./coroutine.d.ts" />
44
/// <reference path="./5.0/debug.d.ts" />

core/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference types="typescript-to-lua/language-extensions" />
1+
/// <reference types="@typescript-to-lua/language-extensions" />
22

33
/// <reference path="./coroutine.d.ts" />
44
/// <reference path="./debug.d.ts" />

package-lock.json

Lines changed: 74 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"**/*.d.ts"
1515
],
1616
"scripts": {
17-
"test": "jest",
17+
"test": "jest && npm run test:test-project",
18+
"test:test-project": "npm --prefix test/testproject ci && npm --prefix test/testproject run build",
1819
"lint": "prettier --check ."
1920
},
2021
"prettier": {
@@ -23,16 +24,18 @@
2324
"proseWrap": "never",
2425
"singleQuote": true
2526
},
26-
"peerDependencies": {
27-
"typescript-to-lua": "^1.0.0"
28-
},
2927
"devDependencies": {
3028
"@types/jest": "^26.0.20",
3129
"@types/node": "^14.14.34",
3230
"jest": "^26.6.3",
3331
"jest-circus": "^26.6.3",
3432
"prettier": "^2.0.5",
3533
"ts-jest": "^26.5.3",
36-
"typescript-to-lua": "^1.0.1"
34+
"typescript": "4.7.3",
35+
"typescript-to-lua": "^1.9.0",
36+
"@typescript-to-lua/language-extensions": "^1.0.0"
37+
},
38+
"peer-dependencies": {
39+
"@typescript-to-lua/language-extensions": "^1.0.0"
3740
}
3841
}

0 commit comments

Comments
 (0)