Merge branch 'release/2.x' into v2.5.7

.boltrc.js

@@ -28,7 +28,7 @@ const imageFixtureDirs = globby
   .sync(
     path.join(
       __dirname,
-      './packages/components/**/fixtures/**/*.{jpg,jpeg,png}',
+      './packages/components/**/fixtures/**/*.{jpg,jpeg,png,svg}',
     ),
   )
   .map(file => path.dirname(file));
@@ -37,14 +37,15 @@ const imageSets = [];
 imageFixtureDirs.forEach(fixturePath => {
   imageSets.push({
     base: fixturePath,
-    glob: '*.{jpg,jpeg,png}',
+    glob: '*.{jpg,jpeg,png,svg}',
     dist: path.join(adjustRelativePath(siteConfig.wwwDir), 'fixtures'),
   });
 });
 
 const nonImageFixtures = globby.sync([
   './packages/components/**/fixtures/**/*',
   '!./packages/components/**/fixtures/**/*.{jpg,jpeg,png}',
+  './packages/components/**/fixtures/videos/**/*',
 ]);
 const itemsToCopy = [];
 
@@ -59,19 +60,12 @@ nonImageFixtures.forEach(fixturePath => {
     to: path.join(
       __dirname,
       adjustRelativePath(siteConfig.wwwDir),
-      'fixtures/',
+      'fixtures/videos',
     ),
     flatten: true,
   });
 });
 
-siteConfig.copy.forEach(item => {
-  itemsToCopy.push({
-    from: path.join(__dirname, adjustRelativePath(item.from)),
-    to: path.join(__dirname, adjustRelativePath(item.to)),
-    flatten: item.flatten,
-  });
-});
 
 module.exports = {
   wwwDir: adjustRelativePath(siteConfig.wwwDir),
@@ -80,7 +74,6 @@ module.exports = {
   components: {
     global: [...allComponentPackages, '@bolt/analytics-autolink'],
   },
-  alterTwigEnv: siteConfig.alterTwigEnv,
   images: {
     sets: imageSets,
   },

.eslintignore

@@ -6,6 +6,9 @@
 packages/uikit-workshop/**
 **/dist/**
 packages/generators/**
+packages/uikit-critical-css-webpack-plugin/**
+packages/uikit-prerenderer/**
+packages/uikit-prerender-spa-plugin/**
 
 # compiled via build scripts -- need to exclude from validation rules
 packages/components/bolt-icons/src/icons/**

.gitignore

@@ -26,6 +26,7 @@ vendor
 tests_output
 
 /www
+dist*
 
 # Logs
 *.log

.npmrc

@@ -0,0 +1 @@
+puppeteer_skip_chromium_download=true

.travis.yml

@@ -15,15 +15,9 @@ addons:
 before_install:
   - openssl aes-256-cbc -K $encrypted_4537e53f71e7_key -iv $encrypted_4537e53f71e7_iv -in scripts/bolt-design-system-bot.private-key.pem.enc -out scripts/bolt-design-system-bot.private-key.pem -d
   - nvm install # version lifted from `.nvmrc`
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.9.4
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0
   - export PATH="$HOME/.yarn/bin:$PATH"
 
-services:
-  - docker
-
-addons:
-  chrome: stable
-
 # see more conditions: https://docs.travis-ci.com/user/conditions-v1
 # Stages run sequentially; the jobs in them run in parallel
 stages:
@@ -45,19 +39,34 @@ jobs:
 
     - stage: Prep
       name: 'Smoke Tests: Unit Tests (Jest)'
-      install: yarn run setup
+      install:
+        - travis_retry yarn run setup:full
+        - yarn workspace @bolt/website prep # creates data and manifest files
       before_script: ./scripts/check-run-queue.js 'Unit'
-      script: yarn run test
+      script:
+        - travis_retry yarn test:js --bail --maxWorkers=1
+        # - yarn test:js:quick --maxWorkers=1 # running both `test:js` as comparison; remove or comment out this or other one eventually
+        - yarn test:php
+        - yarn test:monorepo --maxWorkers=1
+        - yarn test:pkgs --ignore=@bolt/uikit-workshop --ignore=@bolt/build-tools --ignore=@bolt/build-tools--test-multi-lang
       after_success: ./scripts/check-run-success.js 'Unit'
       after_failure: ./scripts/check-run-failure.js 'Unit'
 
+    - stage: Prep
+      name: 'Smoke Tests: Build Tools'
+      install: 'npm run setup'
+      before_script: ./scripts/check-run-queue.js 'Build Tools'
+      script: yarn run test:build-tools
+      after_success: ./scripts/check-run-success.js 'Build Tools'
+      after_failure: ./scripts/check-run-failure.js 'Build Tools'
+
     - stage: Prep
       name: 'Build Drupal Lab'
       script:
         - composer global require hirak/prestissimo
         - cd example-integrations/drupal-lab
         - composer install --prefer-dist --no-dev
-        - cd web/themes/bolt-starter && yarn
+        - cd web/themes/bolt-starter && yarn --force
         - yarn run build
         - yarn run test # run Jest tests on the FE build that just compiled
         - cd ../../../ && composer run build # finish running through the remainder of the Drupal Lab build
@@ -76,19 +85,17 @@ jobs:
 
     - stage: Test Live Site
       name: 'Nightwatch End-to-End'
-      install: yarn run setup
-      before_script: ./scripts/check-run-in-progress.js 'Nightwatch'
+      install: travis_retry yarn run setup
+      before_script: travis_retry ./scripts/check-run-in-progress.js 'Nightwatch'
       script:
-        - export NOW_URL=$(./scripts/get-latest-deploy.js)
+        - travis_retry export NOW_URL=$(./scripts/get-latest-deploy.js)
         - echo "The Now URL is $NOW_URL"
-        - time curl -sSf "$NOW_URL" > /dev/null # warming up site
-        - sleep 60
+        - travis_retry time curl -sSf "$NOW_URL" > /dev/null # warming up site
         - travis_wait yarn run test:e2e:full
-        - sleep 60
-        - ./packages/testing/testing-nightwatch/nightwatch-report-results.js
+        - travis_retry ./packages/testing/testing-nightwatch/nightwatch-report-results.js
       after_success:
-        - ./scripts/deploy-branch-alias.js
-        - ./scripts/deploy-tagged-release.js
+        - travis_retry ./scripts/deploy-branch-alias.js
+        - travis_retry ./scripts/deploy-tagged-release.js
 
     - stage: Test Live Site
       name: 'Ensure site is live'