diff --git a/.pnp.cjs b/.pnp.cjs index b1ec4d00b19..e2cf32e1571 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -217,12 +217,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:28.1.2"],\ ["lint-staged", "npm:12.4.1"],\ ["lodash", "npm:4.17.21"],\ - ["mrlint", "npm:0.0.46"],\ + ["mrlint", "npm:0.0.50"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ ["stylelint", "npm:14.9.1"],\ ["stylelint-config-prettier-scss", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:0.0.1"],\ ["stylelint-config-standard-scss", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:4.0.0"],\ + ["ts-jest", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:28.0.5"],\ ["ts-node", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:10.8.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -7268,6 +7269,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7291,6 +7293,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["prettier", "npm:2.6.2"],\ ["react", "npm:18.2.0"],\ ["stylelint", "npm:14.9.1"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7331,6 +7334,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["node-loader", "virtual:909a3ad0503c6a40b1eda456c4db8b2a60b9422bba9121b95eef4169ee16677e7144d66526740c016c87dd3dc339185e62726b17a4bb073916f17da3fb3c2c2f#npm:2.0.0"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-loader", "virtual:909a3ad0503c6a40b1eda456c4db8b2a60b9422bba9121b95eef4169ee16677e7144d66526740c016c87dd3dc339185e62726b17a4bb073916f17da3fb3c2c2f#npm:9.3.1"],\ ["ts-node", "virtual:909a3ad0503c6a40b1eda456c4db8b2a60b9422bba9121b95eef4169ee16677e7144d66526740c016c87dd3dc339185e62726b17a4bb073916f17da3fb3c2c2f#npm:10.8.1"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"],\ @@ -7361,6 +7365,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["js-yaml", "npm:4.1.0"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"],\ ["zod", "npm:3.16.0"]\ ],\ @@ -7413,6 +7418,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7437,6 +7443,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7457,6 +7464,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7479,6 +7487,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7502,6 +7511,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7540,6 +7550,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["react-scripts", "virtual:9b60843f93b40879d252e7157e551df447110dfbf7733263381f1a30af265b2804b12983457ee32c7facca51b4c4d5cc30287dc9e2725b4cbb8a618f3beae533#npm:5.0.1"],\ ["sass", "npm:1.53.0"],\ ["stylelint", "npm:14.9.1"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7564,6 +7575,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["js-yaml", "npm:4.1.0"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7590,6 +7602,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["lodash", "npm:4.17.21"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7619,6 +7632,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["prettier", "npm:2.6.2"],\ ["tar", "npm:6.1.11"],\ ["tmp-promise", "npm:3.0.3"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7641,28 +7655,29 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["npm-run-all", "npm:4.1.5"],\ ["open", "npm:8.4.0"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ }]\ ]],\ ["@fern-api/mrlint-commons", [\ - ["npm:0.0.46", {\ - "packageLocation": "./.yarn/cache/@fern-api-mrlint-commons-npm-0.0.46-f864bd0ac6-88254c30b8.zip/node_modules/@fern-api/mrlint-commons/",\ + ["npm:0.0.50", {\ + "packageLocation": "./.yarn/cache/@fern-api-mrlint-commons-npm-0.0.50-406ddca605-2106f1cb85.zip/node_modules/@fern-api/mrlint-commons/",\ "packageDependencies": [\ - ["@fern-api/mrlint-commons", "npm:0.0.46"],\ - ["@fern-api/mrlint-virtual-file-system", "npm:0.0.46"]\ + ["@fern-api/mrlint-commons", "npm:0.0.50"],\ + ["@fern-api/mrlint-virtual-file-system", "npm:0.0.50"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@fern-api/mrlint-lint", [\ - ["npm:0.0.46", {\ - "packageLocation": "./.yarn/cache/@fern-api-mrlint-lint-npm-0.0.46-d081cece60-0e49f17a5b.zip/node_modules/@fern-api/mrlint-lint/",\ + ["npm:0.0.50", {\ + "packageLocation": "./.yarn/cache/@fern-api-mrlint-lint-npm-0.0.50-dfd473f97a-b77f12256d.zip/node_modules/@fern-api/mrlint-lint/",\ "packageDependencies": [\ - ["@fern-api/mrlint-lint", "npm:0.0.46"],\ - ["@fern-api/mrlint-commons", "npm:0.0.46"],\ - ["@fern-api/mrlint-virtual-file-system", "npm:0.0.46"],\ + ["@fern-api/mrlint-lint", "npm:0.0.50"],\ + ["@fern-api/mrlint-commons", "npm:0.0.50"],\ + ["@fern-api/mrlint-virtual-file-system", "npm:0.0.50"],\ ["chalk", "npm:4.1.2"],\ ["diff", "npm:5.0.0"],\ ["prettier", "npm:2.6.2"]\ @@ -7671,12 +7686,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fern-api/mrlint-parser", [\ - ["npm:0.0.46", {\ - "packageLocation": "./.yarn/cache/@fern-api-mrlint-parser-npm-0.0.46-9965b90188-19615fd5ef.zip/node_modules/@fern-api/mrlint-parser/",\ + ["npm:0.0.50", {\ + "packageLocation": "./.yarn/cache/@fern-api-mrlint-parser-npm-0.0.50-3190711c63-a8d224a95b.zip/node_modules/@fern-api/mrlint-parser/",\ "packageDependencies": [\ - ["@fern-api/mrlint-parser", "npm:0.0.46"],\ - ["@fern-api/mrlint-commons", "npm:0.0.46"],\ - ["@fern-api/mrlint-rules", "npm:0.0.46"],\ + ["@fern-api/mrlint-parser", "npm:0.0.50"],\ + ["@fern-api/mrlint-commons", "npm:0.0.50"],\ + ["@fern-api/mrlint-rules", "npm:0.0.50"],\ ["execa", "npm:5.1.1"],\ ["find-up", "npm:5.0.0"],\ ["js-yaml", "npm:4.1.0"],\ @@ -7686,22 +7701,22 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["@fern-api/mrlint-rules", [\ - ["npm:0.0.46", {\ - "packageLocation": "./.yarn/cache/@fern-api-mrlint-rules-npm-0.0.46-39658995f5-47f4385446.zip/node_modules/@fern-api/mrlint-rules/",\ + ["npm:0.0.50", {\ + "packageLocation": "./.yarn/cache/@fern-api-mrlint-rules-npm-0.0.50-4b86cd2c2f-7066117695.zip/node_modules/@fern-api/mrlint-rules/",\ "packageDependencies": [\ - ["@fern-api/mrlint-rules", "npm:0.0.46"],\ - ["@fern-api/mrlint-commons", "npm:0.0.46"],\ - ["@fern-api/mrlint-virtual-file-system", "npm:0.0.46"],\ + ["@fern-api/mrlint-rules", "npm:0.0.50"],\ + ["@fern-api/mrlint-commons", "npm:0.0.50"],\ + ["@fern-api/mrlint-virtual-file-system", "npm:0.0.50"],\ ["immer", "npm:9.0.14"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@fern-api/mrlint-virtual-file-system", [\ - ["npm:0.0.46", {\ - "packageLocation": "./.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.46-79e39728bc-1f7d194acc.zip/node_modules/@fern-api/mrlint-virtual-file-system/",\ + ["npm:0.0.50", {\ + "packageLocation": "./.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.50-eaaa3c2f90-a8c8b76d27.zip/node_modules/@fern-api/mrlint-virtual-file-system/",\ "packageDependencies": [\ - ["@fern-api/mrlint-virtual-file-system", "npm:0.0.46"]\ + ["@fern-api/mrlint-virtual-file-system", "npm:0.0.50"]\ ],\ "linkType": "HARD"\ }]\ @@ -7728,6 +7743,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["npm-run-all", "npm:4.1.5"],\ ["openapi-types", "npm:12.0.0"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7754,6 +7770,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7777,6 +7794,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["js-yaml", "npm:4.1.0"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"],\ ["zod", "npm:3.16.0"]\ ],\ @@ -7828,6 +7846,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["memfs", "npm:3.4.3"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -7858,6 +7877,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["npm-run-all", "npm:4.1.5"],\ ["package-json-type", "npm:1.0.3"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -7882,6 +7902,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -7906,6 +7927,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -7930,6 +7952,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"],\ ["zod", "npm:3.16.0"]\ ],\ @@ -7953,6 +7976,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -7975,6 +7999,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -8003,6 +8028,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["memfs", "npm:3.4.3"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -8027,6 +8053,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -8058,6 +8085,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["memfs", "npm:3.4.3"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -8086,6 +8114,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["lodash", "npm:4.17.21"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -8116,6 +8145,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -8144,6 +8174,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["memfs", "npm:3.4.3"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ "linkType": "SOFT"\ @@ -8169,6 +8200,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["lodash", "npm:4.17.21"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-morph", "npm:14.0.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -12827,6 +12859,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["bs-logger", [\ + ["npm:0.2.6", {\ + "packageLocation": "./.yarn/cache/bs-logger-npm-0.2.6-7670f88b66-d34bdaf68c.zip/node_modules/bs-logger/",\ + "packageDependencies": [\ + ["bs-logger", "npm:0.2.6"],\ + ["fast-json-stable-stringify", "npm:2.1.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["bser", [\ ["npm:2.1.1", {\ "packageLocation": "./.yarn/cache/bser-npm-2.1.1-cc902055ce-9ba4dc58ce.zip/node_modules/bser/",\ @@ -16473,12 +16515,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jest", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:28.1.2"],\ ["lint-staged", "npm:12.4.1"],\ ["lodash", "npm:4.17.21"],\ - ["mrlint", "npm:0.0.46"],\ + ["mrlint", "npm:0.0.50"],\ ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ ["stylelint", "npm:14.9.1"],\ ["stylelint-config-prettier-scss", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:0.0.1"],\ ["stylelint-config-standard-scss", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:4.0.0"],\ + ["ts-jest", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:28.0.5"],\ ["ts-node", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:10.8.0"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"]\ ],\ @@ -16524,6 +16567,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["npm-run-all", "npm:4.1.5"],\ ["prettier", "npm:2.6.2"],\ ["simple-progress-webpack-plugin", "virtual:5b8f83b261217e1d7a6ba4f4e8ce453aec5ae01ffc6ce377573050afedd12ba6250c8912c326b5f5c4f58d71dc3b73737f866aff31a3f57f7db9e63374ae0787#npm:2.0.0"],\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ ["ts-loader", "virtual:5b8f83b261217e1d7a6ba4f4e8ce453aec5ae01ffc6ce377573050afedd12ba6250c8912c326b5f5c4f58d71dc3b73737f866aff31a3f57f7db9e63374ae0787#npm:9.3.1"],\ ["ts-node", "virtual:909a3ad0503c6a40b1eda456c4db8b2a60b9422bba9121b95eef4169ee16677e7144d66526740c016c87dd3dc339185e62726b17a4bb073916f17da3fb3c2c2f#npm:10.8.1"],\ ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"],\ @@ -21137,14 +21181,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["mrlint", [\ - ["npm:0.0.46", {\ - "packageLocation": "./.yarn/cache/mrlint-npm-0.0.46-352297f385-fe7c57dc09.zip/node_modules/mrlint/",\ - "packageDependencies": [\ - ["mrlint", "npm:0.0.46"],\ - ["@fern-api/mrlint-commons", "npm:0.0.46"],\ - ["@fern-api/mrlint-lint", "npm:0.0.46"],\ - ["@fern-api/mrlint-parser", "npm:0.0.46"],\ - ["@fern-api/mrlint-rules", "npm:0.0.46"],\ + ["npm:0.0.50", {\ + "packageLocation": "./.yarn/cache/mrlint-npm-0.0.50-fb3a992bb4-1f0e631dcf.zip/node_modules/mrlint/",\ + "packageDependencies": [\ + ["mrlint", "npm:0.0.50"],\ + ["@fern-api/mrlint-commons", "npm:0.0.50"],\ + ["@fern-api/mrlint-lint", "npm:0.0.50"],\ + ["@fern-api/mrlint-parser", "npm:0.0.50"],\ + ["@fern-api/mrlint-rules", "npm:0.0.50"],\ ["chalk", "npm:4.1.2"],\ ["yargs", "npm:17.5.1"]\ ],\ @@ -27455,6 +27499,89 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["ts-jest", [\ + ["npm:28.0.5", {\ + "packageLocation": "./.yarn/cache/ts-jest-npm-28.0.5-8c44d8b86f-53e05db5b7.zip/node_modules/ts-jest/",\ + "packageDependencies": [\ + ["ts-jest", "npm:28.0.5"]\ + ],\ + "linkType": "SOFT"\ + }],\ + ["virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5", {\ + "packageLocation": "./.yarn/__virtual__/ts-jest-virtual-43107bd744/0/cache/ts-jest-npm-28.0.5-8c44d8b86f-53e05db5b7.zip/node_modules/ts-jest/",\ + "packageDependencies": [\ + ["ts-jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.0.5"],\ + ["@babel/core", "npm:7.18.5"],\ + ["@types/babel-jest", null],\ + ["@types/babel__core", null],\ + ["@types/esbuild", null],\ + ["@types/jest", "npm:28.1.2"],\ + ["@types/typescript", null],\ + ["babel-jest", null],\ + ["bs-logger", "npm:0.2.6"],\ + ["esbuild", null],\ + ["fast-json-stable-stringify", "npm:2.1.0"],\ + ["jest", "virtual:33e3bdbf7fa5e7d67a169bcdae0e2087d849097f5a378245e86fb92d10d2653fdf9d594cdb1a5bf8cfadcbf1009b79b64646fafed7dc31ed357978dc9b6978f0#npm:28.1.1"],\ + ["jest-util", "npm:28.1.1"],\ + ["json5", "npm:2.2.1"],\ + ["lodash.memoize", "npm:4.1.2"],\ + ["make-error", "npm:1.3.6"],\ + ["semver", "npm:7.3.7"],\ + ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"],\ + ["yargs-parser", "npm:21.0.1"]\ + ],\ + "packagePeers": [\ + "@babel/core",\ + "@types/babel-jest",\ + "@types/babel__core",\ + "@types/esbuild",\ + "@types/jest",\ + "@types/typescript",\ + "babel-jest",\ + "esbuild",\ + "jest",\ + "typescript"\ + ],\ + "linkType": "HARD"\ + }],\ + ["virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:28.0.5", {\ + "packageLocation": "./.yarn/__virtual__/ts-jest-virtual-ee9dc8c648/0/cache/ts-jest-npm-28.0.5-8c44d8b86f-53e05db5b7.zip/node_modules/ts-jest/",\ + "packageDependencies": [\ + ["ts-jest", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:28.0.5"],\ + ["@babel/core", "npm:7.18.5"],\ + ["@types/babel-jest", null],\ + ["@types/babel__core", null],\ + ["@types/esbuild", null],\ + ["@types/jest", "npm:28.1.2"],\ + ["@types/typescript", null],\ + ["babel-jest", null],\ + ["bs-logger", "npm:0.2.6"],\ + ["esbuild", null],\ + ["fast-json-stable-stringify", "npm:2.1.0"],\ + ["jest", "virtual:f8e21c9fa0a798b21a87ac455600e39198fef65848556a3a2cd5c956b0460181f9e618173dcff6d9d4fb96fb870055dfe1a3ec3db5db0700e71c0184e4711659#npm:28.1.2"],\ + ["jest-util", "npm:28.1.1"],\ + ["json5", "npm:2.2.1"],\ + ["lodash.memoize", "npm:4.1.2"],\ + ["make-error", "npm:1.3.6"],\ + ["semver", "npm:7.3.7"],\ + ["typescript", "patch:typescript@npm%3A4.6.4#~builtin::version=4.6.4&hash=7ad353"],\ + ["yargs-parser", "npm:21.0.1"]\ + ],\ + "packagePeers": [\ + "@babel/core",\ + "@types/babel-jest",\ + "@types/babel__core",\ + "@types/esbuild",\ + "@types/jest",\ + "@types/typescript",\ + "babel-jest",\ + "esbuild",\ + "jest",\ + "typescript"\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["ts-loader", [\ ["npm:9.3.1", {\ "packageLocation": "./.yarn/cache/ts-loader-npm-9.3.1-634433ef6a-462a8ac315.zip/node_modules/ts-loader/",\ diff --git a/.yarn/cache/@fern-api-mrlint-commons-npm-0.0.46-f864bd0ac6-88254c30b8.zip b/.yarn/cache/@fern-api-mrlint-commons-npm-0.0.46-f864bd0ac6-88254c30b8.zip deleted file mode 100644 index de0872e0ecd..00000000000 Binary files a/.yarn/cache/@fern-api-mrlint-commons-npm-0.0.46-f864bd0ac6-88254c30b8.zip and /dev/null differ diff --git a/.yarn/cache/@fern-api-mrlint-commons-npm-0.0.50-406ddca605-2106f1cb85.zip b/.yarn/cache/@fern-api-mrlint-commons-npm-0.0.50-406ddca605-2106f1cb85.zip new file mode 100644 index 00000000000..e45c016298e Binary files /dev/null and b/.yarn/cache/@fern-api-mrlint-commons-npm-0.0.50-406ddca605-2106f1cb85.zip differ diff --git a/.yarn/cache/@fern-api-mrlint-lint-npm-0.0.46-d081cece60-0e49f17a5b.zip b/.yarn/cache/@fern-api-mrlint-lint-npm-0.0.46-d081cece60-0e49f17a5b.zip deleted file mode 100644 index 270c0a760bb..00000000000 Binary files a/.yarn/cache/@fern-api-mrlint-lint-npm-0.0.46-d081cece60-0e49f17a5b.zip and /dev/null differ diff --git a/.yarn/cache/@fern-api-mrlint-lint-npm-0.0.50-dfd473f97a-b77f12256d.zip b/.yarn/cache/@fern-api-mrlint-lint-npm-0.0.50-dfd473f97a-b77f12256d.zip new file mode 100644 index 00000000000..62179bf4430 Binary files /dev/null and b/.yarn/cache/@fern-api-mrlint-lint-npm-0.0.50-dfd473f97a-b77f12256d.zip differ diff --git a/.yarn/cache/@fern-api-mrlint-parser-npm-0.0.46-9965b90188-19615fd5ef.zip b/.yarn/cache/@fern-api-mrlint-parser-npm-0.0.46-9965b90188-19615fd5ef.zip deleted file mode 100644 index d9bdaf3b8ec..00000000000 Binary files a/.yarn/cache/@fern-api-mrlint-parser-npm-0.0.46-9965b90188-19615fd5ef.zip and /dev/null differ diff --git a/.yarn/cache/@fern-api-mrlint-parser-npm-0.0.50-3190711c63-a8d224a95b.zip b/.yarn/cache/@fern-api-mrlint-parser-npm-0.0.50-3190711c63-a8d224a95b.zip new file mode 100644 index 00000000000..05d594df127 Binary files /dev/null and b/.yarn/cache/@fern-api-mrlint-parser-npm-0.0.50-3190711c63-a8d224a95b.zip differ diff --git a/.yarn/cache/@fern-api-mrlint-rules-npm-0.0.46-39658995f5-47f4385446.zip b/.yarn/cache/@fern-api-mrlint-rules-npm-0.0.46-39658995f5-47f4385446.zip deleted file mode 100644 index 24305dfae88..00000000000 Binary files a/.yarn/cache/@fern-api-mrlint-rules-npm-0.0.46-39658995f5-47f4385446.zip and /dev/null differ diff --git a/.yarn/cache/@fern-api-mrlint-rules-npm-0.0.50-4b86cd2c2f-7066117695.zip b/.yarn/cache/@fern-api-mrlint-rules-npm-0.0.50-4b86cd2c2f-7066117695.zip new file mode 100644 index 00000000000..c7ea655c2c4 Binary files /dev/null and b/.yarn/cache/@fern-api-mrlint-rules-npm-0.0.50-4b86cd2c2f-7066117695.zip differ diff --git a/.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.46-79e39728bc-1f7d194acc.zip b/.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.46-79e39728bc-1f7d194acc.zip deleted file mode 100644 index 36e9c4f2330..00000000000 Binary files a/.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.46-79e39728bc-1f7d194acc.zip and /dev/null differ diff --git a/.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.50-eaaa3c2f90-a8c8b76d27.zip b/.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.50-eaaa3c2f90-a8c8b76d27.zip new file mode 100644 index 00000000000..55c96586fe0 Binary files /dev/null and b/.yarn/cache/@fern-api-mrlint-virtual-file-system-npm-0.0.50-eaaa3c2f90-a8c8b76d27.zip differ diff --git a/.yarn/cache/bs-logger-npm-0.2.6-7670f88b66-d34bdaf68c.zip b/.yarn/cache/bs-logger-npm-0.2.6-7670f88b66-d34bdaf68c.zip new file mode 100644 index 00000000000..c741a6bf2ea Binary files /dev/null and b/.yarn/cache/bs-logger-npm-0.2.6-7670f88b66-d34bdaf68c.zip differ diff --git a/.yarn/cache/mrlint-npm-0.0.46-352297f385-fe7c57dc09.zip b/.yarn/cache/mrlint-npm-0.0.46-352297f385-fe7c57dc09.zip deleted file mode 100644 index 97e725e0722..00000000000 Binary files a/.yarn/cache/mrlint-npm-0.0.46-352297f385-fe7c57dc09.zip and /dev/null differ diff --git a/.yarn/cache/mrlint-npm-0.0.50-fb3a992bb4-1f0e631dcf.zip b/.yarn/cache/mrlint-npm-0.0.50-fb3a992bb4-1f0e631dcf.zip new file mode 100644 index 00000000000..e176384c412 Binary files /dev/null and b/.yarn/cache/mrlint-npm-0.0.50-fb3a992bb4-1f0e631dcf.zip differ diff --git a/.yarn/cache/ts-jest-npm-28.0.5-8c44d8b86f-53e05db5b7.zip b/.yarn/cache/ts-jest-npm-28.0.5-8c44d8b86f-53e05db5b7.zip new file mode 100644 index 00000000000..5f695e1b41c Binary files /dev/null and b/.yarn/cache/ts-jest-npm-28.0.5-8c44d8b86f-53e05db5b7.zip differ diff --git a/package.json b/package.json index 3f650b4771d..d2949f0af3e 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,12 @@ ], "scripts": { "clean": "yarn workspace @fern-api/compile-root run clean", - "compile": "yarn compile:cjs", + "compile": "yarn compile:esm", "compile:all": "yarn compile:prepare && yarn workspace @fern-api/compile-root run compile:all", "compile:cjs": "yarn compile:prepare && yarn workspace @fern-api/compile-root run compile:cjs", "compile:esm": "yarn compile:prepare && yarn workspace @fern-api/compile-root run compile:esm", "compile:prepare": "ts-node scripts/checkRootPackage.ts --fix", - "test": "yarn compile && jest --passWithNoTests", + "test": "yarn compile:all && jest --passWithNoTests", "test:ete": "yarn workspace @fern-api/cli dist && yarn workspace fern-typescript dockerTagLocal && yarn workspace @fern-api/ete-tests test", "lint:eslint": "eslint --max-warnings 0 .", "lint:eslint:fix": "yarn lint:eslint --fix", @@ -61,12 +61,13 @@ "jest": "^28.1.2", "lint-staged": "^12.3.7", "lodash": "^4.17.21", - "mrlint": "^0.0.46", + "mrlint": "^0.0.50", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", "stylelint": "^14.9.1", "stylelint-config-prettier-scss": "^0.0.1", "stylelint-config-standard-scss": "^4.0.0", + "ts-jest": "^28.0.5", "ts-node": "^10.8.0", "typescript": "^4.6.4" }, diff --git a/packages/_root/.depcheckrc.json b/packages/_root/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/_root/.depcheckrc.json +++ b/packages/_root/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/_root/package.json b/packages/_root/package.json index ab8eaccb864..c03ecf2602c 100644 --- a/packages/_root/package.json +++ b/packages/_root/package.json @@ -12,8 +12,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -22,12 +22,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -78,6 +78,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/_root/tsconfig.cjs.json b/packages/_root/tsconfig.cjs.json new file mode 100644 index 00000000000..e68b26ac4e0 --- /dev/null +++ b/packages/_root/tsconfig.cjs.json @@ -0,0 +1,38 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../add-generator/tsconfig.cjs.json" }, + { "path": "../cli/tsconfig.cjs.json" }, + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../compiler/commons/tsconfig.cjs.json" }, + { "path": "../compiler/compiler/tsconfig.cjs.json" }, + { "path": "../compiler/ir-generation/tsconfig.cjs.json" }, + { "path": "../compiler/syntax-analysis/tsconfig.cjs.json" }, + { "path": "../ete-tests/tsconfig.cjs.json" }, + { "path": "../fern-typescript/cli/tsconfig.cjs.json" }, + { "path": "../fern-typescript/client/tsconfig.cjs.json" }, + { "path": "../fern-typescript/commons/tsconfig.cjs.json" }, + { "path": "../fern-typescript/encoders/tsconfig.cjs.json" }, + { "path": "../fern-typescript/errors/tsconfig.cjs.json" }, + { "path": "../fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.cjs.json" }, + { "path": "../fern-typescript/helpers/helper-manager/tsconfig.cjs.json" }, + { "path": "../fern-typescript/helpers/utils/tsconfig.cjs.json" }, + { "path": "../fern-typescript/model/tsconfig.cjs.json" }, + { "path": "../fern-typescript/model-context/tsconfig.cjs.json" }, + { "path": "../fern-typescript/server/tsconfig.cjs.json" }, + { "path": "../fern-typescript/service-types/tsconfig.cjs.json" }, + { "path": "../fern-typescript/service-utils/tsconfig.cjs.json" }, + { "path": "../fern-typescript/testing-utils/tsconfig.cjs.json" }, + { "path": "../fern-typescript/types/tsconfig.cjs.json" }, + { "path": "../init/tsconfig.cjs.json" }, + { "path": "../local-generation/docker-utils/tsconfig.cjs.json" }, + { "path": "../local-generation/local-workspace-runner/tsconfig.cjs.json" }, + { "path": "../login/tsconfig.cjs.json" }, + { "path": "../openapi-converter/tsconfig.cjs.json" }, + { "path": "../remote-generation/remote-workspace-runner/tsconfig.cjs.json" }, + { "path": "../ui/app/tsconfig.cjs.json" }, + { "path": "../ui/fe-bundle/tsconfig.cjs.json" } + ] +} diff --git a/packages/_root/tsconfig.esm.json b/packages/_root/tsconfig.esm.json deleted file mode 100644 index 2c91a5fc7e4..00000000000 --- a/packages/_root/tsconfig.esm.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../add-generator/tsconfig.esm.json" }, - { "path": "../cli/tsconfig.esm.json" }, - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../compiler/commons/tsconfig.esm.json" }, - { "path": "../compiler/compiler/tsconfig.esm.json" }, - { "path": "../compiler/ir-generation/tsconfig.esm.json" }, - { "path": "../compiler/syntax-analysis/tsconfig.esm.json" }, - { "path": "../ete-tests/tsconfig.esm.json" }, - { "path": "../fern-typescript/cli/tsconfig.esm.json" }, - { "path": "../fern-typescript/client/tsconfig.esm.json" }, - { "path": "../fern-typescript/commons/tsconfig.esm.json" }, - { "path": "../fern-typescript/encoders/tsconfig.esm.json" }, - { "path": "../fern-typescript/errors/tsconfig.esm.json" }, - { "path": "../fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.esm.json" }, - { "path": "../fern-typescript/helpers/helper-manager/tsconfig.esm.json" }, - { "path": "../fern-typescript/helpers/utils/tsconfig.esm.json" }, - { "path": "../fern-typescript/model/tsconfig.esm.json" }, - { "path": "../fern-typescript/model-context/tsconfig.esm.json" }, - { "path": "../fern-typescript/server/tsconfig.esm.json" }, - { "path": "../fern-typescript/service-types/tsconfig.esm.json" }, - { "path": "../fern-typescript/service-utils/tsconfig.esm.json" }, - { "path": "../fern-typescript/testing-utils/tsconfig.esm.json" }, - { "path": "../fern-typescript/types/tsconfig.esm.json" }, - { "path": "../init/tsconfig.esm.json" }, - { "path": "../local-generation/docker-utils/tsconfig.esm.json" }, - { "path": "../local-generation/local-workspace-runner/tsconfig.esm.json" }, - { "path": "../login/tsconfig.esm.json" }, - { "path": "../openapi-converter/tsconfig.esm.json" }, - { "path": "../remote-generation/remote-workspace-runner/tsconfig.esm.json" }, - { "path": "../ui/app/tsconfig.esm.json" }, - { "path": "../ui/fe-bundle/tsconfig.esm.json" } - ] -} diff --git a/packages/_root/tsconfig.json b/packages/_root/tsconfig.json index 8cf81d54bc6..7cdb3388c5f 100644 --- a/packages/_root/tsconfig.json +++ b/packages/_root/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../add-generator/tsconfig.json" }, diff --git a/packages/add-generator/.depcheckrc.json b/packages/add-generator/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/add-generator/.depcheckrc.json +++ b/packages/add-generator/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/add-generator/package.json b/packages/add-generator/package.json index 23555ea908b..8b8968b6b18 100644 --- a/packages/add-generator/package.json +++ b/packages/add-generator/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -47,6 +47,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/add-generator/tsconfig.cjs.json b/packages/add-generator/tsconfig.cjs.json new file mode 100644 index 00000000000..d1bf1acaebb --- /dev/null +++ b/packages/add-generator/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../commons/tsconfig.cjs.json" }] +} diff --git a/packages/add-generator/tsconfig.esm.json b/packages/add-generator/tsconfig.esm.json deleted file mode 100644 index 7403c3785df..00000000000 --- a/packages/add-generator/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../commons/tsconfig.esm.json" }] -} diff --git a/packages/add-generator/tsconfig.json b/packages/add-generator/tsconfig.json index fbf0c771d94..63f102b38e0 100644 --- a/packages/add-generator/tsconfig.json +++ b/packages/add-generator/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../commons/tsconfig.json" }] } diff --git a/packages/cli/.depcheckrc.json b/packages/cli/.depcheckrc.json index d76474fe86a..0b913f0cf1d 100644 --- a/packages/cli/.depcheckrc.json +++ b/packages/cli/.depcheckrc.json @@ -1,4 +1,4 @@ { - "ignores": ["@types/jest", "@types/node", "webpack-cli", "ts-loader", "node-loader", "ts-node"], + "ignores": ["@types/jest", "@types/node", "ts-jest", "webpack-cli", "ts-loader", "node-loader", "ts-node"], "ignore-patterns": ["lib", "webpack/dist/bundle.js"] } diff --git a/packages/cli/package.json b/packages/cli/package.json index 94f75651748..d9ed3caa195 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -24,12 +24,12 @@ "fern": "./cli" }, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -73,6 +73,7 @@ "node-loader": "^2.0.0", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "ts-loader": "^9.3.1", "ts-node": "^10.8.1", "typescript": "^4.6.4", diff --git a/packages/cli/tsconfig.cjs.json b/packages/cli/tsconfig.cjs.json new file mode 100644 index 00000000000..b32db5a0168 --- /dev/null +++ b/packages/cli/tsconfig.cjs.json @@ -0,0 +1,17 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../add-generator/tsconfig.cjs.json" }, + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../compiler/commons/tsconfig.cjs.json" }, + { "path": "../compiler/compiler/tsconfig.cjs.json" }, + { "path": "../compiler/syntax-analysis/tsconfig.cjs.json" }, + { "path": "../init/tsconfig.cjs.json" }, + { "path": "../local-generation/local-workspace-runner/tsconfig.cjs.json" }, + { "path": "../login/tsconfig.cjs.json" }, + { "path": "../openapi-converter/tsconfig.cjs.json" }, + { "path": "../remote-generation/remote-workspace-runner/tsconfig.cjs.json" } + ] +} diff --git a/packages/cli/tsconfig.esm.json b/packages/cli/tsconfig.esm.json deleted file mode 100644 index 8babb15d096..00000000000 --- a/packages/cli/tsconfig.esm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../add-generator/tsconfig.esm.json" }, - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../compiler/commons/tsconfig.esm.json" }, - { "path": "../compiler/compiler/tsconfig.esm.json" }, - { "path": "../compiler/syntax-analysis/tsconfig.esm.json" }, - { "path": "../init/tsconfig.esm.json" }, - { "path": "../local-generation/local-workspace-runner/tsconfig.esm.json" }, - { "path": "../login/tsconfig.esm.json" }, - { "path": "../openapi-converter/tsconfig.esm.json" }, - { "path": "../remote-generation/remote-workspace-runner/tsconfig.esm.json" } - ] -} diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 73467956f77..01f3c9eba7f 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../add-generator/tsconfig.json" }, diff --git a/packages/cli/webpack/bundle.sh b/packages/cli/webpack/bundle.sh index 7025156c708..774421fbcbb 100755 --- a/packages/cli/webpack/bundle.sh +++ b/packages/cli/webpack/bundle.sh @@ -15,9 +15,7 @@ cd $(cd -P -- "$(dirname -- "$0")" && pwd -P) # remove existing dist /bin/rm -rf "$dist_dir" -# compile ESM so we can tree-shake -# compile CJS so we have the most up-to-date .d.ts declarations -yarn run --top-level compile:all +yarn run --top-level compile # webpack package_version=$(yarn info @fern-api/cli --all --json | jq -r .children.Version) diff --git a/packages/cli/webpack/webpack.config.ts b/packages/cli/webpack/webpack.config.ts index d676ab8af17..c677a332e93 100644 --- a/packages/cli/webpack/webpack.config.ts +++ b/packages/cli/webpack/webpack.config.ts @@ -24,7 +24,8 @@ export default (): webpack.Configuration => { loader: "ts-loader", options: { projectReferences: true, - configFile: "tsconfig.esm.json", + // esm config + configFile: "tsconfig.json", }, exclude: /node_modules/, }, diff --git a/packages/commons/.depcheckrc.json b/packages/commons/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/commons/.depcheckrc.json +++ b/packages/commons/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/commons/package.json b/packages/commons/package.json index 873e8ca7d8c..4fcddd1d0af 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -50,6 +50,7 @@ "eslint": "^8.12.0", "jest": "^28.1.1", "npm-run-all": "^4.1.5", - "prettier": "^2.6.2" + "prettier": "^2.6.2", + "ts-jest": "^28.0.5" } } diff --git a/packages/commons/tsconfig.cjs.json b/packages/commons/tsconfig.cjs.json new file mode 100644 index 00000000000..512452605eb --- /dev/null +++ b/packages/commons/tsconfig.cjs.json @@ -0,0 +1,5 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"] +} diff --git a/packages/commons/tsconfig.esm.json b/packages/commons/tsconfig.esm.json deleted file mode 100644 index f2f7ee6847a..00000000000 --- a/packages/commons/tsconfig.esm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"] -} diff --git a/packages/commons/tsconfig.json b/packages/commons/tsconfig.json index 512452605eb..f2f7ee6847a 100644 --- a/packages/commons/tsconfig.json +++ b/packages/commons/tsconfig.json @@ -1,5 +1,5 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"] } diff --git a/packages/compiler/commons/.depcheckrc.json b/packages/compiler/commons/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/compiler/commons/.depcheckrc.json +++ b/packages/compiler/commons/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/compiler/commons/package.json b/packages/compiler/commons/package.json index 4af6210fa90..7c61bc917e6 100644 --- a/packages/compiler/commons/package.json +++ b/packages/compiler/commons/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -44,6 +44,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/compiler/commons/tsconfig.cjs.json b/packages/compiler/commons/tsconfig.cjs.json new file mode 100644 index 00000000000..6ef2c755765 --- /dev/null +++ b/packages/compiler/commons/tsconfig.cjs.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"] +} diff --git a/packages/compiler/commons/tsconfig.esm.json b/packages/compiler/commons/tsconfig.esm.json deleted file mode 100644 index 2882cc71406..00000000000 --- a/packages/compiler/commons/tsconfig.esm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"] -} diff --git a/packages/compiler/commons/tsconfig.json b/packages/compiler/commons/tsconfig.json index 6ef2c755765..2882cc71406 100644 --- a/packages/compiler/commons/tsconfig.json +++ b/packages/compiler/commons/tsconfig.json @@ -1,5 +1,5 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"] } diff --git a/packages/compiler/compiler/.depcheckrc.json b/packages/compiler/compiler/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/compiler/compiler/.depcheckrc.json +++ b/packages/compiler/compiler/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/compiler/compiler/package.json b/packages/compiler/compiler/package.json index a133afa0283..03c68a4360a 100644 --- a/packages/compiler/compiler/package.json +++ b/packages/compiler/compiler/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -50,6 +50,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/compiler/compiler/tsconfig.cjs.json b/packages/compiler/compiler/tsconfig.cjs.json new file mode 100644 index 00000000000..468220ecd54 --- /dev/null +++ b/packages/compiler/compiler/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../ir-generation/tsconfig.cjs.json" }, + { "path": "../syntax-analysis/tsconfig.cjs.json" } + ] +} diff --git a/packages/compiler/compiler/tsconfig.esm.json b/packages/compiler/compiler/tsconfig.esm.json deleted file mode 100644 index ad888a8924d..00000000000 --- a/packages/compiler/compiler/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../ir-generation/tsconfig.esm.json" }, - { "path": "../syntax-analysis/tsconfig.esm.json" } - ] -} diff --git a/packages/compiler/compiler/tsconfig.json b/packages/compiler/compiler/tsconfig.json index 5292cf2fba3..b564d7f1cca 100644 --- a/packages/compiler/compiler/tsconfig.json +++ b/packages/compiler/compiler/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../commons/tsconfig.json" }, diff --git a/packages/compiler/ir-generation/.depcheckrc.json b/packages/compiler/ir-generation/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/compiler/ir-generation/.depcheckrc.json +++ b/packages/compiler/ir-generation/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/compiler/ir-generation/package.json b/packages/compiler/ir-generation/package.json index 22bedd51bd8..8da8abfdb7c 100644 --- a/packages/compiler/ir-generation/package.json +++ b/packages/compiler/ir-generation/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -52,6 +52,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/compiler/ir-generation/tsconfig.cjs.json b/packages/compiler/ir-generation/tsconfig.cjs.json new file mode 100644 index 00000000000..49b8ca0171b --- /dev/null +++ b/packages/compiler/ir-generation/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../../commons/tsconfig.cjs.json" }, + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../syntax-analysis/tsconfig.cjs.json" } + ] +} diff --git a/packages/compiler/ir-generation/tsconfig.esm.json b/packages/compiler/ir-generation/tsconfig.esm.json deleted file mode 100644 index cb67bf8c1d2..00000000000 --- a/packages/compiler/ir-generation/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../../commons/tsconfig.esm.json" }, - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../syntax-analysis/tsconfig.esm.json" } - ] -} diff --git a/packages/compiler/ir-generation/tsconfig.json b/packages/compiler/ir-generation/tsconfig.json index 2541a0fad2e..47a6f5521d1 100644 --- a/packages/compiler/ir-generation/tsconfig.json +++ b/packages/compiler/ir-generation/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../../commons/tsconfig.json" }, diff --git a/packages/compiler/syntax-analysis/.depcheckrc.json b/packages/compiler/syntax-analysis/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/compiler/syntax-analysis/.depcheckrc.json +++ b/packages/compiler/syntax-analysis/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/compiler/syntax-analysis/package.json b/packages/compiler/syntax-analysis/package.json index 6a4056484d9..a50e89b9d98 100644 --- a/packages/compiler/syntax-analysis/package.json +++ b/packages/compiler/syntax-analysis/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -50,6 +50,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/compiler/syntax-analysis/tsconfig.cjs.json b/packages/compiler/syntax-analysis/tsconfig.cjs.json new file mode 100644 index 00000000000..aac02275e18 --- /dev/null +++ b/packages/compiler/syntax-analysis/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../commons/tsconfig.cjs.json" }] +} diff --git a/packages/compiler/syntax-analysis/tsconfig.esm.json b/packages/compiler/syntax-analysis/tsconfig.esm.json deleted file mode 100644 index 2e5e9f879a0..00000000000 --- a/packages/compiler/syntax-analysis/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../commons/tsconfig.esm.json" }] -} diff --git a/packages/compiler/syntax-analysis/tsconfig.json b/packages/compiler/syntax-analysis/tsconfig.json index 9b893ca9fdc..84f84f66b12 100644 --- a/packages/compiler/syntax-analysis/tsconfig.json +++ b/packages/compiler/syntax-analysis/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../commons/tsconfig.json" }] } diff --git a/packages/ete-tests/.depcheckrc.json b/packages/ete-tests/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/ete-tests/.depcheckrc.json +++ b/packages/ete-tests/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/ete-tests/package.json b/packages/ete-tests/package.json index 7b99112165c..915fd5c1e05 100644 --- a/packages/ete-tests/package.json +++ b/packages/ete-tests/package.json @@ -12,8 +12,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -22,12 +22,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -50,6 +50,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/ete-tests/tsconfig.cjs.json b/packages/ete-tests/tsconfig.cjs.json new file mode 100644 index 00000000000..4149d58c44b --- /dev/null +++ b/packages/ete-tests/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "exclude": ["./src/**/__test__/**/generated"], + "references": [ + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../fern-typescript/testing-utils/tsconfig.cjs.json" } + ] +} diff --git a/packages/ete-tests/tsconfig.esm.json b/packages/ete-tests/tsconfig.esm.json deleted file mode 100644 index 8fbfda6ee24..00000000000 --- a/packages/ete-tests/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "exclude": ["./src/**/__test__/**/generated"], - "references": [ - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../fern-typescript/testing-utils/tsconfig.esm.json" } - ] -} diff --git a/packages/ete-tests/tsconfig.json b/packages/ete-tests/tsconfig.json index 02c81480d7c..36daaddb7f8 100644 --- a/packages/ete-tests/tsconfig.json +++ b/packages/ete-tests/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [{ "path": "../commons/tsconfig.json" }, { "path": "../fern-typescript/testing-utils/tsconfig.json" }] diff --git a/packages/fern-typescript/cli/.depcheckrc.json b/packages/fern-typescript/cli/.depcheckrc.json index 4fae8f15cbf..fe603012c60 100644 --- a/packages/fern-typescript/cli/.depcheckrc.json +++ b/packages/fern-typescript/cli/.depcheckrc.json @@ -2,6 +2,7 @@ "ignores": [ "@types/jest", "@types/node", + "ts-jest", "webpack-cli", "umd-compat-loader", "@ts-morph/common", diff --git a/packages/fern-typescript/cli/docker/create_docker.sh b/packages/fern-typescript/cli/docker/create_docker.sh index 5b540308e31..3ec29341df0 100755 --- a/packages/fern-typescript/cli/docker/create_docker.sh +++ b/packages/fern-typescript/cli/docker/create_docker.sh @@ -9,9 +9,7 @@ DOCKER_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && WEBPACK_CONFIG="$DOCKER_DIR/webpack.config.ts" WEBPACK_TS_CONFIG="$DOCKER_DIR/tsconfig.webpack.json" -# compile ESM so we can tree-shaking -# compile CJS so we have the most up-to-date .d.ts declarations -yarn run --top-level compile:all +yarn run compile webpack_mode="production" if [[ "$TAG" == "local" ]]; then diff --git a/packages/fern-typescript/cli/docker/webpack.config.ts b/packages/fern-typescript/cli/docker/webpack.config.ts index c1750f01cdb..a7d6ed74973 100644 --- a/packages/fern-typescript/cli/docker/webpack.config.ts +++ b/packages/fern-typescript/cli/docker/webpack.config.ts @@ -20,7 +20,8 @@ export default (_env: unknown, { mode = "production" }: webpack.WebpackOptionsNo loader: "ts-loader", options: { projectReferences: true, - configFile: "tsconfig.esm.json", + // esm config + configFile: "tsconfig.json", }, exclude: /node_modules/, }, diff --git a/packages/fern-typescript/cli/package.json b/packages/fern-typescript/cli/package.json index c65b4108aa6..eba3ebea320 100644 --- a/packages/fern-typescript/cli/package.json +++ b/packages/fern-typescript/cli/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -22,12 +22,12 @@ "sideEffects": false, "bin": "./cli", "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -64,6 +64,7 @@ "npm-run-all": "^4.1.5", "prettier": "^2.6.2", "simple-progress-webpack-plugin": "^2.0.0", + "ts-jest": "^28.0.5", "ts-loader": "^9.3.1", "ts-node": "^10.8.1", "typescript": "^4.6.4", diff --git a/packages/fern-typescript/cli/tsconfig.cjs.json b/packages/fern-typescript/cli/tsconfig.cjs.json new file mode 100644 index 00000000000..bd17ecd8666 --- /dev/null +++ b/packages/fern-typescript/cli/tsconfig.cjs.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "exclude": ["./src/**/__test__/**/generated"], + "references": [ + { "path": "../../cli/tsconfig.cjs.json" }, + { "path": "../../commons/tsconfig.cjs.json" }, + { "path": "../../compiler/compiler/tsconfig.cjs.json" }, + { "path": "../client/tsconfig.cjs.json" }, + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../helpers/helper-manager/tsconfig.cjs.json" }, + { "path": "../model/tsconfig.cjs.json" }, + { "path": "../server/tsconfig.cjs.json" }, + { "path": "../testing-utils/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/cli/tsconfig.esm.json b/packages/fern-typescript/cli/tsconfig.esm.json deleted file mode 100644 index 41076f80c36..00000000000 --- a/packages/fern-typescript/cli/tsconfig.esm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "exclude": ["./src/**/__test__/**/generated"], - "references": [ - { "path": "../../cli/tsconfig.esm.json" }, - { "path": "../../commons/tsconfig.esm.json" }, - { "path": "../../compiler/compiler/tsconfig.esm.json" }, - { "path": "../client/tsconfig.esm.json" }, - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../helpers/helper-manager/tsconfig.esm.json" }, - { "path": "../model/tsconfig.esm.json" }, - { "path": "../server/tsconfig.esm.json" }, - { "path": "../testing-utils/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/cli/tsconfig.json b/packages/fern-typescript/cli/tsconfig.json index 5940b45627d..43bf87b4cf4 100644 --- a/packages/fern-typescript/cli/tsconfig.json +++ b/packages/fern-typescript/cli/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [ diff --git a/packages/fern-typescript/client/.depcheckrc.json b/packages/fern-typescript/client/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/client/.depcheckrc.json +++ b/packages/fern-typescript/client/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/client/package.json b/packages/fern-typescript/client/package.json index 0456a67195e..4233e24b113 100644 --- a/packages/fern-typescript/client/package.json +++ b/packages/fern-typescript/client/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -58,6 +58,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/client/tsconfig.cjs.json b/packages/fern-typescript/client/tsconfig.cjs.json new file mode 100644 index 00000000000..7441299153f --- /dev/null +++ b/packages/fern-typescript/client/tsconfig.cjs.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "exclude": ["./src/**/__test__/**/generated"], + "references": [ + { "path": "../../commons/tsconfig.cjs.json" }, + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../encoders/tsconfig.cjs.json" }, + { "path": "../helpers/helper-manager/tsconfig.cjs.json" }, + { "path": "../helpers/utils/tsconfig.cjs.json" }, + { "path": "../model/tsconfig.cjs.json" }, + { "path": "../model-context/tsconfig.cjs.json" }, + { "path": "../service-types/tsconfig.cjs.json" }, + { "path": "../testing-utils/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/client/tsconfig.esm.json b/packages/fern-typescript/client/tsconfig.esm.json deleted file mode 100644 index 2ed8e02e354..00000000000 --- a/packages/fern-typescript/client/tsconfig.esm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "exclude": ["./src/**/__test__/**/generated"], - "references": [ - { "path": "../../commons/tsconfig.esm.json" }, - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../encoders/tsconfig.esm.json" }, - { "path": "../helpers/helper-manager/tsconfig.esm.json" }, - { "path": "../helpers/utils/tsconfig.esm.json" }, - { "path": "../model/tsconfig.esm.json" }, - { "path": "../model-context/tsconfig.esm.json" }, - { "path": "../service-types/tsconfig.esm.json" }, - { "path": "../testing-utils/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/client/tsconfig.json b/packages/fern-typescript/client/tsconfig.json index 6c8e8ca229a..b9b4f6d98c1 100644 --- a/packages/fern-typescript/client/tsconfig.json +++ b/packages/fern-typescript/client/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [ diff --git a/packages/fern-typescript/commons/.depcheckrc.json b/packages/fern-typescript/commons/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/commons/.depcheckrc.json +++ b/packages/fern-typescript/commons/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/commons/package.json b/packages/fern-typescript/commons/package.json index 15d1892753b..a4871b6ed6f 100644 --- a/packages/fern-typescript/commons/package.json +++ b/packages/fern-typescript/commons/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -56,6 +56,7 @@ "memfs": "^3.4.1", "npm-run-all": "^4.1.5", "package-json-type": "^1.0.3", - "prettier": "^2.6.2" + "prettier": "^2.6.2", + "ts-jest": "^28.0.5" } } diff --git a/packages/fern-typescript/commons/tsconfig.cjs.json b/packages/fern-typescript/commons/tsconfig.cjs.json new file mode 100644 index 00000000000..4202a452017 --- /dev/null +++ b/packages/fern-typescript/commons/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../../commons/tsconfig.cjs.json" }] +} diff --git a/packages/fern-typescript/commons/tsconfig.esm.json b/packages/fern-typescript/commons/tsconfig.esm.json deleted file mode 100644 index 07ed7431722..00000000000 --- a/packages/fern-typescript/commons/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../../commons/tsconfig.esm.json" }] -} diff --git a/packages/fern-typescript/commons/tsconfig.json b/packages/fern-typescript/commons/tsconfig.json index 0ab4057e94a..0bbb913c08b 100644 --- a/packages/fern-typescript/commons/tsconfig.json +++ b/packages/fern-typescript/commons/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../../commons/tsconfig.json" }] } diff --git a/packages/fern-typescript/encoders/.depcheckrc.json b/packages/fern-typescript/encoders/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/encoders/.depcheckrc.json +++ b/packages/fern-typescript/encoders/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/encoders/package.json b/packages/fern-typescript/encoders/package.json index 644aaa37833..2860bed15e3 100644 --- a/packages/fern-typescript/encoders/package.json +++ b/packages/fern-typescript/encoders/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -50,6 +50,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/encoders/tsconfig.cjs.json b/packages/fern-typescript/encoders/tsconfig.cjs.json new file mode 100644 index 00000000000..cb31d422525 --- /dev/null +++ b/packages/fern-typescript/encoders/tsconfig.cjs.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../helpers/helper-manager/tsconfig.cjs.json" }, + { "path": "../model-context/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/encoders/tsconfig.esm.json b/packages/fern-typescript/encoders/tsconfig.esm.json deleted file mode 100644 index dae9edd826a..00000000000 --- a/packages/fern-typescript/encoders/tsconfig.esm.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../helpers/helper-manager/tsconfig.esm.json" }, - { "path": "../model-context/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/encoders/tsconfig.json b/packages/fern-typescript/encoders/tsconfig.json index 625374c647d..cdb97ade58d 100644 --- a/packages/fern-typescript/encoders/tsconfig.json +++ b/packages/fern-typescript/encoders/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../helpers/helper-manager/tsconfig.json" }, { "path": "../model-context/tsconfig.json" }] } diff --git a/packages/fern-typescript/errors/.depcheckrc.json b/packages/fern-typescript/errors/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/errors/.depcheckrc.json +++ b/packages/fern-typescript/errors/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/errors/package.json b/packages/fern-typescript/errors/package.json index c6a234b1f0e..814b67734ec 100644 --- a/packages/fern-typescript/errors/package.json +++ b/packages/fern-typescript/errors/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -49,6 +49,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/errors/tsconfig.cjs.json b/packages/fern-typescript/errors/tsconfig.cjs.json new file mode 100644 index 00000000000..515232caf08 --- /dev/null +++ b/packages/fern-typescript/errors/tsconfig.cjs.json @@ -0,0 +1,7 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "exclude": ["./src/**/__test__/**/generated"], + "references": [{ "path": "../model-context/tsconfig.cjs.json" }, { "path": "../types/tsconfig.cjs.json" }] +} diff --git a/packages/fern-typescript/errors/tsconfig.esm.json b/packages/fern-typescript/errors/tsconfig.esm.json deleted file mode 100644 index 7aa823ed187..00000000000 --- a/packages/fern-typescript/errors/tsconfig.esm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "exclude": ["./src/**/__test__/**/generated"], - "references": [{ "path": "../model-context/tsconfig.esm.json" }, { "path": "../types/tsconfig.esm.json" }] -} diff --git a/packages/fern-typescript/errors/tsconfig.json b/packages/fern-typescript/errors/tsconfig.json index 456f7fb0577..d714fa61f54 100644 --- a/packages/fern-typescript/errors/tsconfig.json +++ b/packages/fern-typescript/errors/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [{ "path": "../model-context/tsconfig.json" }, { "path": "../types/tsconfig.json" }] diff --git a/packages/fern-typescript/helpers/built-in/json-encoding-helper/.depcheckrc.json b/packages/fern-typescript/helpers/built-in/json-encoding-helper/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/helpers/built-in/json-encoding-helper/.depcheckrc.json +++ b/packages/fern-typescript/helpers/built-in/json-encoding-helper/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/helpers/built-in/json-encoding-helper/package.json b/packages/fern-typescript/helpers/built-in/json-encoding-helper/package.json index fcd019edf7a..1d20d396f91 100644 --- a/packages/fern-typescript/helpers/built-in/json-encoding-helper/package.json +++ b/packages/fern-typescript/helpers/built-in/json-encoding-helper/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../../../shared/.prettierignore \"**\"", @@ -47,6 +47,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.cjs.json b/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.cjs.json new file mode 100644 index 00000000000..a102582e3b6 --- /dev/null +++ b/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../../utils/tsconfig.cjs.json" }] +} diff --git a/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.esm.json b/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.esm.json deleted file mode 100644 index 6afa0148ad2..00000000000 --- a/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../../utils/tsconfig.esm.json" }] -} diff --git a/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.json b/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.json index 559b2daf7ab..8a4b98c6465 100644 --- a/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.json +++ b/packages/fern-typescript/helpers/built-in/json-encoding-helper/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../../utils/tsconfig.json" }] } diff --git a/packages/fern-typescript/helpers/helper-manager/.depcheckrc.json b/packages/fern-typescript/helpers/helper-manager/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/helpers/helper-manager/.depcheckrc.json +++ b/packages/fern-typescript/helpers/helper-manager/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/helpers/helper-manager/package.json b/packages/fern-typescript/helpers/helper-manager/package.json index 13323f3f36a..ea5619a612b 100644 --- a/packages/fern-typescript/helpers/helper-manager/package.json +++ b/packages/fern-typescript/helpers/helper-manager/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../../shared/.prettierignore \"**\"", @@ -51,6 +51,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/helpers/helper-manager/tsconfig.cjs.json b/packages/fern-typescript/helpers/helper-manager/tsconfig.cjs.json new file mode 100644 index 00000000000..7817b710c4a --- /dev/null +++ b/packages/fern-typescript/helpers/helper-manager/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../../../commons/tsconfig.cjs.json" }, + { "path": "../built-in/json-encoding-helper/tsconfig.cjs.json" }, + { "path": "../utils/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/helpers/helper-manager/tsconfig.esm.json b/packages/fern-typescript/helpers/helper-manager/tsconfig.esm.json deleted file mode 100644 index fadece3243e..00000000000 --- a/packages/fern-typescript/helpers/helper-manager/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../../../commons/tsconfig.esm.json" }, - { "path": "../built-in/json-encoding-helper/tsconfig.esm.json" }, - { "path": "../utils/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/helpers/helper-manager/tsconfig.json b/packages/fern-typescript/helpers/helper-manager/tsconfig.json index 1f8ab3c6e87..182bdfd397b 100644 --- a/packages/fern-typescript/helpers/helper-manager/tsconfig.json +++ b/packages/fern-typescript/helpers/helper-manager/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../../../commons/tsconfig.json" }, diff --git a/packages/fern-typescript/helpers/utils/.depcheckrc.json b/packages/fern-typescript/helpers/utils/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/helpers/utils/.depcheckrc.json +++ b/packages/fern-typescript/helpers/utils/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/helpers/utils/package.json b/packages/fern-typescript/helpers/utils/package.json index 88aa52b15f5..c3431056dc7 100644 --- a/packages/fern-typescript/helpers/utils/package.json +++ b/packages/fern-typescript/helpers/utils/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../../shared/.prettierignore \"**\"", @@ -49,6 +49,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/helpers/utils/tsconfig.cjs.json b/packages/fern-typescript/helpers/utils/tsconfig.cjs.json new file mode 100644 index 00000000000..bfc1bdc5eec --- /dev/null +++ b/packages/fern-typescript/helpers/utils/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../../model-context/tsconfig.cjs.json" }] +} diff --git a/packages/fern-typescript/helpers/utils/tsconfig.esm.json b/packages/fern-typescript/helpers/utils/tsconfig.esm.json deleted file mode 100644 index c120a6370c1..00000000000 --- a/packages/fern-typescript/helpers/utils/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../../model-context/tsconfig.esm.json" }] -} diff --git a/packages/fern-typescript/helpers/utils/tsconfig.json b/packages/fern-typescript/helpers/utils/tsconfig.json index 97f74474ecc..e1c81dd05c8 100644 --- a/packages/fern-typescript/helpers/utils/tsconfig.json +++ b/packages/fern-typescript/helpers/utils/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../../model-context/tsconfig.json" }] } diff --git a/packages/fern-typescript/model-context/.depcheckrc.json b/packages/fern-typescript/model-context/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/model-context/.depcheckrc.json +++ b/packages/fern-typescript/model-context/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/model-context/package.json b/packages/fern-typescript/model-context/package.json index 9ac9228702a..96457ceff4d 100644 --- a/packages/fern-typescript/model-context/package.json +++ b/packages/fern-typescript/model-context/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -50,6 +50,7 @@ "eslint": "^8.12.0", "jest": "^28.1.1", "npm-run-all": "^4.1.5", - "prettier": "^2.6.2" + "prettier": "^2.6.2", + "ts-jest": "^28.0.5" } } diff --git a/packages/fern-typescript/model-context/tsconfig.cjs.json b/packages/fern-typescript/model-context/tsconfig.cjs.json new file mode 100644 index 00000000000..b41ffc4e8fc --- /dev/null +++ b/packages/fern-typescript/model-context/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../../commons/tsconfig.cjs.json" }, { "path": "../commons/tsconfig.cjs.json" }] +} diff --git a/packages/fern-typescript/model-context/tsconfig.esm.json b/packages/fern-typescript/model-context/tsconfig.esm.json deleted file mode 100644 index 17093c552f6..00000000000 --- a/packages/fern-typescript/model-context/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../../commons/tsconfig.esm.json" }, { "path": "../commons/tsconfig.esm.json" }] -} diff --git a/packages/fern-typescript/model-context/tsconfig.json b/packages/fern-typescript/model-context/tsconfig.json index 3781bad0552..7471133e929 100644 --- a/packages/fern-typescript/model-context/tsconfig.json +++ b/packages/fern-typescript/model-context/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../../commons/tsconfig.json" }, { "path": "../commons/tsconfig.json" }] } diff --git a/packages/fern-typescript/model/.depcheckrc.json b/packages/fern-typescript/model/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/model/.depcheckrc.json +++ b/packages/fern-typescript/model/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/model/package.json b/packages/fern-typescript/model/package.json index 7aca4cb69a4..da66b0487fb 100644 --- a/packages/fern-typescript/model/package.json +++ b/packages/fern-typescript/model/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -55,6 +55,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/model/tsconfig.cjs.json b/packages/fern-typescript/model/tsconfig.cjs.json new file mode 100644 index 00000000000..d3ae572b9b7 --- /dev/null +++ b/packages/fern-typescript/model/tsconfig.cjs.json @@ -0,0 +1,14 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "exclude": ["./src/**/__test__/**/generated"], + "references": [ + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../errors/tsconfig.cjs.json" }, + { "path": "../model-context/tsconfig.cjs.json" }, + { "path": "../service-types/tsconfig.cjs.json" }, + { "path": "../testing-utils/tsconfig.cjs.json" }, + { "path": "../types/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/model/tsconfig.esm.json b/packages/fern-typescript/model/tsconfig.esm.json deleted file mode 100644 index 338be8cf18e..00000000000 --- a/packages/fern-typescript/model/tsconfig.esm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "exclude": ["./src/**/__test__/**/generated"], - "references": [ - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../errors/tsconfig.esm.json" }, - { "path": "../model-context/tsconfig.esm.json" }, - { "path": "../service-types/tsconfig.esm.json" }, - { "path": "../testing-utils/tsconfig.esm.json" }, - { "path": "../types/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/model/tsconfig.json b/packages/fern-typescript/model/tsconfig.json index e5aa08c79fa..92f76a40a6d 100644 --- a/packages/fern-typescript/model/tsconfig.json +++ b/packages/fern-typescript/model/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [ diff --git a/packages/fern-typescript/server/.depcheckrc.json b/packages/fern-typescript/server/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/server/.depcheckrc.json +++ b/packages/fern-typescript/server/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/server/package.json b/packages/fern-typescript/server/package.json index 0fe110e0945..8f14f6faf93 100644 --- a/packages/fern-typescript/server/package.json +++ b/packages/fern-typescript/server/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -57,6 +57,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/server/tsconfig.cjs.json b/packages/fern-typescript/server/tsconfig.cjs.json new file mode 100644 index 00000000000..915a5e2c3f0 --- /dev/null +++ b/packages/fern-typescript/server/tsconfig.cjs.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "exclude": ["./src/**/__test__/**/generated"], + "references": [ + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../encoders/tsconfig.cjs.json" }, + { "path": "../helpers/helper-manager/tsconfig.cjs.json" }, + { "path": "../model/tsconfig.cjs.json" }, + { "path": "../model-context/tsconfig.cjs.json" }, + { "path": "../service-types/tsconfig.cjs.json" }, + { "path": "../testing-utils/tsconfig.cjs.json" }, + { "path": "../types/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/server/tsconfig.esm.json b/packages/fern-typescript/server/tsconfig.esm.json deleted file mode 100644 index 0b5deb31478..00000000000 --- a/packages/fern-typescript/server/tsconfig.esm.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "exclude": ["./src/**/__test__/**/generated"], - "references": [ - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../encoders/tsconfig.esm.json" }, - { "path": "../helpers/helper-manager/tsconfig.esm.json" }, - { "path": "../model/tsconfig.esm.json" }, - { "path": "../model-context/tsconfig.esm.json" }, - { "path": "../service-types/tsconfig.esm.json" }, - { "path": "../testing-utils/tsconfig.esm.json" }, - { "path": "../types/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/server/tsconfig.json b/packages/fern-typescript/server/tsconfig.json index 4aa0a5e1e7f..f950456691d 100644 --- a/packages/fern-typescript/server/tsconfig.json +++ b/packages/fern-typescript/server/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [ diff --git a/packages/fern-typescript/service-types/.depcheckrc.json b/packages/fern-typescript/service-types/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/service-types/.depcheckrc.json +++ b/packages/fern-typescript/service-types/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/service-types/package.json b/packages/fern-typescript/service-types/package.json index 90b947a3f80..29ada574d15 100644 --- a/packages/fern-typescript/service-types/package.json +++ b/packages/fern-typescript/service-types/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -54,6 +54,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/service-types/tsconfig.cjs.json b/packages/fern-typescript/service-types/tsconfig.cjs.json new file mode 100644 index 00000000000..52d56bda6ee --- /dev/null +++ b/packages/fern-typescript/service-types/tsconfig.cjs.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../../commons/tsconfig.cjs.json" }, + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../model-context/tsconfig.cjs.json" }, + { "path": "../types/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/service-types/tsconfig.esm.json b/packages/fern-typescript/service-types/tsconfig.esm.json deleted file mode 100644 index 65e0e932937..00000000000 --- a/packages/fern-typescript/service-types/tsconfig.esm.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../../commons/tsconfig.esm.json" }, - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../model-context/tsconfig.esm.json" }, - { "path": "../types/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/service-types/tsconfig.json b/packages/fern-typescript/service-types/tsconfig.json index 790bf2bfd7b..bc945393b19 100644 --- a/packages/fern-typescript/service-types/tsconfig.json +++ b/packages/fern-typescript/service-types/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../../commons/tsconfig.json" }, diff --git a/packages/fern-typescript/service-utils/.depcheckrc.json b/packages/fern-typescript/service-utils/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/service-utils/.depcheckrc.json +++ b/packages/fern-typescript/service-utils/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/service-utils/package.json b/packages/fern-typescript/service-utils/package.json index c07e17bde6b..771b98a1976 100644 --- a/packages/fern-typescript/service-utils/package.json +++ b/packages/fern-typescript/service-utils/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -47,6 +47,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/service-utils/tsconfig.cjs.json b/packages/fern-typescript/service-utils/tsconfig.cjs.json new file mode 100644 index 00000000000..6ef2c755765 --- /dev/null +++ b/packages/fern-typescript/service-utils/tsconfig.cjs.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"] +} diff --git a/packages/fern-typescript/service-utils/tsconfig.esm.json b/packages/fern-typescript/service-utils/tsconfig.esm.json deleted file mode 100644 index 2882cc71406..00000000000 --- a/packages/fern-typescript/service-utils/tsconfig.esm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"] -} diff --git a/packages/fern-typescript/service-utils/tsconfig.json b/packages/fern-typescript/service-utils/tsconfig.json index 6ef2c755765..2882cc71406 100644 --- a/packages/fern-typescript/service-utils/tsconfig.json +++ b/packages/fern-typescript/service-utils/tsconfig.json @@ -1,5 +1,5 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"] } diff --git a/packages/fern-typescript/testing-utils/.depcheckrc.json b/packages/fern-typescript/testing-utils/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/testing-utils/.depcheckrc.json +++ b/packages/fern-typescript/testing-utils/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/testing-utils/package.json b/packages/fern-typescript/testing-utils/package.json index 08011ac571d..a2aaf4aaebb 100644 --- a/packages/fern-typescript/testing-utils/package.json +++ b/packages/fern-typescript/testing-utils/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -54,6 +54,7 @@ "eslint": "^8.12.0", "jest": "^28.1.1", "npm-run-all": "^4.1.5", - "prettier": "^2.6.2" + "prettier": "^2.6.2", + "ts-jest": "^28.0.5" } } diff --git a/packages/fern-typescript/testing-utils/tsconfig.cjs.json b/packages/fern-typescript/testing-utils/tsconfig.cjs.json new file mode 100644 index 00000000000..967e7ec4c62 --- /dev/null +++ b/packages/fern-typescript/testing-utils/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../../cli/tsconfig.cjs.json" }, + { "path": "../../compiler/compiler/tsconfig.cjs.json" }, + { "path": "../commons/tsconfig.cjs.json" } + ] +} diff --git a/packages/fern-typescript/testing-utils/tsconfig.esm.json b/packages/fern-typescript/testing-utils/tsconfig.esm.json deleted file mode 100644 index 8479cc1908b..00000000000 --- a/packages/fern-typescript/testing-utils/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../../cli/tsconfig.esm.json" }, - { "path": "../../compiler/compiler/tsconfig.esm.json" }, - { "path": "../commons/tsconfig.esm.json" } - ] -} diff --git a/packages/fern-typescript/testing-utils/tsconfig.json b/packages/fern-typescript/testing-utils/tsconfig.json index 07b861918ea..3ffed9dd874 100644 --- a/packages/fern-typescript/testing-utils/tsconfig.json +++ b/packages/fern-typescript/testing-utils/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../../cli/tsconfig.json" }, diff --git a/packages/fern-typescript/types/.depcheckrc.json b/packages/fern-typescript/types/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/fern-typescript/types/.depcheckrc.json +++ b/packages/fern-typescript/types/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/fern-typescript/types/package.json b/packages/fern-typescript/types/package.json index 76ffe928bf6..b59bbc66841 100644 --- a/packages/fern-typescript/types/package.json +++ b/packages/fern-typescript/types/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -52,6 +52,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/fern-typescript/types/tsconfig.cjs.json b/packages/fern-typescript/types/tsconfig.cjs.json new file mode 100644 index 00000000000..3f69e9949e8 --- /dev/null +++ b/packages/fern-typescript/types/tsconfig.cjs.json @@ -0,0 +1,7 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "exclude": ["./src/**/__test__/**/generated"], + "references": [{ "path": "../commons/tsconfig.cjs.json" }, { "path": "../model-context/tsconfig.cjs.json" }] +} diff --git a/packages/fern-typescript/types/tsconfig.esm.json b/packages/fern-typescript/types/tsconfig.esm.json deleted file mode 100644 index 569071af780..00000000000 --- a/packages/fern-typescript/types/tsconfig.esm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "exclude": ["./src/**/__test__/**/generated"], - "references": [{ "path": "../commons/tsconfig.esm.json" }, { "path": "../model-context/tsconfig.esm.json" }] -} diff --git a/packages/fern-typescript/types/tsconfig.json b/packages/fern-typescript/types/tsconfig.json index 1fea758bd02..ecdac3fbd27 100644 --- a/packages/fern-typescript/types/tsconfig.json +++ b/packages/fern-typescript/types/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [{ "path": "../commons/tsconfig.json" }, { "path": "../model-context/tsconfig.json" }] diff --git a/packages/init/.depcheckrc.json b/packages/init/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/init/.depcheckrc.json +++ b/packages/init/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/init/package.json b/packages/init/package.json index e0023c54c2c..2ca80a3c2f4 100644 --- a/packages/init/package.json +++ b/packages/init/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -50,6 +50,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/init/tsconfig.cjs.json b/packages/init/tsconfig.cjs.json new file mode 100644 index 00000000000..0fd04366a3f --- /dev/null +++ b/packages/init/tsconfig.cjs.json @@ -0,0 +1,9 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../commons/tsconfig.cjs.json" }, + { "path": "../compiler/syntax-analysis/tsconfig.cjs.json" } + ] +} diff --git a/packages/init/tsconfig.esm.json b/packages/init/tsconfig.esm.json deleted file mode 100644 index 8f32aceffb6..00000000000 --- a/packages/init/tsconfig.esm.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../commons/tsconfig.esm.json" }, - { "path": "../compiler/syntax-analysis/tsconfig.esm.json" } - ] -} diff --git a/packages/init/tsconfig.json b/packages/init/tsconfig.json index 122293d400c..4c12108836f 100644 --- a/packages/init/tsconfig.json +++ b/packages/init/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../commons/tsconfig.json" }, { "path": "../compiler/syntax-analysis/tsconfig.json" }] } diff --git a/packages/local-generation/docker-utils/.depcheckrc.json b/packages/local-generation/docker-utils/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/local-generation/docker-utils/.depcheckrc.json +++ b/packages/local-generation/docker-utils/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/local-generation/docker-utils/package.json b/packages/local-generation/docker-utils/package.json index 0ef85b2c135..ec38a7925ef 100644 --- a/packages/local-generation/docker-utils/package.json +++ b/packages/local-generation/docker-utils/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -48,6 +48,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/local-generation/docker-utils/tsconfig.cjs.json b/packages/local-generation/docker-utils/tsconfig.cjs.json new file mode 100644 index 00000000000..6ef2c755765 --- /dev/null +++ b/packages/local-generation/docker-utils/tsconfig.cjs.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"] +} diff --git a/packages/local-generation/docker-utils/tsconfig.esm.json b/packages/local-generation/docker-utils/tsconfig.esm.json deleted file mode 100644 index 2882cc71406..00000000000 --- a/packages/local-generation/docker-utils/tsconfig.esm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"] -} diff --git a/packages/local-generation/docker-utils/tsconfig.json b/packages/local-generation/docker-utils/tsconfig.json index 6ef2c755765..2882cc71406 100644 --- a/packages/local-generation/docker-utils/tsconfig.json +++ b/packages/local-generation/docker-utils/tsconfig.json @@ -1,5 +1,5 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"] } diff --git a/packages/local-generation/local-workspace-runner/.depcheckrc.json b/packages/local-generation/local-workspace-runner/.depcheckrc.json index 01dfa485499..d9603fea1c9 100644 --- a/packages/local-generation/local-workspace-runner/.depcheckrc.json +++ b/packages/local-generation/local-workspace-runner/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node", "@types/tmp"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest", "@types/tmp"], "ignore-patterns": ["lib"] } diff --git a/packages/local-generation/local-workspace-runner/package.json b/packages/local-generation/local-workspace-runner/package.json index 2b93816e484..6b673d33b36 100644 --- a/packages/local-generation/local-workspace-runner/package.json +++ b/packages/local-generation/local-workspace-runner/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -55,6 +55,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/local-generation/local-workspace-runner/tsconfig.cjs.json b/packages/local-generation/local-workspace-runner/tsconfig.cjs.json new file mode 100644 index 00000000000..8b25eba8071 --- /dev/null +++ b/packages/local-generation/local-workspace-runner/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [ + { "path": "../../commons/tsconfig.cjs.json" }, + { "path": "../../compiler/compiler/tsconfig.cjs.json" }, + { "path": "../docker-utils/tsconfig.cjs.json" } + ] +} diff --git a/packages/local-generation/local-workspace-runner/tsconfig.esm.json b/packages/local-generation/local-workspace-runner/tsconfig.esm.json deleted file mode 100644 index c33f2c5edb5..00000000000 --- a/packages/local-generation/local-workspace-runner/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [ - { "path": "../../commons/tsconfig.esm.json" }, - { "path": "../../compiler/compiler/tsconfig.esm.json" }, - { "path": "../docker-utils/tsconfig.esm.json" } - ] -} diff --git a/packages/local-generation/local-workspace-runner/tsconfig.json b/packages/local-generation/local-workspace-runner/tsconfig.json index f0ab6e88c05..b0e42d327a8 100644 --- a/packages/local-generation/local-workspace-runner/tsconfig.json +++ b/packages/local-generation/local-workspace-runner/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [ { "path": "../../commons/tsconfig.json" }, diff --git a/packages/login/.depcheckrc.json b/packages/login/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/login/.depcheckrc.json +++ b/packages/login/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/login/package.json b/packages/login/package.json index 70608fce049..e25711179d0 100644 --- a/packages/login/package.json +++ b/packages/login/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -48,6 +48,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/login/tsconfig.cjs.json b/packages/login/tsconfig.cjs.json new file mode 100644 index 00000000000..512452605eb --- /dev/null +++ b/packages/login/tsconfig.cjs.json @@ -0,0 +1,5 @@ +{ + "extends": "../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"] +} diff --git a/packages/login/tsconfig.esm.json b/packages/login/tsconfig.esm.json deleted file mode 100644 index f2f7ee6847a..00000000000 --- a/packages/login/tsconfig.esm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"] -} diff --git a/packages/login/tsconfig.json b/packages/login/tsconfig.json index 512452605eb..f2f7ee6847a 100644 --- a/packages/login/tsconfig.json +++ b/packages/login/tsconfig.json @@ -1,5 +1,5 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"] } diff --git a/packages/openapi-converter/.depcheckrc.json b/packages/openapi-converter/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/openapi-converter/.depcheckrc.json +++ b/packages/openapi-converter/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/openapi-converter/package.json b/packages/openapi-converter/package.json index b19ae3f8efb..9d2447267b4 100644 --- a/packages/openapi-converter/package.json +++ b/packages/openapi-converter/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../shared/.prettierignore \"**\"", @@ -53,6 +53,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/openapi-converter/tsconfig.esm.json b/packages/openapi-converter/tsconfig.cjs.json similarity index 61% rename from packages/openapi-converter/tsconfig.esm.json rename to packages/openapi-converter/tsconfig.cjs.json index 51f4d212279..efea52dbb30 100644 --- a/packages/openapi-converter/tsconfig.esm.json +++ b/packages/openapi-converter/tsconfig.cjs.json @@ -1,7 +1,7 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], - "references": [{ "path": "../compiler/syntax-analysis/tsconfig.esm.json" }] + "references": [{ "path": "../compiler/syntax-analysis/tsconfig.cjs.json" }] } diff --git a/packages/openapi-converter/tsconfig.json b/packages/openapi-converter/tsconfig.json index 0517e9a6ac9..e0aa3c1f2e7 100644 --- a/packages/openapi-converter/tsconfig.json +++ b/packages/openapi-converter/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "exclude": ["./src/**/__test__/**/generated"], "references": [{ "path": "../compiler/syntax-analysis/tsconfig.json" }] diff --git a/packages/remote-generation/remote-workspace-runner/.depcheckrc.json b/packages/remote-generation/remote-workspace-runner/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/remote-generation/remote-workspace-runner/.depcheckrc.json +++ b/packages/remote-generation/remote-workspace-runner/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/remote-generation/remote-workspace-runner/package.json b/packages/remote-generation/remote-workspace-runner/package.json index 39b85e2fc0e..6568698879e 100644 --- a/packages/remote-generation/remote-workspace-runner/package.json +++ b/packages/remote-generation/remote-workspace-runner/package.json @@ -11,8 +11,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -21,12 +21,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "format": "prettier --write --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", @@ -52,6 +52,7 @@ "jest": "^28.1.1", "npm-run-all": "^4.1.5", "prettier": "^2.6.2", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/remote-generation/remote-workspace-runner/tsconfig.cjs.json b/packages/remote-generation/remote-workspace-runner/tsconfig.cjs.json new file mode 100644 index 00000000000..036d0921155 --- /dev/null +++ b/packages/remote-generation/remote-workspace-runner/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../../commons/tsconfig.cjs.json" }, { "path": "../../compiler/compiler/tsconfig.cjs.json" }] +} diff --git a/packages/remote-generation/remote-workspace-runner/tsconfig.esm.json b/packages/remote-generation/remote-workspace-runner/tsconfig.esm.json deleted file mode 100644 index a86819b4fca..00000000000 --- a/packages/remote-generation/remote-workspace-runner/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../../commons/tsconfig.esm.json" }, { "path": "../../compiler/compiler/tsconfig.esm.json" }] -} diff --git a/packages/remote-generation/remote-workspace-runner/tsconfig.json b/packages/remote-generation/remote-workspace-runner/tsconfig.json index d60b70bfcf9..4831cf9f92b 100644 --- a/packages/remote-generation/remote-workspace-runner/tsconfig.json +++ b/packages/remote-generation/remote-workspace-runner/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../../commons/tsconfig.json" }, { "path": "../../compiler/compiler/tsconfig.json" }] } diff --git a/packages/ui/app/.depcheckrc.json b/packages/ui/app/.depcheckrc.json index 57573daed03..5206389417d 100644 --- a/packages/ui/app/.depcheckrc.json +++ b/packages/ui/app/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest"], "ignore-patterns": ["lib"] } diff --git a/packages/ui/app/package.json b/packages/ui/app/package.json index fe9ee576c08..c14b94efdb7 100644 --- a/packages/ui/app/package.json +++ b/packages/ui/app/package.json @@ -12,8 +12,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -22,12 +22,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", @@ -52,6 +52,7 @@ "npm-run-all": "^4.1.5", "prettier": "^2.6.2", "stylelint": "^14.9.1", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" } } diff --git a/packages/ui/app/tsconfig.cjs.json b/packages/ui/app/tsconfig.cjs.json new file mode 100644 index 00000000000..6ef2c755765 --- /dev/null +++ b/packages/ui/app/tsconfig.cjs.json @@ -0,0 +1,5 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"] +} diff --git a/packages/ui/app/tsconfig.esm.json b/packages/ui/app/tsconfig.esm.json deleted file mode 100644 index 2882cc71406..00000000000 --- a/packages/ui/app/tsconfig.esm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"] -} diff --git a/packages/ui/app/tsconfig.json b/packages/ui/app/tsconfig.json index 6ef2c755765..2882cc71406 100644 --- a/packages/ui/app/tsconfig.json +++ b/packages/ui/app/tsconfig.json @@ -1,5 +1,5 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"] } diff --git a/packages/ui/fe-bundle/.depcheckrc.json b/packages/ui/fe-bundle/.depcheckrc.json index 1cdbaf4479b..9b12b93faa9 100644 --- a/packages/ui/fe-bundle/.depcheckrc.json +++ b/packages/ui/fe-bundle/.depcheckrc.json @@ -1 +1 @@ -{ "ignores": ["@types/jest", "@types/node", "react-scripts", "sass"], "ignore-patterns": ["lib"] } +{ "ignores": ["@types/jest", "@types/node", "ts-jest", "react-scripts", "sass"], "ignore-patterns": ["lib"] } diff --git a/packages/ui/fe-bundle/craco.config.ts b/packages/ui/fe-bundle/craco.config.ts index a7b634bca46..7932e5e2ca2 100644 --- a/packages/ui/fe-bundle/craco.config.ts +++ b/packages/ui/fe-bundle/craco.config.ts @@ -32,7 +32,7 @@ module.exports = async function (): Promise { // add --build flag to tsc for building project references options.typescript.build = true; // compile ESM, not CJS - options.typescript.configFile = "tsconfig.esm.json"; + options.typescript.configFile = "tsconfig.json"; } else { throw new Error("Could not find ForkTsCheckerWebpackPlugin"); } diff --git a/packages/ui/fe-bundle/package.json b/packages/ui/fe-bundle/package.json index 28afab4b578..6806d51de05 100644 --- a/packages/ui/fe-bundle/package.json +++ b/packages/ui/fe-bundle/package.json @@ -12,8 +12,8 @@ ], "source": "src/index.ts", "module": "src/index.ts", - "main": "./lib/cjs/index.js", - "types": "./lib/cjs/index.d.ts", + "main": "./lib/esm/index.js", + "types": "./lib/esm/index.d.ts", "exports": { ".": { "require": "./lib/cjs/index.js", @@ -22,12 +22,12 @@ }, "sideEffects": false, "scripts": { - "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.esm.json", - "compile": "yarn run compile:cjs", - "compile:all": "run-s compile:cjs compile:esm", - "compile:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "compile:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", - "test": "yarn run compile && jest --passWithNoTests", + "clean": "tsc --build --clean tsconfig.json && tsc --build --clean tsconfig.cjs.json", + "compile": "yarn run compile:esm", + "compile:all": "run-s compile:esm compile:cjs", + "compile:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "compile:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "test": "yarn run compile:all && jest --passWithNoTests", "lint:eslint": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore", "lint:eslint:fix": "eslint --max-warnings 0 . --ignore-path=../../../.eslintignore --fix", "lint:style": "stylelint 'src/**/*.scss' --allow-empty-input --max-warnings 0", @@ -36,8 +36,7 @@ "format:check": "prettier --check --ignore-unknown --ignore-path ../../../shared/.prettierignore \"**\"", "depcheck": "depcheck", "start": "env-cmd -e development env-cmd -f .env.local --silent craco start", - "build:staging": "REACT_APP_PRODUCTION_ENVIRONMENT=STAGING env-cmd -e development craco --max_old_space_size=4096 build", - "build:production": "REACT_APP_PRODUCTION_ENVIRONMENT=PRODUCTION env-cmd -e production craco --max_old_space_size=4096 build", + "build": "yarn run compile && craco build", "eject": "react-scripts eject" }, "browserslist": { @@ -83,6 +82,7 @@ "react-scripts": "^5.0.1", "sass": "^1.53.0", "stylelint": "^14.9.1", + "ts-jest": "^28.0.5", "typescript": "^4.6.4" }, "postcss": { diff --git a/packages/ui/fe-bundle/tsconfig.cjs.json b/packages/ui/fe-bundle/tsconfig.cjs.json new file mode 100644 index 00000000000..9989de9b18f --- /dev/null +++ b/packages/ui/fe-bundle/tsconfig.cjs.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../shared/tsconfig.shared.json", + "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "include": ["./src"], + "references": [{ "path": "../app/tsconfig.cjs.json" }] +} diff --git a/packages/ui/fe-bundle/tsconfig.esm.json b/packages/ui/fe-bundle/tsconfig.esm.json deleted file mode 100644 index 476dec5385e..00000000000 --- a/packages/ui/fe-bundle/tsconfig.esm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, - "include": ["./src"], - "references": [{ "path": "../app/tsconfig.esm.json" }] -} diff --git a/packages/ui/fe-bundle/tsconfig.json b/packages/ui/fe-bundle/tsconfig.json index 9baae92e095..4742edd1048 100644 --- a/packages/ui/fe-bundle/tsconfig.json +++ b/packages/ui/fe-bundle/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../../shared/tsconfig.shared.json", - "compilerOptions": { "composite": true, "outDir": "lib/cjs", "rootDir": "src", "module": "CommonJS" }, + "compilerOptions": { "composite": true, "outDir": "lib/esm", "rootDir": "src", "module": "esnext" }, "include": ["./src"], "references": [{ "path": "../app/tsconfig.json" }] } diff --git a/shared/jest.config.shared.ts b/shared/jest.config.shared.ts index 0106a9a7d3d..1bf37f57db7 100644 --- a/shared/jest.config.shared.ts +++ b/shared/jest.config.shared.ts @@ -2,10 +2,9 @@ import { Config } from "jest"; const config: Config = { + preset: "ts-jest", + testEnvironment: "node", testMatch: ["**/__test__/**/*.test.ts{,x}"], - transform: { - ".*\\.ts$": ["babel-jest", { rootMode: "upward" }], - }, }; export default config; diff --git a/yarn.lock b/yarn.lock index a75af6e3333..8927366de68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3112,6 +3112,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3133,6 +3134,7 @@ __metadata: prettier: ^2.6.2 react: ^18.2.0 stylelint: ^14.9.1 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3171,6 +3173,7 @@ __metadata: node-loader: ^2.0.0 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-loader: ^9.3.1 ts-node: ^10.8.1 typescript: ^4.6.4 @@ -3201,6 +3204,7 @@ __metadata: js-yaml: ^4.1.0 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 zod: ^3.14.3 languageName: unknown @@ -3251,6 +3255,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3269,6 +3274,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3291,6 +3297,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3311,6 +3318,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3332,6 +3340,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3368,6 +3377,7 @@ __metadata: react-scripts: ^5.0.1 sass: ^1.53.0 stylelint: ^14.9.1 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3390,6 +3400,7 @@ __metadata: js-yaml: ^4.1.0 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3414,6 +3425,7 @@ __metadata: lodash: ^4.17.21 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3441,6 +3453,7 @@ __metadata: prettier: ^2.6.2 tar: ^6.1.11 tmp-promise: ^3.0.3 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3461,61 +3474,62 @@ __metadata: npm-run-all: ^4.1.5 open: ^8.4.0 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft -"@fern-api/mrlint-commons@npm:0.0.46": - version: 0.0.46 - resolution: "@fern-api/mrlint-commons@npm:0.0.46" +"@fern-api/mrlint-commons@npm:0.0.50": + version: 0.0.50 + resolution: "@fern-api/mrlint-commons@npm:0.0.50" dependencies: - "@fern-api/mrlint-virtual-file-system": 0.0.46 - checksum: 88254c30b861f699c9b52f886d29bc47cc012447132f0d6b983adacc595c2c15ca193cb6ee6619ef06d4fb929a4f4ab1b6c10fc774fba0eae88197f4b112815d + "@fern-api/mrlint-virtual-file-system": 0.0.50 + checksum: 2106f1cb85cc6b429b3640903a1b2d6fb90df310ba9d61406ef7c1811305b07ca0231f06bdcc25c846814aafa23cec98ece4cc0570f190c9829e04c89d0b0efd languageName: node linkType: hard -"@fern-api/mrlint-lint@npm:0.0.46": - version: 0.0.46 - resolution: "@fern-api/mrlint-lint@npm:0.0.46" +"@fern-api/mrlint-lint@npm:0.0.50": + version: 0.0.50 + resolution: "@fern-api/mrlint-lint@npm:0.0.50" dependencies: - "@fern-api/mrlint-commons": 0.0.46 - "@fern-api/mrlint-virtual-file-system": 0.0.46 + "@fern-api/mrlint-commons": 0.0.50 + "@fern-api/mrlint-virtual-file-system": 0.0.50 chalk: ^4.1.2 diff: ^5.0.0 prettier: ^2.6.2 - checksum: 0e49f17a5bdc9f2f7bf4631306ec327de351fbc1178c0498eb2e9c98e6af3ab66b299a2aca7d157fa4e1414bfe206ff5badc26582acfbb686c443abf16b3f74c + checksum: b77f12256dbc2d9a9a5e177286790f081be32e362885d3529465876aebf373fc2956cecae7aa993405b78e5f5b88b1c2cd3d672a9f51e117c6a42c3244e75ccd languageName: node linkType: hard -"@fern-api/mrlint-parser@npm:0.0.46": - version: 0.0.46 - resolution: "@fern-api/mrlint-parser@npm:0.0.46" +"@fern-api/mrlint-parser@npm:0.0.50": + version: 0.0.50 + resolution: "@fern-api/mrlint-parser@npm:0.0.50" dependencies: - "@fern-api/mrlint-commons": 0.0.46 - "@fern-api/mrlint-rules": 0.0.46 + "@fern-api/mrlint-commons": 0.0.50 + "@fern-api/mrlint-rules": 0.0.50 execa: ^5.1.1 find-up: ^5.0.0 js-yaml: ^4.1.0 zod: ^3.14.3 - checksum: 19615fd5efc411f6be91a6db5c9848d1be55bc8101ec7c10b7f2ab476c2f99d0635b2920cd2f371cb0549acbb8a4c1cb187f5434596fad9ed2ce2290415aabac + checksum: a8d224a95bbdab64060872f4abe18cf75e28db0bac0885df239dfc83678066f3b20c53809b23100d5134547e4c3a53f3d51c5a963ebf5cee639e49047d24ce64 languageName: node linkType: hard -"@fern-api/mrlint-rules@npm:0.0.46": - version: 0.0.46 - resolution: "@fern-api/mrlint-rules@npm:0.0.46" +"@fern-api/mrlint-rules@npm:0.0.50": + version: 0.0.50 + resolution: "@fern-api/mrlint-rules@npm:0.0.50" dependencies: - "@fern-api/mrlint-commons": 0.0.46 - "@fern-api/mrlint-virtual-file-system": 0.0.46 + "@fern-api/mrlint-commons": 0.0.50 + "@fern-api/mrlint-virtual-file-system": 0.0.50 immer: ^9.0.12 - checksum: 47f43854467a5e5f163f1d9d42be59d3820cab01a139ec6978f8a7a4947065ceaadc681c106d93a87b0971d62bdf16e426c8e4c120382504eab6dd539c0f611a + checksum: 70661176953b0bf3d44bb1b9904f97b447dfbf86ae7fd7d64bd7c781d84428e7a6122d1e92cb3da7198ddba1ec3d31da2b5d39349727884547e7259318247a03 languageName: node linkType: hard -"@fern-api/mrlint-virtual-file-system@npm:0.0.46": - version: 0.0.46 - resolution: "@fern-api/mrlint-virtual-file-system@npm:0.0.46" - checksum: 1f7d194acc9d6319c60d07c85495b590829222cd30af35ed762123585b2fbb88d428ad4a676238de809529c567eaf1d7775a16e4132b816a5f3e81169ffe27e4 +"@fern-api/mrlint-virtual-file-system@npm:0.0.50": + version: 0.0.50 + resolution: "@fern-api/mrlint-virtual-file-system@npm:0.0.50" + checksum: a8c8b76d27e0fe795e4c0a9467b4d4de8d29ac4d60c1145dc535187c9fe3bc393606bd52049d8d64d9441c00af00798ccecf61e59f371810f8ec889320b10884 languageName: node linkType: hard @@ -3540,6 +3554,7 @@ __metadata: npm-run-all: ^4.1.5 openapi-types: ^12.0.0 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3564,6 +3579,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3585,6 +3601,7 @@ __metadata: js-yaml: ^4.1.0 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 zod: ^3.14.3 languageName: unknown @@ -3631,6 +3648,7 @@ __metadata: memfs: ^3.4.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3659,6 +3677,7 @@ __metadata: npm-run-all: ^4.1.5 package-json-type: ^1.0.3 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3681,6 +3700,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3703,6 +3723,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3725,6 +3746,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 zod: ^3.14.3 languageName: unknown @@ -3746,6 +3768,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3766,6 +3789,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3787,6 +3811,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3814,6 +3839,7 @@ __metadata: memfs: ^3.4.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3843,6 +3869,7 @@ __metadata: memfs: ^3.4.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3869,6 +3896,7 @@ __metadata: lodash: ^4.17.21 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -3898,6 +3926,7 @@ __metadata: jest: ^28.1.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3924,6 +3953,7 @@ __metadata: memfs: ^3.4.1 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 typescript: ^4.6.4 languageName: unknown linkType: soft @@ -3947,6 +3977,7 @@ __metadata: lodash: ^4.17.21 npm-run-all: ^4.1.5 prettier: ^2.6.2 + ts-jest: ^28.0.5 ts-morph: ^14.0.0 typescript: ^4.6.4 languageName: unknown @@ -7540,6 +7571,15 @@ __metadata: languageName: node linkType: hard +"bs-logger@npm:0.x": + version: 0.2.6 + resolution: "bs-logger@npm:0.2.6" + dependencies: + fast-json-stable-stringify: 2.x + checksum: d34bdaf68c64bd099ab97c3ea608c9ae7d3f5faa1178b3f3f345acd94e852e608b2d4f9103fb2e503f5e69780e98293df41691b84be909b41cf5045374d54606 + languageName: node + linkType: hard + "bser@npm:2.1.1": version: 2.1.1 resolution: "bser@npm:2.1.1" @@ -10442,7 +10482,7 @@ __metadata: languageName: node linkType: hard -"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": +"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" checksum: b191531e36c607977e5b1c47811158733c34ccb3bfde92c44798929e9b4154884378536d26ad90dfecd32e1ffc09c545d23535ad91b3161a27ddbb8ebe0cbecb @@ -10528,6 +10568,7 @@ __metadata: npm-run-all: ^4.1.5 prettier: ^2.6.2 simple-progress-webpack-plugin: ^2.0.0 + ts-jest: ^28.0.5 ts-loader: ^9.3.1 ts-node: ^10.8.1 typescript: ^4.6.4 @@ -10568,12 +10609,13 @@ __metadata: jest: ^28.1.2 lint-staged: ^12.3.7 lodash: ^4.17.21 - mrlint: ^0.0.46 + mrlint: ^0.0.50 npm-run-all: ^4.1.5 prettier: ^2.6.2 stylelint: ^14.9.1 stylelint-config-prettier-scss: ^0.0.1 stylelint-config-standard-scss: ^4.0.0 + ts-jest: ^28.0.5 ts-node: ^10.8.0 typescript: ^4.6.4 languageName: unknown @@ -13397,7 +13439,7 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^28.1.1": +"jest-util@npm:^28.0.0, jest-util@npm:^28.1.1": version: 28.1.1 resolution: "jest-util@npm:28.1.1" dependencies: @@ -14044,7 +14086,7 @@ __metadata: languageName: node linkType: hard -"lodash.memoize@npm:^4.1.2": +"lodash.memoize@npm:4.x, lodash.memoize@npm:^4.1.2": version: 4.1.2 resolution: "lodash.memoize@npm:4.1.2" checksum: 9ff3942feeccffa4f1fafa88d32f0d24fdc62fd15ded5a74a5f950ff5f0c6f61916157246744c620173dddf38d37095a92327d5fd3861e2063e736a5c207d089 @@ -14185,7 +14227,7 @@ __metadata: languageName: node linkType: hard -"make-error@npm:^1.1.1": +"make-error@npm:1.x, make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 @@ -14611,19 +14653,19 @@ __metadata: languageName: node linkType: hard -"mrlint@npm:^0.0.46": - version: 0.0.46 - resolution: "mrlint@npm:0.0.46" +"mrlint@npm:^0.0.50": + version: 0.0.50 + resolution: "mrlint@npm:0.0.50" dependencies: - "@fern-api/mrlint-commons": 0.0.46 - "@fern-api/mrlint-lint": 0.0.46 - "@fern-api/mrlint-parser": 0.0.46 - "@fern-api/mrlint-rules": 0.0.46 + "@fern-api/mrlint-commons": 0.0.50 + "@fern-api/mrlint-lint": 0.0.50 + "@fern-api/mrlint-parser": 0.0.50 + "@fern-api/mrlint-rules": 0.0.50 chalk: ^4.1.2 yargs: ^17.3.1 bin: mrlint: ./cli - checksum: fe7c57dc0926bb317a351678a5d3e8d82bfa1a37d206d5ad2afb708b4441d87fdf797a7534275d5d320e5735c4598b18ad847f99d28036fbd224154ccd4d06f6 + checksum: 1f0e631dcf4094403ba81b6131de1b084618331fba18071b69b9e4d4de696d7b7c9b4c5079ebcd28d615abdb83a6856f2782fa1fe5fd787dd504280df1bc8231 languageName: node linkType: hard @@ -17901,16 +17943,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.2.0, semver@npm:^6.3.0": - version: 6.3.0 - resolution: "semver@npm:6.3.0" - bin: - semver: ./bin/semver.js - checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 - languageName: node - linkType: hard - -"semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": +"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": version: 7.3.7 resolution: "semver@npm:7.3.7" dependencies: @@ -17921,6 +17954,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.2.0, semver@npm:^6.3.0": + version: 6.3.0 + resolution: "semver@npm:6.3.0" + bin: + semver: ./bin/semver.js + checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 + languageName: node + linkType: hard + "send@npm:0.18.0": version: 0.18.0 resolution: "send@npm:0.18.0" @@ -19354,6 +19396,36 @@ __metadata: languageName: node linkType: hard +"ts-jest@npm:^28.0.5": + version: 28.0.5 + resolution: "ts-jest@npm:28.0.5" + dependencies: + bs-logger: 0.x + fast-json-stable-stringify: 2.x + jest-util: ^28.0.0 + json5: ^2.2.1 + lodash.memoize: 4.x + make-error: 1.x + semver: 7.x + yargs-parser: ^21.0.1 + peerDependencies: + "@babel/core": ">=7.0.0-beta.0 <8" + babel-jest: ^28.0.0 + jest: ^28.0.0 + typescript: ">=4.3" + peerDependenciesMeta: + "@babel/core": + optional: true + babel-jest: + optional: true + esbuild: + optional: true + bin: + ts-jest: cli.js + checksum: 53e05db5b7e1e4f4137c47594f902f5caf585ebc73dda67c4552c1ed784d4fde532c5693a61d877d9462290c7965233c2124050b0f00fd4c85cde9bb1a51c974 + languageName: node + linkType: hard + "ts-loader@npm:^9.3.1": version: 9.3.1 resolution: "ts-loader@npm:9.3.1" @@ -20899,7 +20971,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^21.0.0": +"yargs-parser@npm:^21.0.0, yargs-parser@npm:^21.0.1": version: 21.0.1 resolution: "yargs-parser@npm:21.0.1" checksum: c3ea2ed12cad0377ce3096b3f138df8267edf7b1aa7d710cd502fe16af417bafe4443dd71b28158c22fcd1be5dfd0e86319597e47badf42ff83815485887323a