diff --git a/.gitignore b/.gitignore index 8167fda1..df21611a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ jspm_packages/ *.tgz .yarn-integrity .cache -!/.projenrc.js /test-reports/ junit.xml /coverage/ @@ -53,3 +52,4 @@ junit.xml !/.github/workflows/upgrade-dev-deps-main.yml test/**/.jsii.* .vscode/ +!/.projenrc.ts diff --git a/.npmignore b/.npmignore index 68ff5de5..1579e2d8 100644 --- a/.npmignore +++ b/.npmignore @@ -21,3 +21,5 @@ dist /.projenrc.js tsconfig.tsbuildinfo /.eslintrc.json +/.gitattributes +/.projenrc.ts diff --git a/.projen/tasks.json b/.projen/tasks.json index c307c907..bb212406 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -117,7 +117,8 @@ "description": "Runs eslint against the codebase", "steps": [ { - "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools projenrc .projenrc.ts" + "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern $@ src test build-tools projenrc .projenrc.ts", + "receiveArgs": true } ] }, diff --git a/package.json b/package.json index cf0da9dc..c5633cd2 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "jest": "^29", "jest-junit": "^15", "jsii-rosetta": "~v1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0", - "projen": "^0.77.6", + "projen": "^0.79.0", "standard-version": "^9", "ts-jest": "^29", "ts-node": "^10.9.2", @@ -109,11 +109,13 @@ } ] ], - "preset": "ts-jest", - "globals": { - "ts-jest": { - "tsconfig": "tsconfig.dev.json" - } + "transform": { + "^.+\\.[t]sx?$": [ + "ts-jest", + { + "tsconfig": "tsconfig.dev.json" + } + ] } }, "types": "lib/index.d.ts", diff --git a/tsconfig.dev.json b/tsconfig.dev.json index 47ddbde7..7cb6faef 100644 --- a/tsconfig.dev.json +++ b/tsconfig.dev.json @@ -27,7 +27,6 @@ "skipLibCheck": true }, "include": [ - ".projenrc.js", "src/**/*.ts", "test/**/*.ts", ".projenrc.ts", diff --git a/yarn.lock b/yarn.lock index 8e9b05d9..52e83a82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -342,12 +342,12 @@ integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== "@humanwhocodes/config-array@^0.11.13": - version "0.11.13" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" - integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== + version "0.11.14" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== dependencies: - "@humanwhocodes/object-schema" "^2.0.1" - debug "^4.1.1" + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" minimatch "^3.0.5" "@humanwhocodes/module-importer@^1.0.1": @@ -355,10 +355,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" - integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" + integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== "@hutson/parse-repository-url@^3.0.0": version "3.0.2" @@ -1833,9 +1833,9 @@ downlevel-dts@^0.11.0: typescript next electron-to-chromium@^1.4.601: - version "1.4.626" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.626.tgz#c20e1706354a31721b65e81496800534dd04b222" - integrity sha512-f7/be56VjRRQk+Ric6PmIrEtPcIqsn3tElyAu9Sh6egha2VLJ82qwkcOdcnT06W+Pb6RUulV1ckzrGbKzVcTHg== + version "1.4.628" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.628.tgz#97cefa4b2356d981875f19639885e4fc50ce6e82" + integrity sha512-2k7t5PHvLsufpP6Zwk0nof62yLOsCf032wZx7/q0mv8gwlXjhcxI3lz6f0jBr0GrnWKcm3burXzI3t5IrcdUxw== emittery@^0.13.1: version "0.13.1" @@ -3915,10 +3915,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@^0.77.6: - version "0.77.6" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.77.6.tgz#480c1af4246bba55e8d0732ff7a9d1804ce414be" - integrity sha512-nXbbDr81UjfLjCfVfHGfGPIjiN7INSyMUa52FYupX0TmybMq+CnvX8o0O45feOLLhsifNq7EHXtF+hgBtpBb8A== +projen@^0.79.0: + version "0.79.0" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.79.0.tgz#5751e023d3fa11ff9d883187e0f672d37738c088" + integrity sha512-Kuj/NLMmt+zx0VlC++jv5OH8Kv8tqrEBhawQHMI6lI16CusRdSPWo2JI906yj5Wvqqb3n7taflqPe7IzxE/xkw== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3"