From 6a23601e71642a4cc6765fbfeb22fe9d771d2f44 Mon Sep 17 00:00:00 2001 From: Christian van der Loo Date: Wed, 2 Nov 2022 22:03:42 -0400 Subject: [PATCH] build: stripped out old esbuild configs, replaced in server --- packages/server/esbuild-webpack.config.js | 21 -------------------- packages/server/package.json | 16 +++------------ packages/server/project.json | 24 +++++++++-------------- packages/types/project.json | 2 +- packages/utils/project.json | 2 +- packages/web/project.json | 2 +- 6 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 packages/server/esbuild-webpack.config.js diff --git a/packages/server/esbuild-webpack.config.js b/packages/server/esbuild-webpack.config.js deleted file mode 100644 index 7732c11..0000000 --- a/packages/server/esbuild-webpack.config.js +++ /dev/null @@ -1,21 +0,0 @@ -const { merge } = require("webpack-merge") -const nodeExternals = require("webpack-node-externals") - -module.exports = (config, context) => { - return merge(config, { - target: "node", - externals: [nodeExternals()], - module: { - rules: [ - { - test: /\.ts$/i, - loader: "esbuild-loader", - options: { - loader: "ts", - target: "node18", - }, - }, - ], - }, - }) -} diff --git a/packages/server/package.json b/packages/server/package.json index 4a72a41..3d0ad21 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -9,10 +9,7 @@ "@types/express-fileupload": "^1.2.2", "@typescript-eslint/eslint-plugin": "^5.30.5", "@typescript-eslint/parser": "^5.30.5", - "esbuild-loader": "^2.19.0", - "eslint": "^8.19.0", - "node-ts": "^5.1.2", - "nodemon": "^2.0.18" + "eslint": "^8.19.0" }, "dependencies": { "@commitlint/cli": "^17.0.0", @@ -23,12 +20,7 @@ "@filecoin-shipyard/lotus-client-schema": "^4.2.0", "@ipld/dag-pb": "^2.1.17", "@jscutlery/semver": "^2.27.1", - "@nrwl/express": "^14.4.2", - "@nrwl/js": "^14.4.3", - "@nrwl/linter": "^14.3.6", - "@nrwl/react": "^14.3.5", "@nx-tools/nx-docker": "^3.0.4", - "@nxext/vite": "^14.1.0", "@openapitools/openapi-generator-cli": "2.5.2", "@trumbitta/nx-plugin-openapi": "^1.11.0", "@types/express": "4.17.14", @@ -40,9 +32,10 @@ "@wanews/nx-esbuild": "^0.26.1", "body-parser": "^1.20.0", "dotenv": "^16.0.1", + "esbuild": "^0.15.12", "eslint": "~8.25.0", "eslint-plugin-import": "2.26.0", - "express": "4.18.2", + "express": "^4.18.2", "express-fileupload": "^1.4.0", "firebase-admin": "^11.0.0", "ipfs-http-client": "56.0.3", @@ -51,13 +44,10 @@ "jest": "29.1.2", "jest-environment-jsdom": "^29.1.2", "morgan": "^1.10.0", - "node-fetch": "3.2.10", "request": "^2.88.2", "ts-jest": "29.0.3", "ts-node": "~10.9.1", "uuidv4": "^6.2.13", - "vite": "^3.1.6", - "vite-plugin-eslint": "1.8.1", "winston": "^3.8.0" } } diff --git a/packages/server/project.json b/packages/server/project.json index 5a4a186..53c96af 100644 --- a/packages/server/project.json +++ b/packages/server/project.json @@ -5,25 +5,19 @@ "projectType": "application", "targets": { "build": { - "executor": "@nrwl/node:webpack", - "outputs": ["{options.outputPath}"], + "executor": "nx:run-commands", "options": { - "outputPath": "dist/packages/server", - "main": "packages/server/src/init.ts", - "tsConfig": "packages/server/tsconfig.lib.json", - "externalDependencies": [ - "fetch", - "utf-8-validate", - "bufferutil", - "electron" - ], - "webpackConfig": "packages/server/esbuild-webpack.config.js" + "command": "esbuild packages/server/src/init.ts --external:electron --bundle --platform=node --outfile=dist/packages/server/main.js" } }, "serve": { - "executor": "@nrwl/node:node", + "executor": "nx:run-commands", "options": { - "buildTarget": "@crate/server:build" + "commands": [ + "nx run @crate/server:build --watch", + "npx nodemon --watch dist/packages/server dist/packages/server/main.js" + ], + "parallel": true } }, "docker": { @@ -57,7 +51,7 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/packages/server"], + "outputs": ["{workspaceRoot}/coverage/packages/server"], "options": { "jestConfig": "packages/server/jest.config.ts", "passWithNoTests": true diff --git a/packages/types/project.json b/packages/types/project.json index 9e31af0..fd7cfe9 100644 --- a/packages/types/project.json +++ b/packages/types/project.json @@ -23,7 +23,7 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/packages/types"], + "outputs": ["{workspaceRoot}/coverage/packages/types"], "options": { "jestConfig": "packages/types/jest.config.ts", "passWithNoTests": true diff --git a/packages/utils/project.json b/packages/utils/project.json index 72febe9..2042aad 100644 --- a/packages/utils/project.json +++ b/packages/utils/project.json @@ -23,7 +23,7 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/packages/utils"], + "outputs": ["{workspaceRoot}/coverage/packages/utils"], "options": { "jestConfig": "packages/utils/jest.config.ts", "passWithNoTests": true diff --git a/packages/web/project.json b/packages/web/project.json index 428e67c..b59460f 100644 --- a/packages/web/project.json +++ b/packages/web/project.json @@ -70,7 +70,7 @@ }, "test": { "executor": "@nrwl/jest:jest", - "outputs": ["coverage/packages/web"], + "outputs": ["{workspaceRoot}/coverage/packages/web"], "options": { "jestConfig": "packages/web/jest.config.ts", "passWithNoTests": true -- 2.51.2