Skip to content

Commit

Permalink
Split JXA tsconfig into own package
Browse files Browse the repository at this point in the history
  • Loading branch information
targendaz2 committed May 8, 2024
1 parent 0000e17 commit a06354e
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 14 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Enable Corepack
run: corepack enable

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '21.x'
cache: 'yarn'

- name: Install dependencies
run: yarn
run: yarn install --immutable

- run: mkdir -p reports

- name: Run tests
run: yarn test --reporters=default --reporters=jest-junit
run: yarn workspace msda test --reporters=default --reporters=jest-junit
env:
JEST_JUNIT_INCLUDE_CONSOLE_OUTPUT: true
JEST_JUNIT_OUTPUT_FILE: reports/${{ matrix.os }}.xml
Expand Down
4 changes: 1 addition & 3 deletions packages/jxa-run/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jxa-run",
"version": "1.0.0",
"version": "0.1.0",
"description": "",
"keywords": [],
"license": "MIT",
Expand All @@ -16,9 +16,7 @@
"@types/node": "^20.12.7",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"jest": "^29.7.0",
"prettier": "^3.2.5",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"typescript-eslint": "^7.6.0"
Expand Down
1 change: 1 addition & 0 deletions packages/msda/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"ts-json-schema-generator": "^2.0.1",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"tsconfig-jxa": "workspace:^",
"typescript": "^5.4.5",
"typescript-eslint": "^7.6.0",
"webpack": "^5.91.0",
Expand Down
8 changes: 1 addition & 7 deletions packages/msda/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
{
"extends": "tsconfig-jxa/tsconfig.json",
"compilerOptions": {
"target": "ESNext",
"module": "CommonJS",
"esModuleInterop": true,
"strict": true,
"skipLibCheck": true,
"removeComments": true,
"resolveJsonModule": true,
"forceConsistentCasingInFileNames": true,
"sourceMap": true,
"paths": {
"@/*": ["./*"]
Expand Down
21 changes: 21 additions & 0 deletions packages/tsconfig-jxa/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2024 David Rosenberg

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions packages/tsconfig-jxa/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# tsconfig-jxa
7 changes: 7 additions & 0 deletions packages/tsconfig-jxa/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "tsconfig-jxa",
"version": "0.1.0",
"description": "",
"keywords": [],
"license": "MIT"
}
12 changes: 12 additions & 0 deletions packages/tsconfig-jxa/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"$schema": "https://json.schemastore.org/tsconfig",
"compilerOptions": {
"target": "ESNext",
"module": "CommonJS",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"skipLibCheck": true,
"removeComments": true
}
}
9 changes: 7 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4552,9 +4552,7 @@ __metadata:
"@types/node": "npm:^20.12.7"
eslint: "npm:^8.56.0"
eslint-config-prettier: "npm:^9.1.0"
jest: "npm:^29.7.0"
prettier: "npm:^3.2.5"
ts-jest: "npm:^29.1.2"
ts-node: "npm:^10.9.2"
typescript: "npm:^5.4.5"
typescript-eslint: "npm:^7.6.0"
Expand Down Expand Up @@ -5006,6 +5004,7 @@ __metadata:
ts-json-schema-generator: "npm:^2.0.1"
ts-loader: "npm:^9.5.1"
ts-node: "npm:^10.9.2"
tsconfig-jxa: "workspace:^"
typescript: "npm:^5.4.5"
typescript-eslint: "npm:^7.6.0"
webpack: "npm:^5.91.0"
Expand Down Expand Up @@ -6054,6 +6053,12 @@ __metadata:
languageName: node
linkType: hard

"tsconfig-jxa@workspace:^, tsconfig-jxa@workspace:packages/tsconfig-jxa":
version: 0.0.0-use.local
resolution: "tsconfig-jxa@workspace:packages/tsconfig-jxa"
languageName: unknown
linkType: soft

"type-check@npm:^0.4.0, type-check@npm:~0.4.0":
version: 0.4.0
resolution: "type-check@npm:0.4.0"
Expand Down

0 comments on commit a06354e

Please sign in to comment.