diff --git a/frontend-maven-plugin/src/it/node-version-manager/asdf/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/asdf/.bashrc deleted file mode 100644 index 35c38323f..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/asdf/.bashrc +++ /dev/null @@ -1,7 +0,0 @@ -export ASDF_DIR="$HOME/.asdf" -[ -s "$ASDF_DIR/asdf.sh" ] && \. "$ASDF_DIR/asdf.sh" # This loads asdf into the shell - -# disable global fnm if installed -fnm() { - exit 1; -} \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/asdf/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/asdf/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/asdf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-installed-version/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-installed-version/.bashrc deleted file mode 100644 index 960640755..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-installed-version/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -FNM_DIR=$HOME/.fnm -PATH=$FNM_DIR:$PATH -eval "$(fnm env --use-on-cd --shell bash)" diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-installed-version/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-installed-version/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-installed-version/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.bashrc deleted file mode 100644 index 9db6f1d89..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -FNM_DIR=$HOME/.fnm -PATH=$FNM_DIR:$PATH -eval "$(fnm env --use-on-cd --version-file-strategy=recursive --shell bash)" diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.nvmrc b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.nvmrc deleted file mode 100644 index 78a949591..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v20.15.1 \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/install-fnm.sh b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/install-fnm.sh deleted file mode 100755 index 175118d22..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/install-fnm.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# invoker env variables are not loaded yet -export HOME="$(dirname "$0")" - -export FNM_DIR="$HOME/.fnm"; -mkdir "$FNM_DIR" - -curl -fsSL https://fnm.vercel.app/install | bash -s -- --install-dir "$FNM_DIR" --skip-shell --force-install \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/invoker.properties b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/invoker.properties deleted file mode 100644 index b9a961e98..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/invoker.properties +++ /dev/null @@ -1,3 +0,0 @@ -invoker.environmentVariables.HOME=${basedir}/target/it/node-version-manager/fnm/with-modules -invoker.environmentVariables.FNM_DIR=${basedir}/target/it/node-version-manager/fnm/with-modules/.fnm -invoker.environmentVariables.XDG_DATA_HOME=${basedir}/target/it/node-version-manager/fnm/with-modules \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/pom.xml b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/pom.xml deleted file mode 100644 index 35d4b2549..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - com.github.eirslett - fnm-with-modules - 0 - pom - - - sub-module - - - - - - - - com.github.eirslett - frontend-maven-plugin - - @project.version@ - - - ${basedir} - - - - - - - - com.github.eirslett - frontend-maven-plugin - - - - install node - - install-node-and-npm - - - - - - - diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/prebuild.groovy b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/prebuild.groovy deleted file mode 100644 index 3ee4d10ce..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/prebuild.groovy +++ /dev/null @@ -1,3 +0,0 @@ -def p = "bash $basedir/install-fnm.sh".execute() -p.waitFor() -println p.text \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/package-lock.json b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/package-lock.json deleted file mode 100644 index 1a8b7d458..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/package-lock.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "example", - "version": "0.0.1", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "example", - "version": "0.0.1", - "dependencies": { - "classnames": "^2.3.2" - } - }, - "node_modules/classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" - } - }, - "dependencies": { - "classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" - } - } -} diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/package.json b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/package.json deleted file mode 100644 index e36bdbfca..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "example", - "version": "0.0.1", - "dependencies": { - "classnames": "^2.3.2" - }, - "scripts": { - "prebuild": "npm install" - } -} diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/pom.xml b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/pom.xml deleted file mode 100644 index e81c70dc9..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/sub-module/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - - com.github.eirslett - fnm-with-modules - 0 - - - fnm-with-modules-sub-module - pom - - - - - com.github.eirslett - frontend-maven-plugin - - - - npm ci - - npm - - - - ci - - - - - - - - diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/verify.groovy b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/verify.groovy deleted file mode 100644 index 9759bced0..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-modules/verify.groovy +++ /dev/null @@ -1,7 +0,0 @@ -import org.codehaus.plexus.util.FileUtils - -String buildLog = FileUtils.fileRead(new File(basedir, 'build.log')) -assert buildLog.contains('Installing node with FNM') : 'Node has been installed with a different version manager' - -assert !new File(basedir, 'node').exists() : "Node was installed bypassing version manager" -assert new File(basedir, 'sub-module/node_modules').exists() : "Node modules were not installed in the base directory" \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-no-version-file/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-no-version-file/.bashrc deleted file mode 100644 index 960640755..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-no-version-file/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -FNM_DIR=$HOME/.fnm -PATH=$FNM_DIR:$PATH -eval "$(fnm env --use-on-cd --shell bash)" diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-no-version-file/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-no-version-file/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-no-version-file/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/.bashrc deleted file mode 100644 index 960640755..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -FNM_DIR=$HOME/.fnm -PATH=$FNM_DIR:$PATH -eval "$(fnm env --use-on-cd --shell bash)" diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/prebuild.groovy b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/prebuild.groovy index 6b13e1495..56f85b9ba 100644 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/prebuild.groovy +++ b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-npm/prebuild.groovy @@ -1,4 +1,8 @@ // TODO share installation as test utils https://maven.apache.org/plugins/maven-invoker-plugin/integration-test-mojo.html#addTestClassPath def p = "bash $basedir/install-fnm.sh".execute() p.waitFor() -println p.text \ No newline at end of file +println p.text + +def p2 = "bash -c export XTESTX=test".execute() +p2.waitFor() +println p2.text \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-webpack/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-webpack/.bashrc deleted file mode 100644 index 960640755..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-webpack/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -FNM_DIR=$HOME/.fnm -PATH=$FNM_DIR:$PATH -eval "$(fnm env --use-on-cd --shell bash)" diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-webpack/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-webpack/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-webpack/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-yarn/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-yarn/.bashrc deleted file mode 100644 index 960640755..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-yarn/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -FNM_DIR=$HOME/.fnm -PATH=$FNM_DIR:$PATH -eval "$(fnm env --use-on-cd --shell bash)" diff --git a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-yarn/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/fnm/with-yarn/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/fnm/with-yarn/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/invoker.properties b/frontend-maven-plugin/src/it/node-version-manager/invoker.properties index 72a572b94..c18c59f18 100644 --- a/frontend-maven-plugin/src/it/node-version-manager/invoker.properties +++ b/frontend-maven-plugin/src/it/node-version-manager/invoker.properties @@ -1,4 +1,6 @@ # ignoring windows for now invoker.os.family=!windows,unix,mac invoker.environmentVariables.SHELL=bash -invoker.environmentVariables.FNM_DIR=$HOME \ No newline at end of file +invoker.environmentVariables.NVM_DIR=non-existing-dir +invoker.environmentVariables.FNM_DIR=non-existing-dir +invoker.environmentVariables.FNM_MULTISHELL_PATH=${basedir}/target/it/node-version-manager/fnm/with-npm/.fnm/.multishells \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/mise/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/mise/.bashrc deleted file mode 100644 index 6310712fe..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/mise/.bashrc +++ /dev/null @@ -1,7 +0,0 @@ -MISE_INSTALL_PATH=$HOME/.mise/bin/mise -eval "$($MISE_INSTALL_PATH activate bash)" - -# disable global fnm if installed -fnm() { - exit 1; -} \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/mise/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/mise/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/mise/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/mise/install-mise.sh b/frontend-maven-plugin/src/it/node-version-manager/mise/install-mise.sh index 2d32b796e..bf1ad2aae 100755 --- a/frontend-maven-plugin/src/it/node-version-manager/mise/install-mise.sh +++ b/frontend-maven-plugin/src/it/node-version-manager/mise/install-mise.sh @@ -7,7 +7,6 @@ export MISE_INSTALL_PATH="$HOME/.mise/bin/mise" mkdir "$MISE_INSTALL_PATH" echo "MISE_INSTALL_PATH set: $MISE_INSTALL_PATH" - export MISE_DEBUG=true curl https://mise.run | sh -echo "MISE has been installed" \ No newline at end of file +echo "MISE has been installed" diff --git a/frontend-maven-plugin/src/it/node-version-manager/no-version-manager/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/no-version-manager/.bashrc deleted file mode 100644 index 71368e0d0..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/no-version-manager/.bashrc +++ /dev/null @@ -1,4 +0,0 @@ -# disable global fnm if installed -fnm() { - exit 1; -} \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/no-version-manager/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/no-version-manager/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/no-version-manager/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/nvm/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/nvm/.bashrc deleted file mode 100644 index f52d8b7c7..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/nvm/.bashrc +++ /dev/null @@ -1,7 +0,0 @@ -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm into the shell - -# disable global fnm if installed -fnm() { - exit 1; -} \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/nvm/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/nvm/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/nvm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/frontend-maven-plugin/src/it/node-version-manager/nvs/.bashrc b/frontend-maven-plugin/src/it/node-version-manager/nvs/.bashrc deleted file mode 100644 index ae5506dac..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/nvs/.bashrc +++ /dev/null @@ -1,7 +0,0 @@ -export NVS_HOME="$HOME/.nvs" -[ -s "$NVS_HOME/nvs.sh" ] && \. "$NVS_HOME/nvs.sh" # This loads nvs into the shell - -# disable global fnm if installed -fnm() { - exit 1; -} \ No newline at end of file diff --git a/frontend-maven-plugin/src/it/node-version-manager/nvs/.gitignore b/frontend-maven-plugin/src/it/node-version-manager/nvs/.gitignore deleted file mode 100644 index 3c3629e64..000000000 --- a/frontend-maven-plugin/src/it/node-version-manager/nvs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules