Merge branch 'hotfix/v0.7.1-alpha'

jcchikikomori · Apr 27, 2022 · 14de99f · 14de99f · vercel · Apr 27, 2022
2 parents c59b6c7 + c6d04b3
commit 14de99f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -58,9 +58,9 @@ ARG XDEBUG_REMOTE_HOST=localhost
 ARG XDEBUG_REMOTE_PORT=9001
 ARG XDEBUG_REMOTE_LOG
 
-# Install xdebug 
-RUN pecl install xdebug \
-    && docker-php-ext-enable xdebug
+# Install xdebug
+RUN pecl install xdebug || true
+RUN docker-php-ext-enable xdebug
 
 RUN echo "error_reporting = E_ALL" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
     && echo "display_startup_errors = On" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \

diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
+    "build": "yarn run build:js && yarn run build:css",
     "build:js": "webpack --progress --mode=production",
     "watch:js": "webpack --progress --watch --mode=development",
     "build:css": "node-sass --omit-source-map-url --importer node_modules/node-sass-import assets/_css/index.scss assets/css/index.css",
@@ -27,4 +28,4 @@
     "node-sass-import": "^2.0.1",
     "webpack-cli": "^4.9.2"
   }
-}
+}