diff --git a/.devcontainer.json b/.devcontainer.json new file mode 100644 index 0000000..4a28a20 --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1,9 @@ +{ + "name": "solidos", + "image": "mcr.microsoft.com/devcontainers/base:ubuntu", + "features": { + "ghcr.io/devcontainers/features/node:1": {} + }, + "postCreateCommand": "bash scripts/dev", + "forwardPorts": [3000] +} diff --git a/README.md b/README.md index 2378b5c..836dfc4 100644 --- a/README.md +++ b/README.md @@ -289,7 +289,9 @@ Before you start coding, please review our guidelines: ### SolidOS first time setup of code -Make sure you have the needed environment: [nvm for SolidOS](https://github.com/solidos/solidos/wiki/FAQs#setting-up-nvm-to-develop-for-solidos), npm, Node. If you have problems with node versions on the Apple M1 chip, in the [Troubleshooting SolidOS](https://github.com/solidos/solidos/wiki/Troubleshooting-SolidOS) you can find a solution. +If you use for instance VSCode, you can open this repository in its Dev Container. + +If not, make sure you have the needed environment: [nvm for SolidOS](https://github.com/solidos/solidos/wiki/FAQs#setting-up-nvm-to-develop-for-solidos), npm, Node. If you have problems with node versions on the Apple M1 chip, in the [Troubleshooting SolidOS](https://github.com/solidos/solidos/wiki/Troubleshooting-SolidOS) you can find a solution. ``` git clone https://github.com/solidos/solidos diff --git a/scripts/add b/scripts/add index 1737042..9aea58f 100755 --- a/scripts/add +++ b/scripts/add @@ -2,7 +2,7 @@ set -e unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm FOLDER=$1 @@ -158,6 +158,7 @@ echo ">>>>> ADDING REPO - $GIT_URL to $FOLDER" cd workspaces git clone $GIT_URL $FOLDER cd $FOLDER +nvm install nvm use --delete-prefix npm i cd ../.. diff --git a/scripts/dev b/scripts/dev new file mode 100755 index 0000000..26e4cfe --- /dev/null +++ b/scripts/dev @@ -0,0 +1,11 @@ +#!/bin/bash +set -e + +unset PREFIX npm_config_prefix +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + +nvm install +scripts/install +scripts/reset +echo Try something like: npm run watch-css diff --git a/scripts/install b/scripts/install index c017f5d..b6dfa32 100755 --- a/scripts/install +++ b/scripts/install @@ -2,7 +2,7 @@ set -e unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm nvm use --delete-prefix diff --git a/scripts/release b/scripts/release index 38bfc30..f74641e 100755 --- a/scripts/release +++ b/scripts/release @@ -2,7 +2,7 @@ set -e unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm function gitCheckoutMainOf { diff --git a/scripts/reset b/scripts/reset index f3ac8a1..7df1f4e 100755 --- a/scripts/reset +++ b/scripts/reset @@ -2,7 +2,7 @@ set -e unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm nvm use --delete-prefix diff --git a/scripts/start b/scripts/start index 102099e..47715e2 100755 --- a/scripts/start +++ b/scripts/start @@ -1,7 +1,7 @@ #!/bin/bash unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm npx lerna bootstrap --force-local diff --git a/scripts/start-css b/scripts/start-css old mode 100644 new mode 100755 index 351432a..0ad9627 --- a/scripts/start-css +++ b/scripts/start-css @@ -1,7 +1,7 @@ #!/bin/bash unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm npx lerna bootstrap --force-local diff --git a/scripts/start-nss b/scripts/start-nss old mode 100644 new mode 100755 index 47d632a..90325ea --- a/scripts/start-nss +++ b/scripts/start-nss @@ -1,7 +1,7 @@ #!/bin/bash unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm npx lerna bootstrap --force-local diff --git a/scripts/switch-branch b/scripts/switch-branch index 4309546..faa3031 100755 --- a/scripts/switch-branch +++ b/scripts/switch-branch @@ -2,7 +2,7 @@ set -e unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm nvm use --delete-prefix diff --git a/scripts/update-mashlib-repo.sh b/scripts/update-mashlib-repo.sh old mode 100644 new mode 100755 diff --git a/scripts/update-solid-panes-repo.sh b/scripts/update-solid-panes-repo.sh old mode 100644 new mode 100755 diff --git a/scripts/update-this-panes-repo.sh b/scripts/update-this-panes-repo.sh old mode 100644 new mode 100755 diff --git a/scripts/watch b/scripts/watch index d32058a..99c7e36 100755 --- a/scripts/watch +++ b/scripts/watch @@ -1,7 +1,7 @@ #!/bin/bash unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm nvm use --delete-prefix @@ -38,7 +38,7 @@ do fi # command="echo '---' && pwd && echo '---'" - command=". $HOME/.nvm/nvm.sh; cd workspaces/$package; nvm use --delete-prefix; $command" + command=". $NVM_DIR/nvm.sh; cd workspaces/$package; nvm use --delete-prefix; $command" packageCommands+=("$command") done diff --git a/scripts/watch-css b/scripts/watch-css old mode 100644 new mode 100755 index ede89e6..b345bf5 --- a/scripts/watch-css +++ b/scripts/watch-css @@ -1,7 +1,7 @@ #!/bin/bash unset PREFIX npm_config_prefix -export NVM_DIR="$HOME/.nvm" +export NVM_DIR="${NVM_DIR:-$HOME/.nvm}" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm nvm use --delete-prefix @@ -35,7 +35,7 @@ do fi # command="echo '---' && pwd && echo '---'" - command=". $HOME/.nvm/nvm.sh; cd workspaces/$package; nvm use --delete-prefix; $command" + command=". $NVM_DIR/nvm.sh; cd workspaces/$package; nvm use --delete-prefix; $command" packageCommands+=("$command") done