WIP - NPM & Composer Updates

oidc-wp · Nov 16, 2023 · c5001ef · c5001ef
1 parent 0676abe
commit c5001ef
Show file tree

Hide file tree

Showing 10 changed files with 6,617 additions and 9,685 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -4,7 +4,6 @@
   "dockerComposeFile": "../docker-compose.yml",
   "service": "app",
   "mounts": ["source=dind-var-lib-docker,target=/var/lib/docker,type=volume"],
-  //"workspaceMount": "source=${localWorkspaceFolder}/openid-connect-generic,target=/workspaces,type=bind,consistency=delegated",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
   "customizations": {
@@ -23,7 +22,7 @@
       "username": "wp_php"
     },
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "14"
+      "version": "16"
     },
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "dockerDashComposeVersion": "v2"

diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -21,7 +21,9 @@ COMPOSER_ALLOW_XDEBUG=0 COMPOSER_MEMORY_LIMIT=-1 composer install
 
 # Install NPM dependencies.
 cd "${PLUGIN_DIR}"
-npm ci
+if [ ! -d "node_modules" ]; then
+	npm ci
+fi
 
 # Setup the WordPress environment.
 cd "/app"

diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ phpcs.xml
 phpstan.neon
 phpunit.xml
 .phpunit.result.cache
+clover.xml
 
 # OS or Editor folders
 .DS_Store
@@ -31,7 +32,6 @@ nbproject
 *.sublime-project
 *.sublime-workspace
 .idea
-clover.xml
 
 # Dreamweaver added files
 _notes

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14
+16
diff --git a/composer.lock b/composer.lock
diff --git a/dev-cli b/dev-cli
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -54,8 +54,8 @@ services:
     ports:
       - 3306:3306
     environment:
-      MYSQL_DATABASE: wordpress
       MYSQL_ROOT_PASSWORD: password
+      MYSQL_DATABASE: wordpress
       MYSQL_USER: wordpress
       MYSQL_PASSWORD: wordpress
     volumes: