Merge branch 'master' of github.com:codedge/statamic-magiclink

codedge · Mar 11, 2021 · 3e1e1f8 · 3e1e1f8
2 parents bb34bcc + d021224
commit 3e1e1f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -21,7 +21,7 @@ jobs:
               uses: actions/checkout@v2.3.4
 
             - name: Setup PHP
-              uses: shivammathur/setup-php@2.9.0
+              uses: shivammathur/setup-php@2.10.0
               with:
                   php-version: ${{ matrix.php }}
                   extensions: mbstring, intl, json, zip
@@ -32,7 +32,7 @@ jobs:
               run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
             - name: Cache dependencies
-              uses: actions/cache@v2.1.3
+              uses: actions/cache@v2.1.4
               with:
                   path: ~/.composer/cache/files
                   key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

diff --git a/composer.json b/composer.json
@@ -22,10 +22,10 @@
   "require": {
     "php": "^7.4|^8.0",
     "ext-json": "*",
-    "statamic/cms": "^3.0.0"
+    "statamic/cms": "^3.0.46"
   },
   "require-dev": {
-    "orchestra/testbench": "^5.0|^6.0",
+    "orchestra/testbench": "^6.13.0",
     "phpunit/phpunit": "^9.5"
   },
   "autoload": {

diff --git a/package.json b/package.json
@@ -14,13 +14,13 @@
     "laravel-mix": "^5.0.9",
     "laravel-mix-purgecss": "^4.2.0",
     "node-forge": ">=0.10.0",
-    "postcss-import": "^12.0.1",
+    "postcss-import": "^14.0.0",
     "postcss-nested": "^4.2.1",
     "postcss-preset-env": "^6.7.0",
     "vue-template-compiler": "^2.6.12"
   },
   "dependencies": {
     "axios": "^0.21.0",
-    "tailwindcss": "^1.8.10"
+    "tailwindcss": "^2.0.3"
   }
 }