Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

fix: broken Dockerfile and final start command

Andrew Bastin36903b338a3c
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 99a169287..5f21def62 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,5 +5,5 @@
"features": {
"ghcr.io/NicoVIII/devcontainer-features/pnpm:1": {}
},
- "postCreateCommand": "cp packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env && pnpm i"
+ "postCreateCommand": "cp .env.example .env && pnpm i"
}
diff --git a/Dockerfile b/Dockerfile
index 5f69b35b9..dda990af8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ COPY . .
RUN npm install -g pnpm
-RUN mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env
+RUN mv .env.example .env
RUN pnpm i --unsafe-perm=true
diff --git a/TRANSLATIONS.md b/TRANSLATIONS.md
index 1e74805a2..bb5b25553 100644
--- a/TRANSLATIONS.md
+++ b/TRANSLATIONS.md
@@ -11,10 +11,10 @@ if there is no existing translation, you can create a new one by following these
1. **[Fork the repository](https://github.com/hoppscotch/hoppscotch/fork).**
2. **Checkout the `i18n` branch for latest translations.**
3. **Create a new branch for your translation with base branch `i18n`.**
-4. **Create target language file in the [`/packages/hoppscotch-app/locales`](https://github.com/hoppscotch/hoppscotch/tree/main/packages/hoppscotch-app/locales) directory.**
-5. **Copy the contents of the source file [`/packages/hoppscotch-app/locales/en.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-app/locales/en.json) to the target language file.**
+4. **Create target language file in the [`/packages/hoppscotch-common/locales`](https://github.com/hoppscotch/hoppscotch/tree/main/packages/hoppscotch-common/locales) directory.**
+5. **Copy the contents of the source file [`/packages/hoppscotch-common/locales/en.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-common/locales/en.json) to the target language file.**
6. **Translate the strings in the target language file.**
-7. **Add your language entry to [`/packages/hoppscotch-app/languages.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-app/languages.json).**
+7. **Add your language entry to [`/packages/hoppscotch-common/languages.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-common/languages.json).**
8. **Save & commit changes.**
9. **Send a pull request.**
diff --git a/firebase.json b/firebase.json
index bf0af746e..4120bed02 100644
--- a/firebase.json
+++ b/firebase.json
@@ -5,9 +5,9 @@
},
"hosting": {
"predeploy": [
- "mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env && npm install -g pnpm && pnpm i && pnpm run generate"
+ "mv .env.example .env && npm install -g pnpm && pnpm i && pnpm run generate"
],
- "public": "packages/hoppscotch-app/dist",
+ "public": "packages/hoppscotch-web/dist",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
diff --git a/netlify.toml b/netlify.toml
index 5cdd35061..b57404ffa 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,7 +4,7 @@
[build]
base = "/"
- publish = "packages/hoppscotch-app/dist"
+ publish = "packages/hoppscotch-web/dist"
command = "npx pnpm i --store=node_modules/.pnpm-store && npx pnpm run generate"
[[headers]]
diff --git a/package.json b/package.json
index 79b40525c..1a2b18bfb 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"prepare": "husky install",
"dev": "pnpm -r do-dev",
"generate": "pnpm -r do-build-prod",
- "start": "http-server packages/hoppscotch-app/dist -p 3000",
+ "start": "http-server packages/hoppscotch-web/dist -p 3000",
"lint": "pnpm -r do-lint",
"typecheck": "pnpm -r do-typecheck",
"lintfix": "pnpm -r do-lintfix",
diff --git a/packages/hoppscotch-web/package.json b/packages/hoppscotch-web/package.json
index 2ff370fdc..5f5b20ef4 100644
--- a/packages/hoppscotch-web/package.json
+++ b/packages/hoppscotch-web/package.json
@@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"dev": "vite",
- "build": "vite build",
+ "build": "node --max_old_space_size=16384 ./node_modules/vite/bin/vite.js build",
"preview": "vite preview",
"lint": "eslint src --ext .ts,.js,.vue --ignore-path .gitignore .",
"lint:ts": "vue-tsc --noEmit",