From fad1204ef87db5bdfb3b422b31078c2aa8300100 Mon Sep 17 00:00:00 2001 From: mayurkumarp Date: Wed, 6 Jul 2022 12:55:43 +0530 Subject: [PATCH 01/38] Removed webpack and added Vite --- package.json | 8 +- packages/client/.babelrc | 4 - packages/client/{index.ejs => index.html} | 1 + packages/client/package.json | 17 +- packages/client/src/components/Chip/Chip.jsx | 24 - packages/client/src/wdyr.ts | 2 +- .../spells/windows/ContentObject.tsx | 3 +- packages/client/tsconfig.json | 14 +- packages/client/vite.config.js | 76 + packages/client/webpack.common.js | 110 - packages/client/webpack.dev.js | 39 - packages/client/webpack.prod.js | 44 - packages/core/.babelrc | 38 - packages/core/package.json | 16 +- packages/core/src/controls/DisplayControl.js | 29 - .../core/src/controls/RunButtonControl.js | 32 - .../core/src/controls/TextInputControl.js | 50 - .../{DisplayControl.js => DisplayControl.jsx} | 0 packages/core/tsconfig.json | 7 +- packages/core/vite.build.js | 25 + packages/core/webpack.common.js | 68 - packages/core/webpack.dev.js | 13 - packages/core/webpack.prod.js | 28 - packages/server/.env | 2 +- packages/server/redis/docker-compose.yaml | 2 +- .../server/src/entities/CreateSpellHandler.ts | 2 +- packages/server/src/routes/spells/runSpell.ts | 2 +- tsconfig.json | 4 +- yarn.lock | 3569 ++++++++--------- 29 files changed, 1772 insertions(+), 2457 deletions(-) delete mode 100644 packages/client/.babelrc rename packages/client/{index.ejs => index.html} (96%) delete mode 100644 packages/client/src/components/Chip/Chip.jsx create mode 100644 packages/client/vite.config.js delete mode 100644 packages/client/webpack.common.js delete mode 100644 packages/client/webpack.dev.js delete mode 100644 packages/client/webpack.prod.js delete mode 100644 packages/core/.babelrc delete mode 100644 packages/core/src/controls/DisplayControl.js delete mode 100644 packages/core/src/controls/RunButtonControl.js delete mode 100644 packages/core/src/controls/TextInputControl.js rename packages/core/src/plugins/displayPlugin/{DisplayControl.js => DisplayControl.jsx} (100%) create mode 100644 packages/core/vite.build.js delete mode 100644 packages/core/webpack.common.js delete mode 100644 packages/core/webpack.dev.js delete mode 100644 packages/core/webpack.prod.js diff --git a/package.json b/package.json index dc02b080f..67617bfae 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,9 @@ }, "scripts": { "start:core": "lerna exec --scope @thothai/thoth-core -- yarn start", - "dev": "NODE_OPTIONS=--max-old-space-size=8192 concurrently \"cd packages/server && docker-compose up\" \"cd packages/server/weaviate && docker-compose up\" \"cd packages/server/redis && docker-compose up\" \"yarn start:core\" \"sleep 15 && yarn run dev:server\" \"sleep 15 && yarn start:client\" \"sleep 15 && yarn run db:seed\" ", - "dev-windows": "cross-env NODE_OPTIONS=--max-old-space-size=8192 concurrently \"cd packages/server && docker-compose up\" \"cd packages/server/weaviate && docker-compose up\" \"cd packages/server/redis && docker-compose up\" \"yarn run dev:server\" \"yarn start:core\" yarn start:client\" yarn run db:seed\" ", + "dev": "NODE_OPTIONS=--max-old-space-size=8192 && NODE_TLS_REJECT_UNAUTHORIZED='0' && (cd packages/server && sudo docker-compose up -d) && (cd packages/server/weaviate && sudo docker-compose up -d) && (cd packages/server/redis && sudo docker-compose up -d) && concurrently \"yarn start:core\" \"sleep 15 && yarn run dev:server\" \"sleep 15 && yarn start:client\" \"sleep 15 && yarn run db:seed\" ", + "dev-windows": "cross-env NODE_OPTIONS=--max-old-space-size=8192 yarn run dev-windows-script", + "dev-windows-script": "(cd packages/server && docker-compose up -d) && (cd packages/server/weaviate && docker-compose up -d) && (cd packages/server/redis && docker-compose up -d) && concurrently \"yarn run dev:server\" \"yarn start:core\" yarn start:client\" yarn run db:seed\" ", "dev:client": "concurrently \"yarn start:core\" \"sleep 1 && yarn start:client\"", "dev:server": "lerna exec --scope @thothai/thoth-server -- yarn run dev", "db:seed": "npx sequelize-cli db:seed:all --url 'postgres://thoth:thoth_default_pw@localhost:5432/thoth'", @@ -49,7 +50,8 @@ "cross-env": "^7.0.3", "lerna": "^4.0.0", "react": "^17.0.2", - "rimraf": "^3.0.2" + "rimraf": "^3.0.2", + "rollup-plugin-node-builtins": "^2.1.2" }, "dependencies": { "@discordjs/opus": "^0.7.0", diff --git a/packages/client/.babelrc b/packages/client/.babelrc deleted file mode 100644 index b611bbc85..000000000 --- a/packages/client/.babelrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "presets": ["@babel/env", "@babel/react", "@babel/preset-typescript"], - "plugins": ["@babel/plugin-proposal-class-properties"] -} diff --git a/packages/client/index.ejs b/packages/client/index.html similarity index 96% rename from packages/client/index.ejs rename to packages/client/index.html index 65edfe543..1015723c1 100644 --- a/packages/client/index.ejs +++ b/packages/client/index.html @@ -30,6 +30,7 @@
+