add ability to run deploy on static client

README.md

@@ -24,8 +24,10 @@ All of the following options are required and overridable via the CLI.  For exam
 | `name`                  | `null` |
 | `version`               | `version` property in `package.json` |
 | `skyuxVersion`          | `_requested.spec` in the `package.json` file in `./node_modules/blackbaud-skyux2/` |
+| `logSkyuxVersion`       | `true`  | 
 | `azureStorageAccount`   | `null`  |
 | `azureStorageAccessKey` | `null`  |
 | `azureStorageTableName` | "spa"   |
+| `isStaticClient`        | `false` |
 
 `null` values are typically supplied by the CI process.

lib/assets.js

@@ -29,10 +29,19 @@ const getEmittedAssets = () => glob
  * Returns an array of assets (files + metadata).
  * @name getDistAssets
  * @param {boolean} includeContent
+ * @param {boolean} isStaticClient
  * @returns {Array} assets
  */
-const getDistAssets = (includeContent) => {
-  const metadataPath = path.join(dist, 'metadata.json');
+const getDistAssets = (includeContent, isStaticClient) => {
+  let metadataPath = path.join(dist, 'metadata.json');
+
+  if (isStaticClient) {
+    // This should just return the single project bundle
+    const bundle = glob.sync(path.join(dist, 'bundles', '*.js'));
+    if (bundle.length) {
+      metadataPath = bundle[0];
+    }
+  }
 
   if (fs.existsSync(metadataPath)) {
     const metadata = require(metadataPath);

lib/deploy.js

@@ -6,8 +6,8 @@ const assets = require('./assets');
 const azure = require('./azure');
 
 module.exports = (settings) => {
-  const assetsWithContent = assets.getDistAssets(true);
-  const assetsWithoutContent = assets.getDistAssets(false);
+  const assetsWithContent = assets.getDistAssets(true, settings.isStaticClient);
+  const assetsWithoutContent = assets.getDistAssets(false, settings.isStaticClient);
   const assetsEmitted = assets.getEmittedAssets();
   const assetsCombined = assetsWithContent.concat(assetsEmitted);
 

lib/settings.js

@@ -56,18 +56,20 @@ function getSkyuxVersion() {
  * @name getSettings
  * @returns {Object} settings
  */
-function getSettings(argv) {
+function getSettings(argv = {}) {
 
   const packageConfig = getLocalConfig('package.json');
   const skyuxConfig = getLocalConfig('skyuxconfig.json');
+  const logSkyuxVersion = argv.logSkyuxVersion !== 'false' && argv.logSkyuxVersion !== false;
 
   const defaults = {
     name: '',
     version: '',
-    skyuxVersion: getSkyuxVersion(),
+    skyuxVersion: logSkyuxVersion ? getSkyuxVersion() : '',
     packageConfig: packageConfig,
     skyuxConfig: skyuxConfig,
-    azureStorageTableName: 'spa'
+    azureStorageTableName: 'spa',
+    isStaticClient: false
   };
 
   // Merges in all packageConfig, really only care about name + version

lib/utils.js

@@ -45,9 +45,11 @@ function validate(assets, settings) {
     'name',
     'version',
     'skyuxVersion',
+    'logSkyuxVersion',
     'azureStorageAccount',
     'azureStorageAccessKey',
-    'azureStorageTableName'
+    'azureStorageTableName',
+    'isStaticClient'
   ];
   let success = true;
 

test/lib-assets.spec.js

@@ -106,6 +106,63 @@ describe('skyux-deploy lib assets', () => {
       expect(assetsWithoutContent[0].content).not.toBeDefined();
     });
 
+    it('should evaluate static client assets', () => {
+      const readFileSync = fs.readFileSync;
+      spyOn(glob, 'sync').and.returnValue([
+        path.join(process.cwd(), 'dist', 'bundles', 'test.umd.js')
+      ]);
+      spyOn(fs, 'existsSync').and.returnValue(true);
+      spyOn(fs, 'readFileSync').and.callFake((file, options) => {
+        if (file.indexOf('custom-name.js') > -1) {
+          return 'my-custom-content3';
+        } else {
+          return readFileSync(file, options);
+        }
+      });
+
+      let stubs = {};
+      stubs[path.join(process.cwd(), 'dist', 'bundles', 'test.umd.js')] = [
+        {
+          name: 'custom-name.js'
+        }
+      ];
+
+      const lib = proxyquire('../lib/assets', stubs);
+      const assetsWithContent = lib.getDistAssets(true, true);
+
+      expect(fs.existsSync).toHaveBeenCalledWith(
+        '/Users/tim.pepper/Development/bb_repos/skyux-deploy/dist/bundles/test.umd.js'
+      );
+      expect(assetsWithContent[0].content).toEqual('my-custom-content3');
+    });
+
+    it('should evaluate static client assets with no bundle', () => {
+      const readFileSync = fs.readFileSync;
+      spyOn(glob, 'sync').and.returnValue([]);
+      spyOn(fs, 'existsSync').and.returnValue(false);
+      spyOn(fs, 'readFileSync').and.callFake((file, options) => {
+        if (file.indexOf('custom-name.js') > -1) {
+          return 'my-custom-content3';
+        } else {
+          return readFileSync(file, options);
+        }
+      });
+
+      let stubs = {};
+      stubs[path.join(process.cwd(), 'dist', 'bundles', 'test.umd.js')] = [
+        {
+          name: 'custom-name.js'
+        }
+      ];
+
+      const lib = proxyquire('../lib/assets', stubs);
+      const assetsWithContent = lib.getDistAssets(true, true);
+
+      expect(fs.existsSync).toHaveBeenCalledWith(
+        '/Users/tim.pepper/Development/bb_repos/skyux-deploy/dist/metadata.json'
+      );
+      expect(assetsWithContent.length).toEqual(0);
+    });
   });
 
   describe('getEmittedAssets', () => {

test/lib-settings.spec.js

@@ -59,7 +59,7 @@ describe('skyux-deploy lib settings', () => {
     );
   });
 
-  function setupPackageJson(_requested) {
+  function setupPackageJson(_requested, argv) {
     const skyuxInstalledPath = path.join(
       process.cwd(),
       'node_modules',
@@ -81,12 +81,36 @@ describe('skyux-deploy lib settings', () => {
     });
 
     const lib = require('../lib/settings');
-    const settings = lib.getSettings();
+    const settings = lib.getSettings(argv);
 
     expect(logger.error).not.toHaveBeenCalled();
     return settings;
   }
 
+  it('should return the default skyux version if logSkyuxVersion is set to false', () => {
+    const version = 'custom-skyux-version-npm3';
+    const settings = setupPackageJson(
+      {
+        spec: version
+      },
+      {
+        logSkyuxVersion: false
+      });
+    expect(settings.skyuxVersion).toEqual('');
+  });
+
+  it('should return the default skyux version if logSkyuxVersion is set to `false`', () => {
+    const version = 'custom-skyux-version-npm3';
+    const settings = setupPackageJson(
+      {
+        spec: version
+      },
+      {
+        logSkyuxVersion: 'false'
+      });
+    expect(settings.skyuxVersion).toEqual('');
+  });
+
   it('should read the skyux version if it is installed (npm < 5)', () => {
     const version = 'custom-skyux-version-npm3';
     const settings = setupPackageJson({