Skip to content

Commit

Permalink
fix(build): Add esm target build in runtime, fix Embraser01#26 (Embra…
Browse files Browse the repository at this point in the history
  • Loading branch information
Embraser01 authored Mar 3, 2023
1 parent 4a09c04 commit ad5100a
Show file tree
Hide file tree
Showing 25 changed files with 127 additions and 230 deletions.
33 changes: 27 additions & 6 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,31 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14
uses: actions/setup-node@v1
- name: Checkout
uses: actions/checkout@v3

- name: Use Node.js 18
uses: actions/setup-node@v3
with:
node-version: 14
- run: yarn test:lint
- run: yarn test:eslint
node-version: 18

- name: Prettier
run: yarn test:lint

- name: ESLint
run: yarn test:eslint

types:
name: TypeScript
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Use Node.js 18
uses: actions/setup-node@v3
with:
node-version: 18

- name: TypeeScript
run: yarn test:types
10 changes: 6 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ jobs:
fail-fast: false
matrix:
node:
- 12
- 14
- 15
- 16
- 18
- 19
platform:
- ubuntu-latest
- windows-latest
- macos-latest

steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down
165 changes: 45 additions & 120 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"private": true,
"scripts": {
"start": "ts-node src/index.ts",
"test:types": "tsc --noEmit",
"generate": "ts-node scripts/generate.ts && prettier -w src/"
},
"dependencies": {
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"name": "@typoas/monorepo",
"private": true,
"workspaces": [
"packages/*",
"examples"
],
"scripts": {
"test:lint": "prettier . -c",
"test:eslint": "eslint .",
"test:types": "yarn workspaces foreach -ptv run test:types",
"test:jest": "yarn workspaces foreach -ptv run test:jest"
},
"dependencies": {
Expand Down
3 changes: 2 additions & 1 deletion packages/typoas-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"bin": "./src/bin.ts",
"scripts": {
"prepack": "tsc",
"start": "ts-node ./src/bin.ts"
"start": "ts-node ./src/bin.ts",
"test:types": "tsc --noEmit"
},
"dependencies": {
"@typoas/generator": "workspace:^",
Expand Down
3 changes: 2 additions & 1 deletion packages/typoas-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"main": "./src/index.ts",
"scripts": {
"prepack": "tsc",
"test:jest": "jest"
"test:jest": "jest",
"test:types": "tsc --noEmit"
},
"dependencies": {
"lodash": "^4.17.21",
Expand Down
13 changes: 8 additions & 5 deletions packages/typoas-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
"directory": "packages/typoas-runtime"
},
"main": "./src/index.ts",
"module": "./lib/esm/index.js",
"scripts": {
"prepack": "tsc",
"test:jest": "jest"
"prepack": "tsc --module esnext --outDir ./lib/esm && tsc --outDir ./lib/cjs",
"test:jest": "jest",
"test:types": "tsc --noEmit"
},
"dependencies": {
"query-string": "^8.1.0"
"query-string": "^7.1.3"
},
"devDependencies": {
"@jest/globals": "^29.4.3",
Expand All @@ -29,7 +31,8 @@
"!/lib/**/__tests__/*"
],
"publishConfig": {
"main": "./lib/index.js",
"types": "./lib/index.d.ts"
"main": "./lib/cjs/index.js",
"module": "./lib/esm/index.js",
"types": "./lib/esm/index.d.ts"
}
}
3 changes: 2 additions & 1 deletion packages/typoas-runtime/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
"compilerOptions": {
"strict": true,
"module": "commonjs",
"moduleResolution": "node",
"target": "ES2018",
"declaration": true,
"lib": ["ES2018", "DOM"],
"outDir": "lib"
"outDir": "lib/cjs"
},
"exclude": ["node_modules", "lib"]
}
124 changes: 32 additions & 92 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1000,14 +1000,7 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:*":
version: 14.17.11
resolution: "@types/node@npm:14.17.11"
checksum: 94192a5f6f5da51a10dfa959049a5cfcff440fbeeefbf98084083c1370a107872fc7f4a2df42f100989dea873cb4128f376d5e4af6be43fec21273359d9dbdb0
languageName: node
linkType: hard

"@types/node@npm:^18.14.5":
"@types/node@npm:*, @types/node@npm:^18.14.5":
version: 18.14.5
resolution: "@types/node@npm:18.14.5"
checksum: 415fb0edc132baa9580f1b7a381a3f10b662f5d7a7d11641917fa0961788ccede3272badc414aadc47306e9fc35c5f6c59159ac470b46d3f3a15fb0446224c8c
Expand Down Expand Up @@ -1092,16 +1085,6 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:5.11.0":
version: 5.11.0
resolution: "@typescript-eslint/scope-manager@npm:5.11.0"
dependencies:
"@typescript-eslint/types": "npm:5.11.0"
"@typescript-eslint/visitor-keys": "npm:5.11.0"
checksum: bf7feaed495ed4cafa1b89a2b73781b30061d019e1c1b3765dc8006e7f36b537f6f451e37c77400067771318b4f0c5915804084dc6299ea7c6ecde2daf0aca1c
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:5.54.0":
version: 5.54.0
resolution: "@typescript-eslint/scope-manager@npm:5.54.0"
Expand Down Expand Up @@ -1129,38 +1112,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:5.11.0":
version: 5.11.0
resolution: "@typescript-eslint/types@npm:5.11.0"
checksum: b1531481da75a6c89510ad03f3db68e4797b25438bb902ee322bd1c154b83396016271cc00356dcdbc300a8ee421493aae803b8c716f36d7b4808fe045ae3a2a
languageName: node
linkType: hard

"@typescript-eslint/types@npm:5.54.0":
version: 5.54.0
resolution: "@typescript-eslint/types@npm:5.54.0"
checksum: 0f66b1b93078f3afea6dfcd3d4e2f0abea4f60cd0c613c2cf13f85098e5bf786185484c9846ed80b6c4272de2c31a70c5a8aacb91314cf1b6da7dcb8855cb7ac
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:5.11.0":
version: 5.11.0
resolution: "@typescript-eslint/typescript-estree@npm:5.11.0"
dependencies:
"@typescript-eslint/types": "npm:5.11.0"
"@typescript-eslint/visitor-keys": "npm:5.11.0"
debug: "npm:^4.3.2"
globby: "npm:^11.0.4"
is-glob: "npm:^4.0.3"
semver: "npm:^7.3.5"
tsutils: "npm:^3.21.0"
peerDependenciesMeta:
typescript:
optional: true
checksum: 7bda55501c586efd7f8065b4158016486d8af92b8419931fbea7cec9bfe074075de8cdebec8baa1ac8a5c3f973599b9dd44a51fced1792176e49cd60cc8e5442
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:5.54.0":
version: 5.54.0
resolution: "@typescript-eslint/typescript-estree@npm:5.54.0"
Expand All @@ -1179,7 +1137,7 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:5.54.0":
"@typescript-eslint/utils@npm:5.54.0, @typescript-eslint/utils@npm:^5.10.0":
version: 5.54.0
resolution: "@typescript-eslint/utils@npm:5.54.0"
dependencies:
Expand All @@ -1197,32 +1155,6 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:^5.10.0":
version: 5.11.0
resolution: "@typescript-eslint/utils@npm:5.11.0"
dependencies:
"@types/json-schema": "npm:^7.0.9"
"@typescript-eslint/scope-manager": "npm:5.11.0"
"@typescript-eslint/types": "npm:5.11.0"
"@typescript-eslint/typescript-estree": "npm:5.11.0"
eslint-scope: "npm:^5.1.1"
eslint-utils: "npm:^3.0.0"
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
checksum: 5ab1a15db1e0a2fbb857a8a16325459ad3d5239066f2641aa93ad9f7d08252d3a4ca6ae356c51cba1c6c81a65d84883436566b01932fa55b64a69796b950900d
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:5.11.0":
version: 5.11.0
resolution: "@typescript-eslint/visitor-keys@npm:5.11.0"
dependencies:
"@typescript-eslint/types": "npm:5.11.0"
eslint-visitor-keys: "npm:^3.0.0"
checksum: 8f0b6fe1e86bc93825a137be3220f57e3a4bee410cca5d35963a0cd416750b31291a73c4294676d94ed0f5066b4cfb3a8f512d409881daa550d1645f4381eb21
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:5.54.0":
version: 5.54.0
resolution: "@typescript-eslint/visitor-keys@npm:5.54.0"
Expand Down Expand Up @@ -1303,7 +1235,7 @@ __metadata:
"@types/jest": ^29.4.0
jest: ^29.4.3
jest-environment-node: ^29.4.3
query-string: ^8.1.0
query-string: ^7.1.3
ts-jest: ^29.0.5
typescript: ^4.9.5
languageName: unknown
Expand Down Expand Up @@ -1899,10 +1831,10 @@ __metadata:
languageName: node
linkType: hard

"decode-uri-component@npm:^0.4.1":
version: 0.4.1
resolution: "decode-uri-component@npm:0.4.1"
checksum: 0473924860986fb6ca19ee65a2af13e08801b4f3660475b058500ea8479ed715c919884a026b6bf4296dbb640d3cea74fadf45490b2439152fc548271d0201ec
"decode-uri-component@npm:^0.2.2":
version: 0.2.2
resolution: "decode-uri-component@npm:0.2.2"
checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139
languageName: node
linkType: hard

Expand Down Expand Up @@ -2123,7 +2055,7 @@ __metadata:
languageName: node
linkType: hard

"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0":
"eslint-visitor-keys@npm:^3.3.0":
version: 3.3.0
resolution: "eslint-visitor-keys@npm:3.3.0"
checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808
Expand Down Expand Up @@ -2357,10 +2289,10 @@ __metadata:
languageName: node
linkType: hard

"filter-obj@npm:^5.1.0":
version: 5.1.0
resolution: "filter-obj@npm:5.1.0"
checksum: ba7c24d9b2c0552ee87d268e07eca74483af61fb740545ffa809f7e9e5294de38cf163ecc55af0e8a40020af9a49512c32f4022de2a858b110420fc8bffa7c9c
"filter-obj@npm:^1.1.0":
version: 1.1.0
resolution: "filter-obj@npm:1.1.0"
checksum: cf2104a7c45ff48e7f505b78a3991c8f7f30f28bd8106ef582721f321f1c6277f7751aacd5d83026cb079d9d5091082f588d14a72e7c5d720ece79118fa61e10
languageName: node
linkType: hard

Expand Down Expand Up @@ -2568,7 +2500,7 @@ __metadata:
languageName: node
linkType: hard

"globby@npm:^11.0.4, globby@npm:^11.1.0":
"globby@npm:^11.1.0":
version: 11.1.0
resolution: "globby@npm:11.1.0"
dependencies:
Expand Down Expand Up @@ -4063,14 +3995,15 @@ __metadata:
languageName: node
linkType: hard

"query-string@npm:^8.1.0":
version: 8.1.0
resolution: "query-string@npm:8.1.0"
"query-string@npm:^7.1.3":
version: 7.1.3
resolution: "query-string@npm:7.1.3"
dependencies:
decode-uri-component: ^0.4.1
filter-obj: ^5.1.0
split-on-first: ^3.0.0
checksum: 16fe49ab714f2b802bd31bc417876a38a82cd49bea01c0d6c37ca3439604c774752c8c66f9eda5ee33c268de2fc2a65e0e0e27aa97d8d98159af5c1fc838a017
decode-uri-component: ^0.2.2
filter-obj: ^1.1.0
split-on-first: ^1.0.0
strict-uri-encode: ^2.0.0
checksum: 91af02dcd9cc9227a052841d5c2eecb80a0d6489d05625df506a097ef1c59037cfb5e907f39b84643cbfd535c955abec3e553d0130a7b510120c37d06e0f4346
languageName: node
linkType: hard

Expand Down Expand Up @@ -4326,10 +4259,10 @@ __metadata:
languageName: node
linkType: hard

"split-on-first@npm:^3.0.0":
version: 3.0.0
resolution: "split-on-first@npm:3.0.0"
checksum: 75dc27ecbac65cfbeab9a3b90cf046307220192d3d7a30e46aa0f19571cc9b4802aac813f3de2cc9b16f2e46aae72f275659b5d2614bb5369c77724d739e5f73
"split-on-first@npm:^1.0.0":
version: 1.1.0
resolution: "split-on-first@npm:1.1.0"
checksum: 16ff85b54ddcf17f9147210a4022529b343edbcbea4ce977c8f30e38408b8d6e0f25f92cd35b86a524d4797f455e29ab89eb8db787f3c10708e0b47ebf528d30
languageName: node
linkType: hard

Expand Down Expand Up @@ -4358,6 +4291,13 @@ __metadata:
languageName: node
linkType: hard

"strict-uri-encode@npm:^2.0.0":
version: 2.0.0
resolution: "strict-uri-encode@npm:2.0.0"
checksum: eaac4cf978b6fbd480f1092cab8b233c9b949bcabfc9b598dd79a758f7243c28765ef7639c876fa72940dac687181b35486ea01ff7df3e65ce3848c64822c581
languageName: node
linkType: hard

"string-length@npm:^4.0.1":
version: 4.0.2
resolution: "string-length@npm:4.0.2"
Expand Down

0 comments on commit ad5100a

Please sign in to comment.