diff --git a/.gitignore b/.gitignore index 8356955..064edf1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,9 @@ node_modules/ # Environment docker-compose configuration docker-compose.env.yml + +# Built packages +/packages/*/lib + +# Built services +/services/*/dist diff --git a/Dockerfile b/Dockerfile index 154d0f3..5c2d38c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,14 +59,17 @@ WORKDIR /app # Build Definitions -------------------------------------------------------------------------------- # Create the builder image with all dependencies -FROM ${BASE}-dev AS builder -ARG SERVICE +FROM ${BASE}-dev AS builder-base WORKDIR /app RUN yarn global add lerna typescript rimraf -COPY scripts scripts -COPY lerna.json package.json tsconfig.json yarn.lock ./ +COPY docker/scripts docker/scripts +COPY lerna.json package.json tsconfig.json ./ RUN yarn install COPY packages packages + +# Copy service package.json and patch files if they exist +FROM builder-base AS builder +ARG SERVICE COPY services/${SERVICE}/package.json ./services/${SERVICE}/ COPY services/${SERVICE}/patches* ./services/${SERVICE}/patches @@ -93,4 +96,4 @@ RUN mv /opt/services/${SERVICE}/* /app && rm -rf /opt/services # TODO: Should remove unnecessary packages that were included # Default entrypoint -ENTRYPOINT "/bin/sh" +CMD [ "yarn", "run", "start" ] diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ddfb478..de5a4ca 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,33 +1,36 @@ version: "3.9" services: - # request: - # build: - # target: base - # ports: - # - 3001:3001 - # volumes: - # - ./request:/app - # entrypoint: "/bin/sh" - # tty: true + request: + build: + target: dev + ports: + - 3001:3001 + volumes: + - ./packages:/opt/app/packages + - ./services/request:/opt/app/services/request + entrypoint: "/bin/sh" + tty: true - # seeker: - # build: - # target: base-dev - # volumes: - # - ./seeker:/app - # entrypoint: "/bin/sh" - # tty: true + seeker: + build: + target: dev + volumes: + - ./packages:/opt/app/packages + - ./services/seeker:/opt/app/services/seeker + entrypoint: "/bin/sh" + tty: true - # torrent_webui: - # build: - # target: base - # ports: - # - 3000:3000 - # volumes: - # - ./torrent-webui:/app - # entrypoint: "/bin/sh" - # tty: true + torrent_webui: + build: + target: dev + ports: + - 3000:3000 + volumes: + - ./packages:/opt/app/packages + - ./services/torrent-webui:/opt/app/services/torrent-webui + entrypoint: "/bin/sh" + tty: true torrent_client: build: diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index bc7c66c..e6c9b6e 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,26 +1,26 @@ version: "3.9" services: - # request: - # build: - # target: prod - # environment: - # NODE_ENV: production + request: + build: + target: prod + environment: + NODE_ENV: production - # seeker: - # build: - # target: prod - # environment: - # NODE_ENV: production + seeker: + build: + target: prod + environment: + NODE_ENV: production - # torrent_webui: - # build: - # target: prod - # environment: - # NODE_ENV: production + torrent_webui: + build: + target: prod + environment: + NODE_ENV: production - # torrent_client: - # build: - # target: prod - # environment: - # NODE_ENV: production + torrent_client: + build: + target: prod + environment: + NODE_ENV: production diff --git a/docker-compose.yml b/docker-compose.yml index 3ab60d6..daeacbb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,68 +1,74 @@ version: "3.9" services: - # request: - # build: - # context: ./request - # depends_on: - # - "database" - # - "torrent_client" - # env_file: - # - ./request/.env - # links: - # - "database" - # - "torrent_client" - # ports: - # - 3200:3200 - # restart: unless-stopped - # secrets: - # - app_key - # - discord_bot_key - # - mysql_root_password - # - plex_token - # - tmdb_key - # - tvdb_key - # - tvdb_pin - # user: ${UID}:${GID} - # volumes: - # - var:/var/autoplex + request: + build: + context: . + args: + SERVICE: request + depends_on: + - "database" + - "torrent_client" + env_file: + - ./services/request/.env + links: + - "database" + - "torrent_client" + ports: + - 3200:3200 + restart: unless-stopped + secrets: + - app_key + - discord_bot_key + - mysql_root_password + - plex_token + - tmdb_key + - tvdb_key + - tvdb_pin + user: ${UID}:${GID} + volumes: + - var:/var/autoplex - # seeker: - # build: - # context: ./seeker - # depends_on: - # - "database" - # - "torrent_client" - # env_file: - # - ./seeker/.env - # links: - # - "database" - # - "torrent_client" - # restart: unless-stopped - # secrets: - # - mysql_root_password - # user: ${UID}:${GID} - # volumes: - # - var:/var/autoplex + seeker: + build: + context: . + args: + SERVICE: seeker + depends_on: + - "database" + - "torrent_client" + env_file: + - ./services/seeker/.env + links: + - "database" + - "torrent_client" + restart: unless-stopped + secrets: + - mysql_root_password + user: ${UID}:${GID} + volumes: + - var:/var/autoplex - # torrent_webui: - # build: - # context: ./torrent-webui - # depends_on: - # - "database" - # - "torrent_client" - # env_file: - # - ./torrent-webui/.env - # links: - # - "database" - # - "torrent_client" - # ports: - # - 3300:3300 - # secrets: - # - mysql_root_password - # user: ${UID}:${GID} - # volumes: - # - var:/var/autoplex + torrent_webui: + build: + context: . + args: + SERVICE: torrent-webui + depends_on: + - "database" + - "torrent_client" + env_file: + - ./services/torrent-webui/.env + links: + - "database" + - "torrent_client" + ports: + - 3300:3300 + secrets: + - mysql_root_password + user: ${UID}:${GID} + volumes: + - var:/var/autoplex torrent_client: build: diff --git a/docker/scripts/export_builds.sh b/docker/scripts/export_builds.sh new file mode 100755 index 0000000..d9c84ee --- /dev/null +++ b/docker/scripts/export_builds.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# Create the exported directory +mkdir -p build + +# Locate services/packages and grab only the built files + package.json +for file in $(find . -regex '.\/\(services\|packages\)\/.*\/\(dist\|lib\)'); do + cp --parents -R $file build; +done diff --git a/docker/scripts/export_deps.sh b/docker/scripts/export_deps.sh new file mode 100644 index 0000000..4045daf --- /dev/null +++ b/docker/scripts/export_deps.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# Create the exported directory +mkdir -p build + +# Locate services/packages and grab only the built files + package.json +for file in $(find . -regex '.\/\(services\|packages\)\/.*\/\(package.json\|node_modules\)'); do + cp --parents -R $file build; +done diff --git a/package.json b/package.json index 1ca8022..63c59e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,14 @@ { "name": "autoplex", "private": true, + "scripts": { + "build": "lerna run build", + "build:packages": "lerna run build --scope=@ldt/package-*", + "build:services": "lerna run build --scope=@ldt/service-*", + "export": "rimraf ./build && yarn run export:deps && yarn run export:builds", + "export:deps": "/bin/sh ./docker/scripts/export_deps.sh", + "export:builds": "/bin/sh ./docker/scripts/export_builds.sh" + }, "devDependencies": { "lerna": "^4.0.0" } diff --git a/services/request/.gitignore b/services/request/.gitignore deleted file mode 100644 index 864547e..0000000 --- a/services/request/.gitignore +++ /dev/null @@ -1,118 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock -.data/ - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist -build - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/services/request/package.json b/services/request/package.json index ede7ba1..ad48b09 100644 --- a/services/request/package.json +++ b/services/request/package.json @@ -4,9 +4,9 @@ "keywords": [], "author": "David Ludwig", "license": "ISC", - "main": "./build/server/index.js", + "main": "./dist/server/index.js", "scripts": { - "clean": "rimraf ./build", + "clean": "rimraf ./dist", "cli:token": "node -r ts-node/register -r tsconfig-paths/register ./src/cli/create_token.ts", "dev": "vite", "build": "yarn run build:backend && yarn run build:frontend", diff --git a/services/request/tsconfig.json b/services/request/tsconfig.json index ebcadbb..ccce69b 100644 --- a/services/request/tsconfig.json +++ b/services/request/tsconfig.json @@ -14,7 +14,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./build", /* Redirect output structure to the directory. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ diff --git a/services/request/tsconfig.server.json b/services/request/tsconfig.server.json index 765b5df..845afbe 100644 --- a/services/request/tsconfig.server.json +++ b/services/request/tsconfig.server.json @@ -3,7 +3,7 @@ "compilerOptions": { "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ - "outDir": "build", /* Redirect output structure to the directory. */ + "outDir": "dist", /* Redirect output structure to the directory. */ "sourceRoot": "src/server", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ "plugins": [ { "transform": "@zerollup/ts-transform-paths" } diff --git a/services/request/vite.config.ts b/services/request/vite.config.ts index a80ce00..6919d11 100644 --- a/services/request/vite.config.ts +++ b/services/request/vite.config.ts @@ -6,7 +6,7 @@ export default defineConfig({ plugins: [vue()], build: { manifest: true, - outDir: "./build/public" + outDir: "./dist/public" }, server: { port: 3001 diff --git a/services/seeker/.gitignore b/services/seeker/.gitignore deleted file mode 100644 index 864547e..0000000 --- a/services/seeker/.gitignore +++ /dev/null @@ -1,118 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock -.data/ - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist -build - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/services/seeker/package.json b/services/seeker/package.json index 034e914..e993adb 100644 --- a/services/seeker/package.json +++ b/services/seeker/package.json @@ -1,12 +1,12 @@ { "name": "seeker", "version": "1.0.0", - "main": "build/index.js", + "main": "./dist/index.js", "repository": "ssh://git@git.dlii.tech:222/Autoplex/seeker.git", "author": "David Ludwig ", "license": "MIT", "scripts": { - "clean": "rimraf ./build", + "clean": "rimraf ./dist", "build": "tsc", "start": "NODE_ENV=production node .", "start:dev": "nodemon" diff --git a/services/seeker/tsconfig.json b/services/seeker/tsconfig.json index fc943ed..2b2badc 100644 --- a/services/seeker/tsconfig.json +++ b/services/seeker/tsconfig.json @@ -14,7 +14,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./build", /* Redirect output structure to the directory. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ diff --git a/services/seeker/yarn.lock b/services/seeker/yarn.lock index fe76cec..6d330c5 100644 --- a/services/seeker/yarn.lock +++ b/services/seeker/yarn.lock @@ -26,10 +26,15 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@^14.14.41": - version "14.14.41" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.41.tgz#d0b939d94c1d7bd53d04824af45f1139b8c45615" - integrity sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g== +"@types/node@*": + version "15.0.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" + integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== + +"@types/node@^14.14.41": + version "14.14.43" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8" + integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ== "@types/xml2js@^0.4.8": version "0.4.8" @@ -215,9 +220,9 @@ chalk@^3.0.0: supports-color "^7.1.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" diff --git a/services/torrent-client/.gitignore b/services/torrent-client/.gitignore deleted file mode 100644 index 71066f5..0000000 --- a/services/torrent-client/.gitignore +++ /dev/null @@ -1,117 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock -.data/ - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/services/torrent-client/package.json b/services/torrent-client/package.json index 2136aff..901d1f4 100644 --- a/services/torrent-client/package.json +++ b/services/torrent-client/package.json @@ -2,8 +2,9 @@ "name": "torrent", "version": "0.0.1", "description": "A dedicated torrent client for Autoplex", - "main": "build/index.js", + "main": "./dist/index.js", "scripts": { + "clean": "rimraf ./dist", "build": "tsc", "start": "NODE_ENV=production; node .", "start:dev": "nodemon", diff --git a/services/torrent-client/tsconfig.json b/services/torrent-client/tsconfig.json index 1191c65..c9eff71 100644 --- a/services/torrent-client/tsconfig.json +++ b/services/torrent-client/tsconfig.json @@ -14,7 +14,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./build", /* Redirect output structure to the directory. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ diff --git a/services/torrent-webui/.gitignore b/services/torrent-webui/.gitignore deleted file mode 100644 index 864547e..0000000 --- a/services/torrent-webui/.gitignore +++ /dev/null @@ -1,118 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock -.data/ - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist -build - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/services/torrent-webui/package.json b/services/torrent-webui/package.json index c6b3cc7..1bdbe0b 100644 --- a/services/torrent-webui/package.json +++ b/services/torrent-webui/package.json @@ -4,9 +4,9 @@ "keywords": [], "author": "David Ludwig", "license": "ISC", - "main": "./build/server/index.js", + "main": "./dist/server/index.js", "scripts": { - "clean": "rimraf ./build", + "clean": "rimraf ./dist", "dev": "vite", "build": "yarn run build:backend", "build:backend": "tsc -p ./tsconfig.server.json", diff --git a/services/torrent-webui/tsconfig.json b/services/torrent-webui/tsconfig.json index 1f6b863..393e71b 100644 --- a/services/torrent-webui/tsconfig.json +++ b/services/torrent-webui/tsconfig.json @@ -14,7 +14,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./build", /* Redirect output structure to the directory. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ diff --git a/services/torrent-webui/tsconfig.server.json b/services/torrent-webui/tsconfig.server.json index d95444c..7a537a4 100644 --- a/services/torrent-webui/tsconfig.server.json +++ b/services/torrent-webui/tsconfig.server.json @@ -3,7 +3,7 @@ "compilerOptions": { "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ - "outDir": "build/server", /* Redirect output structure to the directory. */ + "outDir": "dist/server", /* Redirect output structure to the directory. */ "sourceRoot": "src/server" /* Specify the location where debugger should locate TypeScript files instead of source locations. */ }, "exclude": [