newspack-scripts 4.3.7 → 4.3.8-alpha.2

package/.circleci/config.yml

@@ -2,9 +2,26 @@ version: 2
 jobs:
   build:
     docker:
-      - image: 'circleci/node:latest'
+      - image: "circleci/node:latest"
     steps:
       - checkout
+      - run:
+          name: Install nvm and use the node version defined in .nvmrc
+          command: |
+            # https://support.circleci.com/hc/en-us/articles/360051656632-Swap-node-version-on-CircleCI-convenience-image
+            set +e
+            wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
+            export NVM_DIR="$HOME/.nvm"
+            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+            [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+            nvm install
+            nvm use
+            # https://stackoverflow.com/a/61823737/3772847
+            NODE_DIR=$(dirname $(which node))
+            echo "export PATH=$NODE_DIR:\$PATH" >> $BASH_ENV
+      - run:
+          name: Check node version (should match the version set in project's .nvmrc file)
+          command: node --version
       - run:
           name: install
           command: npm install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newspack-scripts",
-  "version": "4.3.7",
+  "version": "4.3.8-alpha.2",
   "description": "",
   "bin": {
     "newspack-scripts": "./bin/newspack-scripts.js"

package/scripts/build.js

@@ -4,29 +4,6 @@ const spawn = require("cross-spawn");
 const modules = require("./utils/modules");
 const utils = require("./utils/index.js");
 
-if (process.env.CI) {
-  // HACK: For some reason, `@automattic/calypso-build` is erroring with a cryptic
-  // `HookWebpackError: error:0308010C:digital envelope routines::unsupported` error.
-  // Reinstalling the package in the newspack-scripts directory fixes the issue. No idea how.
-  // Downside is longer build times, but maybe this will be fixed in the future.
-  utils.log("Reinstalling @automattic/calypso-build…");
-  const calypsoReinstallResult = spawn.sync(
-    "cd node_modules/newspack-scripts && npm i @automattic/calypso-build --legacy-peer-deps",
-    [],
-    {
-      shell: true,
-      cwd: modules.rootDirectory,
-      stdio: "inherit",
-    }
-  );
-  if (calypsoReinstallResult.status === 0) {
-    utils.log("Calypso reinstall successful.");
-  } else {
-    utils.log("Calypso reinstall failed:");
-    console.log(calypsoReinstallResult);
-  }
-}
-
 utils.log("Starting to build…");
 
 const buildResult = spawn.sync(process.execPath, [modules.calypsoBuild], {

package/src/commands/set_node_version.yml

@@ -0,0 +1,20 @@
+description: >
+  Set node version to the one defined in the .nvmrc file.
+steps:
+  - run:
+      name: Install nvm and use the node version defined in .nvmrc
+      command: |
+        # https://support.circleci.com/hc/en-us/articles/360051656632-Swap-node-version-on-CircleCI-convenience-image
+        set +e
+        wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash
+        export NVM_DIR="$HOME/.nvm"
+        [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+        [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+        nvm install
+        nvm use
+        # https://stackoverflow.com/a/61823737/3772847
+        NODE_DIR=$(dirname $(which node))
+        echo "export PATH=$NODE_DIR:\$PATH" >> $BASH_ENV
+  - run:
+      name: Check node version (should match the version set in project's .nvmrc file)
+      command: node --version

package/src/executors/default.yml

@@ -1,11 +1,8 @@
-description: >
-  This is a sample executor using Docker and Node.
+description: PHP executor
 docker:
   - image: "cimg/php:<<parameters.tag>>"
 parameters:
   tag:
-    default: 8.0-browsers
-    description: >
-      Pick a specific circleci/php image variant:
-      https://hub.docker.com/r/cimg/php/tags
+    default: 8.0-node
+    description: PHP image version
     type: string

package/src/jobs/build-distributable.yml

@@ -11,6 +11,7 @@ parameters:
 
 steps:
   - checkout_with_workspace
+  - set_node_version
   - run:
       name: Install rsync
       command: sudo apt-get update && sudo apt-get install rsync

package/src/jobs/build.yml

@@ -5,15 +5,21 @@ executor: default
 
 steps:
   - checkout_with_workspace
+  - set_node_version
   - restore_cache:
-      key: v1-npm-{{ checksum "package.json" }}-{{checksum "package-lock.json" }}
+      key: v1-npm-{{ checksum "package.json" }}-{{checksum "package-lock.json" }}-{{ checksum ".nvmrc" }}
   # https://medium.com/@mdsky1986/caching-node-dependencies-when-using-npm-ci-89fe3f46404a
   - run:
       name: Install node dependencies
       # --legacy-peer-deps flag should be removed once https://github.com/Automattic/newspack-plugin/issues/1218 is resolved
-      command: "[ ! -d node_modules ] && npm ci --legacy-peer-deps --loglevel warn --yes || echo package.json and package-lock.json unchanged. Using cache."
+      command: |
+        if test -d "node_modules"; then
+          echo "package.json and package-lock.json unchanged. Using cache."
+        else
+          npm ci --legacy-peer-deps --loglevel warn --yes
+        fi
   - save_cache:
-      key: v1-npm-{{ checksum "package.json" }}-{{checksum "package-lock.json" }}
+      key: v1-npm-{{ checksum "package.json" }}-{{checksum "package-lock.json" }}-{{ checksum ".nvmrc" }}
       paths:
         - node_modules
   - persist_to_workspace: