Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into add-nvmrc
Browse files Browse the repository at this point in the history
  • Loading branch information
limarkxx committed Jul 24, 2023
2 parents 972429d + 9734c3a commit ca786f6
Show file tree
Hide file tree
Showing 8 changed files with 531 additions and 28 deletions.
5 changes: 5 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM alpine:3.18
RUN apk update && apk add git php82 nodejs npm php82-openssl php82-json php82-phar php82-mbstring libxslt openssh
RUN ln -s /usr/bin/php82 /usr/bin/php
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && php composer-setup.php && mv composer.phar /usr/bin/composer && php -r "unlink('composer-setup.php');"
ENV COMPOSER_ALLOW_SUPERUSER=1
16 changes: 16 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "Node.js,TypeScript,and PHP",
"build": {
// Path is relative to the devcontainer.json file.
"dockerfile": "Dockerfile"
},
"customizations": {
"vscode": {
"extensions": [
"amodio.tsl-problem-matcher"
]
}
}
}
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"amodio.tsl-problem-matcher"
]
}
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@
"dist": true // set this to false to include "dist" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off"
"typescript.tsc.autoDetect": "off",
"intelephense.files.exclude": ["**"],
"intelephense.references.exclude": ["**"],
"intelephense.rename.exclude": ["**"],
"intelephense.files.associations": []
}
3 changes: 2 additions & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ vsc-extension-quickstart.md
**/.eslintrc.json
**/*.map
**/*.ts
.nvmrc
.nvmrc
.devcontainer/**
Loading

0 comments on commit ca786f6

Please sign in to comment.