WIP - NPM & Composer Updates

.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": {
@@ -19,31 +18,9 @@
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
-    "ghcr.io/devcontainers/features/common-utils:2": {
-      "username": "wp_php"
-    },
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "14"
-    },
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "dockerDashComposeVersion": "v2"
-    },
-    "ghcr.io/devcontainers/features/git:1": {},
-    "ghcr.io/devcontainers/features/github-cli:1": {},
-    "./local-features/wp-cli": "latest",
     "./local-features/welcome-message": "latest"
   },
 
-  "overrideFeatureInstallOrder": [
-    "ghcr.io/devcontainers/features/common-utils",
-    "ghcr.io/devcontainers/features/node",
-    "ghcr.io/devcontainers/features/docker-in-docker",
-    "ghcr.io/devcontainers/features/git",
-    "ghcr.io/devcontainers/features/github-cli",
-    "./local-features/wp-cli",
-    "./local-features/welcome-message"
-  ],
-
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [8080, 8081, 8026, 3306],
 

.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"

.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

.nvmrc

@@ -1 +1 @@
-14
+16