Merge pull request #868 from mwatts15/master

Copying npm scripts for embedded node

frontend-maven-plugin/src/it/node-provided-npm/package.json

@@ -3,5 +3,8 @@
   "version": "0.0.1",
   "dependencies": {
     "less": "~3.0.2"
+  },
+  "scripts": {
+    "prebuild": "npm install"
   }
 }

frontend-maven-plugin/src/it/node-provided-npm/verify.groovy

@@ -1,5 +1,6 @@
 assert new File(basedir, 'target/node').exists() : "Node was not installed in the custom install directory";
 assert new File(basedir, 'node_modules').exists() : "Node modules were not installed in the base directory";
+assert new File(basedir, 'target/node/npm').exists() : "npm was not copied to the node directory";
 
 import org.codehaus.plexus.util.FileUtils;
 

frontend-plugin-core/src/main/java/com/github/eirslett/maven/plugins/frontend/lib/NPMInstaller.java

@@ -82,6 +82,7 @@ public void install() throws InstallationException {
             if (!npmProvided() && !npmIsAlreadyInstalled()) {
                 installNpm();
             }
+            copyNpmScripts();
         }
     }
 
@@ -169,16 +170,6 @@ private void installNpm() throws InstallationException {
                 }
             }
 
-            // create a copy of the npm scripts next to the node executable
-            for (String script : Arrays.asList("npm", "npm.cmd")) {
-                File scriptFile = new File(npmDirectory, "bin" + File.separator + script);
-                if (scriptFile.exists()) {
-                    File copy = new File(installDirectory, script);
-                    FileUtils.copyFile(scriptFile, copy);
-                    copy.setExecutable(true);
-                }
-            }
-
             this.logger.info("Installed npm locally.");
         } catch (DownloadException e) {
             throw new InstallationException("Could not download npm", e);
@@ -189,6 +180,31 @@ private void installNpm() throws InstallationException {
         }
     }
 
+    private void copyNpmScripts() throws InstallationException{
+        File installDirectory = getNodeInstallDirectory();
+
+        File nodeModulesDirectory = new File(installDirectory, "node_modules");
+        File npmDirectory = new File(nodeModulesDirectory, "npm");
+        // create a copy of the npm scripts next to the node executable
+        for (String script : Arrays.asList("npm", "npm.cmd")) {
+            File scriptFile = new File(npmDirectory, "bin" + File.separator + script);
+            if (scriptFile.exists()) {
+                File copy = new File(installDirectory, script);
+                if (!copy.exists()) {
+                    try
+                    {
+                        FileUtils.copyFile(scriptFile, copy);
+                    }
+                    catch (IOException e)
+                    {
+                        throw new InstallationException("Could not copy npm", e);
+                    }
+                    copy.setExecutable(true);
+                }
+            }
+        }
+    }
+
     private File getNodeInstallDirectory() {
         File installDirectory = new File(this.config.getInstallDirectory(), NodeInstaller.INSTALL_PATH);
         if (!installDirectory.exists()) {