From 26dda63b97ff596f4919be18cacccd36b78ad23b Mon Sep 17 00:00:00 2001 From: garrettmills Date: Wed, 13 Jul 2022 20:36:13 -0500 Subject: [PATCH] Fix build command --- package.json | 15 ++------ pnpm-lock.yaml | 101 +++++++++++++++++++++++++++++++++++++++++++++++-- tsconfig.json | 7 ++-- 3 files changed, 104 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index b786682..649de69 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "lib": "lib" }, "dependencies": { + "@atao60/fse-cli": "^0.1.7", "@extollo/lib": "link:../lib", "copyfiles": "^2.4.1", "feed": "^4.2.2", @@ -24,7 +25,8 @@ "test": "echo \"Error: no test specified\" && exit 1", "app": "ts-node src/index.ts", "cli": "ts-node src/cli.ts", - "watch": "nodemon --ext js,pug,ts --watch src --exec 'ts-node src/index.ts'" + "watch": "nodemon --ext js,pug,ts --watch src --exec 'ts-node src/index.ts'", + "build": "rimraf lib && tsc -p tsconfig.json && fse copy --all --dereference --preserveTimestamps --keepExisting=false --quiet --errorOnExist=false src/app/resources lib/app/resources" }, "files": [ "lib/**/*" @@ -37,17 +39,6 @@ }, "author": "garrettmills ", "license": "MIT", - "extollo": { - "cc": { - "zodify": [ - "src/app/types" - ], - "non-source": [ - ".env", - "src/app/resources" - ] - } - }, "devDependencies": { "nodemon": "^2.0.19" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ff0beba..3754c22 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,6 +1,7 @@ lockfileVersion: 5.3 specifiers: + '@atao60/fse-cli': ^0.1.7 '@extollo/lib': link:../lib copyfiles: ^2.4.1 feed: ^4.2.2 @@ -15,6 +16,7 @@ specifiers: zod: ^3.11.6 dependencies: + '@atao60/fse-cli': 0.1.7 '@extollo/lib': link:../lib copyfiles: 2.4.1 feed: 4.2.2 @@ -32,6 +34,31 @@ devDependencies: packages: + /@atao60/fse-cli/0.1.7: + resolution: {integrity: sha512-gjRvhP1nzQ0tbAp4VokHjc9lOjmnHtHTlfaeTrHuktm47bjb2GNqr01P3mIytbAC6AiDJtdEgMDt2aNXAwJ8sA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0, npm: '>=6.14.11'} + hasBin: true + dependencies: + '@babel/runtime': 7.18.6 + arg: 5.0.2 + chalk: 4.1.2 + core-js: 3.23.4 + fs-extra: 10.1.0 + graceful-fs: 4.2.9 + inquirer: 8.2.0 + regenerator-runtime: 0.13.9 + source-map-support: 0.5.21 + terminal-link: 3.0.0 + tslib: 2.3.1 + dev: false + + /@babel/runtime/7.18.6: + resolution: {integrity: sha512-t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.13.9 + dev: false + /@cspotcode/source-map-support/0.8.1: resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} engines: {node: '>=12'} @@ -256,6 +283,13 @@ packages: type-fest: 0.21.3 dev: false + /ansi-escapes/5.0.0: + resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==} + engines: {node: '>=12'} + dependencies: + type-fest: 1.4.0 + dev: false + /ansi-regex/5.0.0: resolution: {integrity: sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==} engines: {node: '>=8'} @@ -279,6 +313,10 @@ packages: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} dev: false + /arg/5.0.2: + resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} + dev: false + /array-union/2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} @@ -324,6 +362,10 @@ packages: dependencies: fill-range: 7.0.1 + /buffer-from/1.1.2: + resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} + dev: false + /buffer/5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} dependencies: @@ -466,6 +508,11 @@ packages: yargs: 16.2.0 dev: false + /core-js/3.23.4: + resolution: {integrity: sha512-vjsKqRc1RyAJC3Ye2kYqgfdThb3zYnx9CrqoCcjMOENMtQPC7ZViBvlDxwYU/2z2NI/IPuiXw5mT4hWhddqjzQ==} + requiresBuild: true + dev: false + /core-util-is/1.0.2: resolution: {integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=} dev: false @@ -542,7 +589,7 @@ packages: dev: false /escape-string-regexp/1.0.5: - resolution: {integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=} + resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} dev: false @@ -603,6 +650,15 @@ packages: dependencies: to-regex-range: 5.0.1 + /fs-extra/10.1.0: + resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} + engines: {node: '>=12'} + dependencies: + graceful-fs: 4.2.9 + jsonfile: 6.1.0 + universalify: 2.0.0 + dev: false + /fs-extra/8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} @@ -880,7 +936,7 @@ packages: dev: false /jsonfile/4.0.0: - resolution: {integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=} + resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} optionalDependencies: graceful-fs: 4.2.9 dev: false @@ -1062,7 +1118,7 @@ packages: dev: false /os-tmpdir/1.0.2: - resolution: {integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=} + resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} dev: false @@ -1176,6 +1232,10 @@ packages: resolve: 1.21.0 dev: false + /regenerator-runtime/0.13.9: + resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==} + dev: false + /require-directory/2.1.1: resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=} engines: {node: '>=0.10.0'} @@ -1289,6 +1349,18 @@ packages: engines: {node: '>=8'} dev: false + /source-map-support/0.5.21: + resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==} + dependencies: + buffer-from: 1.1.2 + source-map: 0.6.1 + dev: false + + /source-map/0.6.1: + resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} + engines: {node: '>=0.10.0'} + dev: false + /string-width/4.2.2: resolution: {integrity: sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==} engines: {node: '>=8'} @@ -1329,11 +1401,27 @@ packages: has-flag: 4.0.0 dev: false + /supports-hyperlinks/2.2.0: + resolution: {integrity: sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==} + engines: {node: '>=8'} + dependencies: + has-flag: 4.0.0 + supports-color: 7.2.0 + dev: false + /supports-preserve-symlinks-flag/1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} dev: false + /terminal-link/3.0.0: + resolution: {integrity: sha512-flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg==} + engines: {node: '>=12'} + dependencies: + ansi-escapes: 5.0.0 + supports-hyperlinks: 2.2.0 + dev: false + /threads/1.7.0: resolution: {integrity: sha512-Mx5NBSHX3sQYR6iI9VYbgHKBLisyB+xROCBGjjWm1O9wb9vfLxdaGtmT/KCjUqMsSNW6nERzCW3T6H43LqjDZQ==} dependencies: @@ -1348,7 +1436,7 @@ packages: dev: false /through/2.3.8: - resolution: {integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=} + resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: false /through2/2.0.5: @@ -1497,6 +1585,11 @@ packages: engines: {node: '>=10'} dev: false + /type-fest/1.4.0: + resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==} + engines: {node: '>=10'} + dev: false + /typescript/4.3.2: resolution: {integrity: sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==} engines: {node: '>=4.2.0'} diff --git a/tsconfig.json b/tsconfig.json index d68f071..0f80131 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,8 +7,9 @@ "strict": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, - "lib": ["esnext", "dom", "dom.iterable"] + "skipLibCheck": true, + "lib": ["esnext", "dom", "dom.iterable"], + "preserveSymlinks": true }, - "include": ["src"], - "exclude": ["node_modules", "src/app/resources", "../lib", "../lib/node_modules"] + "include": ["src"] }