feat: support npm style entrypoint mapping

eik-lib · Jun 29, 2020 · 5578f16 · 5578f16
1 parent f5eca5e
commit 5578f16
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 32 deletions.
diff --git a/classes/publish/package/index.js b/classes/publish/package/index.js
@@ -39,8 +39,19 @@ module.exports = class PublishApp {
         this.version = version;
         this.level = level;
         this.map = map;
+
         this.js = js;
+        if (typeof js === 'string') {
+            this.js = {
+                './index.js': js,
+            };
+        }
         this.css = css;
+        if (typeof css === 'string') {
+            this.css = {
+                './index.css': css,
+            };
+        }
         this.dryRun = dryRun;
         this.out = out;
         this.path = isAbsolute(out) ? out : join(cwd, out);

diff --git a/classes/publish/package/tasks/check-bundle-sizes.js b/classes/publish/package/tasks/check-bundle-sizes.js
@@ -12,26 +12,30 @@ module.exports = class CheckBundleSizes extends Task {
         this.log.debug('Checking bundle file sizes');
         try {
             if (js) {
-                const path = isAbsolute(js) ? js : join(cwd, js);
-                const jsEntrypointFile = compressedSize(
-                    fs.readFileSync(path, 'utf8'),
-                );
-                this.log.debug(
-                    `  ==> JavaScript entrypoint size: ${bytes(
-                        jsEntrypointFile,
-                    )}`,
-                );
+                for (const [key, val] of Object.entries(js)) {
+                    const path = isAbsolute(val) ? val : join(cwd, val);
+                    const jsEntrypointFile = compressedSize(
+                        fs.readFileSync(path, 'utf8'),
+                    );
+                    this.log.debug(
+                        `  ==> JavaScript entrypoint size (${key} => ${val}): ${bytes(
+                            jsEntrypointFile,
+                        )}`,
+                    );
+                }
             }
             if (css) {
-                const path = isAbsolute(css) ? css : join(cwd, css);
-                const cssEntrypointFile = compressedSize(
-                    fs.readFileSync(path, 'utf8'),
-                );
-                this.log.debug(
-                    `  ==> CSS entrypoint size: ${bytes(
-                        cssEntrypointFile,
-                    )}`,
-                );
+                for (const [key, val] of Object.entries(css)) {
+                    const path = isAbsolute(val) ? val : join(cwd, val);
+                    const cssEntrypointFile = compressedSize(
+                        fs.readFileSync(path, 'utf8'),
+                    );
+                    this.log.debug(
+                        `  ==> CSS entrypoint size (${key} => ${val}): ${bytes(
+                            cssEntrypointFile,
+                        )}`,
+                    );
+                }
             }
         } catch (err) {
             throw new Error(`Failed to check bundle sizes: ${err.message}`);

diff --git a/classes/publish/package/tasks/check-if-already-published.js b/classes/publish/package/tasks/check-if-already-published.js
@@ -2,7 +2,7 @@
 
 'use strict';
 
-const { join, basename } = require('path');
+const { join } = require('path');
 const {
     compareHashes,
     fetchPackageMeta,
@@ -47,10 +47,14 @@ module.exports = class CheckIfAlreadyPublished extends Task {
         try {
             const localFiles = [join(path, './eik.json')];
             if (js) {
-                localFiles.push(join(path, basename(js)));
+                for (const key of Object.keys(js)) {
+                    localFiles.push(join(path, key));
+                }
             }
             if (css) {
-                localFiles.push(join(path, basename(css)));
+                for (const key of Object.keys(css)) {
+                    localFiles.push(join(path, key));
+                }
             }
             localHash = await calculateFilesHash(localFiles);
         } catch (err) {

diff --git a/classes/publish/package/tasks/create-zip-file.js b/classes/publish/package/tasks/create-zip-file.js
@@ -28,21 +28,23 @@ module.exports = class CreateZipFile extends Task {
 
         if (js) {
             try {
-                const jsPathSrc = isAbsolute(js) ? js : join(cwd, js);
-                const jsPathDest = join(path, basename(js));
-                copyFileSync(jsPathSrc, jsPathDest);
-                filesToZip.push(basename(jsPathDest));
+                for (const [key, val] of Object.entries(js)) {
+                    const jsPathSrc = isAbsolute(val) ? val : join(cwd, val);
+                    copyFileSync(jsPathSrc, join(path, key));
+                    filesToZip.push(key);
+                }
             } catch (err) {
                 throw new Error(`Failed to zip JavaScripts: ${err.message}`);
             }
         }
 
         if (css) {
             try {
-                const cssPathSrc = isAbsolute(css) ? css : join(cwd, css);
-                const cssPathDest = join(path, basename(css));
-                copyFileSync(cssPathSrc, cssPathDest);
-                filesToZip.push(basename(cssPathDest));
+                for (const [key, val] of Object.entries(css)) {
+                    const cssPathSrc = isAbsolute(val) ? val : join(cwd, val);
+                    copyFileSync(cssPathSrc, join(path, key));
+                    filesToZip.push(key);
+                }
             } catch (err) {
                 throw new Error(`Failed to zip CSS: ${err.message}`);
             }

diff --git a/classes/publish/package/tasks/dry-run.js b/classes/publish/package/tasks/dry-run.js
@@ -2,16 +2,24 @@
 
 'use strict';
 
+const {join} = require('path');
 const Task = require('./task');
 
 module.exports = class DryRun extends Task {
     async process(incoming = {}, outgoing = {}) {
-        const { dryRun, path, zipFile } = incoming;
+        const { dryRun, path, zipFile, js, css } = incoming;
         if (dryRun) {
             outgoing.files = [
                 { pathname: path, type: 'temporary directory' },
                 { pathname: zipFile, type: 'package archive' },
             ]
+
+            for (const key of Object.keys(js)) {
+                outgoing.files.push({ pathname: join(path, key), type: 'package file' })
+            }
+            for (const key of Object.keys(css)) {
+                outgoing.files.push({ pathname: join(path, key), type: 'package file' })
+            }
         }
 
         return outgoing;

diff --git a/classes/publish/package/tasks/validate-input.js b/classes/publish/package/tasks/validate-input.js
@@ -53,11 +53,11 @@ module.exports = class ValidateInput extends Task {
             );
         }
 
-        if (js && typeof js !== 'string') {
+        if (js && typeof js !== 'string' && typeof js !== 'object') {
             throw new ValidationError('Parameter "js" is not valid');
         }
 
-        if (css && typeof css !== 'string') {
+        if (css && typeof css !== 'string' && typeof css !== 'object') {
             throw new ValidationError('Parameter "css" is not valid');
         }