Update example build phases, upgrade dev tooling/tests, fix build (#63)

.github/workflows/e2e-test-bootstrap-apply.yml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 

.nvmrc

@@ -0,0 +1 @@
+v20

.prettierignore

@@ -1,2 +1,3 @@
 coverage/
-node_modules/
+node_modules/
+package*.json

bootstrap.sh

@@ -162,7 +162,8 @@ fi
 if [ "$APPLE_CMD_LINE_TOOLS_INSTALLING" = "yes" ]; then
     log "WAIT! Akinizer bootstrapping is ALMOST complete. Apple Command Line Tools needs to finish installing, then you can run 'gulp' in the same directory as your Akinizer gulpfile."
 else
-    log "Akinizer bootstraping complete! Run 'gulp' in the same directory as your Akinizer gulpfile."
+    log "Akinizer bootstraping complete! Run 'gulp' in the same directory as your Akinizer gulpfile:"
+    log ". $HOME/.nvm/nvm.sh && cd $AK_INSTALL_ROOT/examples/ && gulp"
 fi
 
 cd examples/

examples/gulpfile.js

@@ -12,8 +12,8 @@ createTaskTree(
         require('./phases/installPython'),
         require('./phases/installTerm'),
         require('./phases/installDotfiles'),
-        require('./phases/installDocker'),
-        // require('./phases/installGUIApps')
+        // require('./phases/installDocker'),
+        require('./phases/installGUIApps'),
     ]),
     exports,
 );

examples/phases/installDotfiles.js

@@ -29,7 +29,7 @@ module.exports = definePhase('installDotfiles', ACTIONS.RUN_PHASES, [
                 // Clone the actual dotfiles
                 t('clone', {
                     actionCommands: [
-                        `echo "👉 See ${dotfilesRepoUrl} for additional instructions"`,
+                        `echo "👉👉👉 See ${dotfilesRepoUrl} for additional instructions"`,
                         `${yadmBin} clone ${dotfilesRepoUrl}`,
                     ],
                 }),
@@ -40,16 +40,6 @@ module.exports = definePhase('installDotfiles', ACTIONS.RUN_PHASES, [
                         `${yadmBin} remote set-url origin ${dotfilesRepoUrlSSH}`,
                     ],
                 }),
-
-                // Render alt files
-                t('renderAlts', {
-                    actionCommands: [`${yadmBin} alt`],
-                }),
-
-                // Decrypt files
-                t('decrypt', {
-                    actionCommands: [`${yadmBin} decrypt`],
-                }),
             ],
             {
                 targetOpts: {

examples/phases/installGUIApps.js

@@ -4,12 +4,18 @@ module.exports = definePhase(
     'installMacGuiApps',
     ACTIONS.INSTALL_PACKAGES,
     [
-        'deluge',
-        'google-chrome',
-        'homebrew/cask-drivers/logitech-options',
-        'iterm2',
+        // 'deluge',
+        // 'google-chrome',
+        // 'homebrew/cask-drivers/logitech-options',
+        // 'iterm2',
+
+        // Prevent the Mac from sleeping
         'keepingyouawake',
-        'spectacle',
+
+        // Window management
+        'rectangle',
+
+        // Code editor
         'visual-studio-code',
     ],
     {

examples/phases/installTerm.js

@@ -32,7 +32,7 @@ module.exports = definePhase('installTerm', ACTIONS.INSTALL_PACKAGES, [
             binDir: `${OMZ_DIR}/themes/`,
             binSymlink: 'spaceship.zsh-theme',
             cloneDir: SPACESHIP_THEME_DIR,
-            ref: 'c38183d654c978220ddf123c9bdb8e0d3ff7e455',
+            ref: 'be826cbe2bb11a0675dd71f548ff1396608da7ea',
             repoUrl: 'https://github.com/denysdovhan/spaceship-prompt.git',
         },
         skipAction: () => fileExists(SPACESHIP_THEME_DIR),

jest.config.js

@@ -34,6 +34,10 @@ module.exports = {
     // A list of reporter names that Jest uses when writing coverage reports
     coverageReporters: ['clover', 'json', 'lcov', 'text', 'text-summary'],
 
+    // Force jest to use a downgraded version of prettier
+    // See https://github.com/jestjs/jest/issues/14305
+    prettierPath: require.resolve('prettier-2'),
+
     // An object that configures minimum threshold enforcement for coverage results
     // coverageThreshold: undefined,