diff --git a/.gitignore b/.gitignore index ca8c929..c4604ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -.aws/credentials -.ssh/known_hosts* +**/.aws/credentials +**/.ssh/known_hosts* +**/.ssh/config_private *id_rsa* *id_ed25519* diff --git a/Brewfile b/Brewfile index 45199ee..b1fafae 100644 --- a/Brewfile +++ b/Brewfile @@ -182,7 +182,6 @@ brew "tor" brew "torsocks" brew "travis" brew "twilio/brew/twilio" -brew "typescript" brew "whois", link: true brew "wireguard-tools" brew "wireguard-go" diff --git a/npm/install_globals.sh b/npm/install_globals.sh index f5d550f..8aa8000 100755 --- a/npm/install_globals.sh +++ b/npm/install_globals.sh @@ -8,10 +8,10 @@ then curl https://get.volta.sh | bash -s -- --skip-setup fi -volta install node@lts volta install node@latest # remove when LTS officially supports arm64 volta install npm@6 # having issues with npm@7 and volta volta install yarn@1 +volta fetch node@lts # not native on M1 but good to have volta list node volta list npm @@ -25,16 +25,20 @@ packages=( @lhci/cli autoprefixer browserify + dtslint + dts-gen eslint express express-generator firebase-tools gatsby-cli gulp + gzip-size-cli json-server netlify-cli nodemon npm-check-updates + npm-name-cli pm2 postcss postcss-cli @@ -46,13 +50,14 @@ packages=( stylelint svgo terser + typescript vercel webpack webpack-cli ) for p in "${packages[@]}"; do - npm install --global "$p" || echo "$p not found" + volta run --no-yarn npm install --global "$p" || echo "$p not found" done volta list all diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index e8c8165..8d256d7 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -76,8 +76,8 @@ alias dcl="docker-compose logs -f" # # Node # -alias npm_clean="rm -rf node_modules && npm cache clean && npm install" -alias yarn_clean="rm -rf node_modules && yarn cache clean && yarn install" +alias fresh_npm="rm -rf node_modules package-lock.json && npm install" +alias fresh_yarn="rm -rf node_modules yarn.lock && yarn install" # # Hugo diff --git a/zsh/macos.zsh b/zsh/macos.zsh index dd546d7..af820ab 100644 --- a/zsh/macos.zsh +++ b/zsh/macos.zsh @@ -45,8 +45,11 @@ update() { brew cleanup echo -e "${YELLOW}Updating NPM/Yarn packages...${NC}" - volta run npm update --global - volta run yarn global upgrade + volta install node@latest + volta install npm@6 # having issues with npm@7 and volta + volta install yarn@1 + volta run --no-yarn --node latest --npm 6 npm update --global + volta run --node latest --yarn 1 yarn global upgrade echo -e "${YELLOW}Updating Ruby gems...${NC}" gem update --system diff --git a/zsh/plugins/zsh-syntax-highlighting b/zsh/plugins/zsh-syntax-highlighting index dffe304..6e0e950 160000 --- a/zsh/plugins/zsh-syntax-highlighting +++ b/zsh/plugins/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit dffe304567c86f06bf1be0fce200077504e79783 +Subproject commit 6e0e950154a4c6983d9e077ed052298ad9126144