From ab65e32477c1c71c0476e3790b4477953943b7b8 Mon Sep 17 00:00:00 2001 From: Alex Villarreal <716334+alexvy86@users.noreply.github.com> Date: Wed, 15 Jan 2025 09:55:31 -0600 Subject: [PATCH] chore(tinylicious): Clean up cruft configs (#23557) ## Description Deletes obsolete config/setup files in the tinylicious folder. Tinylicious doesn't have a Docker setup nor a VSCode workspace that requires it to have its own dev container and/or VSCode settings. --- .../packages/tinylicious/.devcontainer/.zshrc | 98 ------------------- .../tinylicious/.devcontainer/Dockerfile | 78 --------------- .../.devcontainer/devcontainer.json | 30 ------ .../packages/tinylicious/.dockerignore | 4 - .../packages/tinylicious/.vscode/launch.json | 28 ------ 5 files changed, 238 deletions(-) delete mode 100644 server/routerlicious/packages/tinylicious/.devcontainer/.zshrc delete mode 100644 server/routerlicious/packages/tinylicious/.devcontainer/Dockerfile delete mode 100644 server/routerlicious/packages/tinylicious/.devcontainer/devcontainer.json delete mode 100644 server/routerlicious/packages/tinylicious/.dockerignore delete mode 100644 server/routerlicious/packages/tinylicious/.vscode/launch.json diff --git a/server/routerlicious/packages/tinylicious/.devcontainer/.zshrc b/server/routerlicious/packages/tinylicious/.devcontainer/.zshrc deleted file mode 100644 index d62b46f99689..000000000000 --- a/server/routerlicious/packages/tinylicious/.devcontainer/.zshrc +++ /dev/null @@ -1,98 +0,0 @@ -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH - -# Path to your oh-my-zsh installation. - export ZSH="/home/node/.oh-my-zsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="random" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in ~/.oh-my-zsh/plugins/* -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=( - git docker npm node vscode docker-compose zsh-syntax-highlighting zsh-autosuggestions -) - -source $ZSH/oh-my-zsh.sh - -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# ssh -# export SSH_KEY_PATH="~/.ssh/rsa_id" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" diff --git a/server/routerlicious/packages/tinylicious/.devcontainer/Dockerfile b/server/routerlicious/packages/tinylicious/.devcontainer/Dockerfile deleted file mode 100644 index c0c40c8680bc..000000000000 --- a/server/routerlicious/packages/tinylicious/.devcontainer/Dockerfile +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (c) Microsoft Corporation and contributors. All rights reserved. -# Licensed under the MIT License. - -# DisableDockerDetector "No feasible secure solution for OSS repos yet" - -FROM node:14.19.1 - -# Avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive - -# Configure apt and install packages -RUN apt-get update \ - && apt-get -y install --no-install-recommends apt-utils 2>&1 \ - # - # Verify git and needed tools are installed - && apt-get install -y git procps \ - # - # Remove outdated yarn from /opt and install via package - # so it can be easily updated via apt-get upgrade yarn - && rm -rf /opt/yarn-* \ - && rm -f /usr/local/bin/yarn \ - && rm -f /usr/local/bin/yarnpkg \ - && apt-get install -y curl apt-transport-https lsb-release \ - && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \ - && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ - && apt-get update \ - && apt-get -y install --no-install-recommends yarn \ - # - # Install eslint globally - && npm install -g eslint \ - # - # zsh - # https://jilles.me/badassify-your-terminal-and-shell/ - # https://billgrant.io/post/2019-05-05-vsremote/ - && apt-get install -y zsh \ - wget \ - vim \ - # - # Install Docker CE CLI - && apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \ - && curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null \ - && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \ - && apt-get update \ - && apt-get install -y docker-ce-cli \ - # - # Install Docker Compose - && curl -sSL "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \ - && chmod +x /usr/local/bin/docker-compose \ - # Add sudo support for the non-root user - && apt-get install -y sudo \ - && echo node ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/node\ - && chmod 0440 /etc/sudoers.d/node \ - # - # Clean up - && apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - -# Fluid specific dependencies -RUN apt-get update && apt-get install -y \ - python \ - make \ - git \ - curl \ - g++ - -# terminal colors with xterm -ENV TERM xterm - -# Switch back to dialog for any ad-hoc use of apt-get -ENV DEBIAN_FRONTEND=dialog - -USER node - -RUN sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" \ - && git clone https://github.com/zsh-users/zsh-syntax-highlighting ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting \ - && git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions -COPY .zshrc /home/node/.zshrc diff --git a/server/routerlicious/packages/tinylicious/.devcontainer/devcontainer.json b/server/routerlicious/packages/tinylicious/.devcontainer/devcontainer.json deleted file mode 100644 index 0152c3910a34..000000000000 --- a/server/routerlicious/packages/tinylicious/.devcontainer/devcontainer.json +++ /dev/null @@ -1,30 +0,0 @@ -// See https://aka.ms/vscode-remote/devcontainer.json for format details. -{ - "name": "Node.js 10", - "dockerFile": "Dockerfile", - - "service": "development", - - // "workspaceFolder": "/workspace", - - "settings": { - "terminal.integrated.shell.linux": "/usr/bin/zsh" - }, - - // Uncomment the next line if you want to publish any ports. - "appPort": [3000], - - // Uncomment the next line if you want to add in default container specific settings.json values - // "settings": { "workbench.colorTheme": "Quiet Light" }, - - // Uncomment the next line to run commands after the container is created. - // "postCreateCommand": "yarn install", - - "runArgs": ["-v", "/var/run/docker.sock:/var/run/docker.sock", "-u", "node"], - - "extensions": ["dbaeumer.vscode-eslint", "ms-vscode.vscode-typescript-tslint-plugin"], - - "remote.extensionKind": { - "ms-azuretools.vscode-docker": "workspace" - } -} diff --git a/server/routerlicious/packages/tinylicious/.dockerignore b/server/routerlicious/packages/tinylicious/.dockerignore deleted file mode 100644 index 8aa0b461b656..000000000000 --- a/server/routerlicious/packages/tinylicious/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -dist -node_modules -*.tsbuildinfo -storage \ No newline at end of file diff --git a/server/routerlicious/packages/tinylicious/.vscode/launch.json b/server/routerlicious/packages/tinylicious/.vscode/launch.json deleted file mode 100644 index 071447138342..000000000000 --- a/server/routerlicious/packages/tinylicious/.vscode/launch.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "attach", - "name": "Attach", - "address": "localhost", - "port": 9229, - "restart": true, - "sourceMaps": true, - "localRoot": "${workspaceFolder}", - "remoteRoot": "/usr/src/server", - "outFiles": ["${workspaceFolder}/dist/**/*.js"], - "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"], - }, - { - "type": "node", - "request": "launch", - "name": "Launch Program", - "runtimeArgs": ["-r", "ts-node/register"], - "args": ["${workspaceFolder}/src/index.ts"], - }, - ], -}