Inject files into package instead of creating symlinks

- symlinks are still not working properly on windows (it fails deleting them because they're actually folders)
- IDE indexes the symlinked folders while they're there which slows things down
- any failure, like a file being in use, causes all symlinks to be left behind

Author: kichik

index.js

@@ -4,9 +4,9 @@
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
 const {addVendorHelper, removeVendorHelper, packRequirements} = require('./lib/zip');
+const {injectAllRequirements} = require('./lib/inject');
 const {installAllRequirements} = require('./lib/pip');
 const {pipfileToRequirements} = require('./lib/pipenv');
-const {linkAllRequirements, unlinkAllRequirements} = require('./lib/link');
 const {cleanup} = require('./lib/clean');
 
 BbPromise.promisifyAll(fse);
@@ -101,12 +101,11 @@ class ServerlessPythonRequirements {
       .then(pipfileToRequirements)
       .then(addVendorHelper)
       .then(installAllRequirements)
-      .then(packRequirements)
-      .then(linkAllRequirements);
+      .then(packRequirements);
 
     const after = () => BbPromise.bind(this)
       .then(removeVendorHelper)
-      .then(unlinkAllRequirements);
+      .then(injectAllRequirements);
 
     const invalidateCaches = () => {
       if (this.options.invalidateCaches) {

lib/inject.js

@@ -0,0 +1,73 @@
+const fse = require('fs-extra');
+const glob = require('glob-all');
+const get = require('lodash.get');
+const set = require('lodash.set');
+const path = require('path');
+const values = require('lodash.values');
+const zipper = require('zip-local');
+
+/**
+ * inject requirements into packaged application
+ * @param {string} requirementsPath requirements folder path
+ * @param {string} packagePath target package path
+ * @param {Object} options our options object
+ */
+function injectRequirements(requirementsPath, packagePath, options) {
+  const noDeploy = new Set(options.noDeploy || []);
+
+  const zip = zipper.sync.unzip(packagePath).lowLevel();
+
+  glob.sync([path.join(requirementsPath, '**')], {mark: true, dot: true}).forEach((file) => {
+    if (file.endsWith('/')) {
+      return;
+    }
+
+    if (noDeploy.has(file.split(/[-\\\/]/, 1)[0])) {
+      return;
+    }
+
+    zip.file(path.relative(requirementsPath, file), fse.readFileSync(file), {
+      date: new Date(0), // necessary to get the same hash when zipping the same content
+    });
+  });
+
+  const buff = zip.generate({
+    type: 'nodebuffer',
+    compression: 'DEFLATE',
+  });
+
+  fse.writeFileSync(packagePath, buff);
+}
+
+/**
+ * inject requirements into packaged application
+ */
+function injectAllRequirements() {
+  this.serverless.cli.log('Injecting required Python packages to package...');
+
+  if (this.serverless.service.package.individually) {
+    let doneModules = [];
+    values(this.serverless.service.functions)
+      .forEach((f) => {
+        if (!get(f, 'module')) {
+          set(f, ['module'], '.');
+        }
+        if (!doneModules.includes(f.module)) {
+          injectRequirements(
+            path.join('.serverless', f.module, 'requirements'),
+            f.package.artifact,
+            this.options
+          );
+          doneModules.push(f.module);
+        }
+      });
+  } else {
+    injectRequirements(
+      path.join('.serverless', 'requirements'),
+      this.serverless.service.package.artifact,
+      this.options
+    );
+  }
+}
+
+module.exports = {injectAllRequirements};