From 2e6b262f29d2f391f66a1d0fad19480856397936 Mon Sep 17 00:00:00 2001 From: Rishabh Saxena Date: Mon, 7 Jun 2021 16:23:18 +0530 Subject: [PATCH] Revert specific handling at setup for macs with apple chips (#4591) --- app/client/package.json | 1 - app/client/start-https.sh | 8 -------- contributions/ClientSetup.md | 1 - 3 files changed, 10 deletions(-) diff --git a/app/client/package.json b/app/client/package.json index 430c1e6f98..099390880b 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -152,7 +152,6 @@ "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "BROWSER=none EXTEND_ESLINT=true REACT_APP_ENVIRONMENT=DEVELOPMENT HOST=dev.appsmith.com craco start", - "start-m1": "BROWSER=none EXTEND_ESLINT=true REACT_APP_ENVIRONMENT=DEVELOPMENT HOST=0.0.0.0 craco start", "build": "./build.sh", "build-local": "craco --max-old-space-size=4096 build --config craco.build.config.js", "build-staging": "REACT_APP_ENVIRONMENT=STAGING craco --max-old-space-size=4096 build --config craco.build.config.js", diff --git a/app/client/start-https.sh b/app/client/start-https.sh index fdf492df30..259c14286b 100755 --- a/app/client/start-https.sh +++ b/app/client/start-https.sh @@ -87,14 +87,6 @@ case "${uname_out}" in " ;; Darwin*) machine=Mac - # workaround for apple silicon until host.docker.interal works as expected - if [[ "$(uname -m)" = "arm64" ]]; then - # if no server was passed - if [[ -z $1 ]]; then - server_proxy_pass="http://"$(ipconfig getifaddr en0)":8080" - fi - client_proxy_pass="http://"$(ipconfig getifaddr en0)":3000" - fi echo " Starting nginx for MacOS... " diff --git a/contributions/ClientSetup.md b/contributions/ClientSetup.md index 13da4c58cf..cfcefa1104 100644 --- a/contributions/ClientSetup.md +++ b/contributions/ClientSetup.md @@ -71,7 +71,6 @@ On your development machine, please ensure that: - By default your client app points to the local api server - `http://host.docker.internal:8080` for MacOS or `http://localhost:8080` for Linux. Your page will load with errors if you don't have the api server running on your local system. To setup the api server on your local system please follow the instructions [here](https://github.com/appsmithorg/appsmith/blob/release/contributions/ServerSetup.md) - In case you are unable to setup the api server on your local system, you can also [use Appsmith's staging API server](#if-you-would-like-to-hit-a-different-appsmith-server). -- In case you are using a M1 chip Macbook please run the client with `yarn start-m1`. #### If yarn start throws mismatch node version error