Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanton committed Jan 5, 2022
2 parents dbf73f9 + 259b849 commit 559fe86
Show file tree
Hide file tree
Showing 2,360 changed files with 18,577 additions and 591,587 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

370 changes: 0 additions & 370 deletions .gitattributes

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

Expand Down
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

Expand Down
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/roadmap-item.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Roadmap item
about: Create a new high-level roadmap story
title: ''
labels: epic
assignees: Stanton

---

# What

// What needs to change

# Why

// Why should we do it? Does it link to a Jadu Directive? Is it an identified OKR objective?

# Done when

## Must

- [ ] What tasks or stories (issues) must be delivered for this roadmap item to be achieved

## Should

- [ ] What other tasks or stories *could* be delivered as part of this work
66 changes: 66 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Run CodeQL analysis

on:
push:
branches: [develop, 7.0.9-hotfix, CMS/flatcap-july, CMS/flatcap, master, poc-symfony-upgrade, release/9.0.3-symfony, release/9.0.3, release/9.0.4, release/10.3.1, dom-text]
pull_request:
# The branches below must be a subset of the branches above
branches: [develop]
schedule:
- cron: '0 21 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
31 changes: 31 additions & 0 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Run JS test suite

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run build --if-present
- run: npm test
45 changes: 45 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# This is a basic workflow to help you get started with Actions

name: Run PHP test suite

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the develop branch
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Validate composer.json and composer.lock
run: composer validate --strict

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Install dependencies
run: composer install --prefer-dist --no-progress

- name: PHPUnit tests
uses: php-actions/phpunit@v3
with:
configuration: phpunit.xml.dist
memory_limit: 256M
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/dist
/tests/logs
/css
libs/livereload-js
libs/phantomcss
pulsar.zip
/shots
/fonts
Expand All @@ -36,3 +34,4 @@ pulsar.zip
/.vscode
/ngrok
/.vagrant
/phpunit
2 changes: 1 addition & 1 deletion .hound.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
scss:
config_file: .scss-lint.yml
exclude:
- "libs/**/*"
- "js/libs/**/*"
- "node_modules/**/*"
- "vendor/**/*"

Expand Down
49 changes: 0 additions & 49 deletions .travis.yml

This file was deleted.

55 changes: 55 additions & 0 deletions .travis.yml.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
language: php

dist: trusty

cache:
directories:
- vendor
- $HOME/.composer/cache

php:
- 7.2
- 7.3
- 7.4

before_install:
- npm install -g [email protected]

before_script:
- npm install -g grunt-cli
- npm install
- mkdir -p dist/js
- gem update --system && gem install scss_lint

install:
- composer self-update
- composer install --prefer-dist --no-interaction
- composer require phpunit/phpunit
- if [[ $TRAVIS_PHP_VERSION > '7.1' ]]; then wget -O ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit https://phar.phpunit.de/phpunit-7.phar; fi
- if [[ $TRAVIS_PHP_VERSION > '7.1' ]]; then chmod 755 ~/.phpenv/versions/$(phpenv version-name)/bin/phpunit; fi
- XDEBUG_MODE=coverage ./vendor/bin/phpunit --coverage-text

script:
- ./vendor/bin/phpunit
- grunt build
- npm test
- npm run coverage

after_success:
- grunt deploy
- bash <(curl -s https://codecov.io/bash)

sudo: required
addons:
chrome: stable

deploy:
provider: releases
api_key:
secure: q/5L4w87ve2sbEgQOLqIHGrXqBBTV7hCFg8koh+RjovnBl/z6ZDucQMmI5SAf1GEVzh30XXhYvVnpO6DQ0vJw99TESiIFyECW45lswHzW40bZ9jqgm969Xtrw97ifdZLWMmRxQp9q/OgYejPA1UpYLKNJTWJ9ddcl9BTWPRImdYAM//mVbImp7GnKWZlX1MLow443J4d/uWeW9kOmqUCp5gTmGJGHe4inTq+ooFuL5ceSaq26J7yAvQuzP1BYdwSV7yphVrP+jmfd3enayxQJrozcZ618bHscYy1Fa6r3ruM1s9vR7FQ5vDmR9SiEpikjDQ8TqCI5z64LI9x0MGB81ivb8o3z+hD7lFacSqUNjoBvytKAEKVc+//8EvQU07Rlw2N0yp31aBfByZyH5ZKQ4NkmLdMeeLrzo+FmlFX/3g7M0ah2X9TJJ4Qr1h7XTOyuqrVwx67AbSCXdg8+45+M+VONIy9+Yjj9NCwvNEtDbNCU/F0Hfb+0cX2YdCjY6eDmIGRUEylxj7OUrcZQ88vYZow6WidCEfNQTaqsn6cL+wg1gPT/KjxkL2c7YMHVRO64AADa0ppMBqgza1EWpRXsmuhCQSF2pkOeX7aqJ3CR5YEJYCZ4dn94aSyeBipny5DH1MWgeP3hAKf32iOtuGk0wFN/nllTqASLK3nrg6nmPU=
file: pulsar.zip
skip_cleanup: true
on:
tags: true
all_branches: true

61 changes: 61 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

⚠️ denotes a breaking change that may require changes to be made within Jadu products.

## [Unreleased](https://github.com/jadu/pulsar/issues?q=is%3Aclosed+milestone%3AUnreleased)
### Added
- Add CHANGELOG.md file [#1352](https://github.com/jadu/pulsar/pull/1352)
- Add ability for textareas to use common appended/prepended options [#1314](https://github.com/jadu/pulsar/pull/1314)
- Add table caption styles [#1361](https://github.com/jadu/pulsar/pull/1361)
- Add `.form__group--tight` modifier to reduce vertical spacing between form groups [#1360](https://github.com/jadu/pulsar/pull/1360)
- Add CK Editor focus styles (previously scratched in product) [#1370](https://github.com/jadu/pulsar/pull/1370)

### Changed
- Sticky sidebar behaviour (used by XFP) is now more consistent and visually stable regardless of main content height [#1326](https://github.com/jadu/pulsar/pull/1326)
- Update homebrew installation script path in makefile [#1362](https://github.com/jadu/pulsar/pull/1362)
- Form helper outputted error text is now prepended with a visually hidden `Error:` to improve SR experience [#1364](https://github.com/jadu/pulsar/pull/1364)
- ⚠️ Products which use non-helper form components will need to implement this change in their markup
- Grunt sass now uses dart-sass insteasd of the deprecated libsass. [#1351](https://github.com/jadu/pulsar/pull/1351)
- ⚠️ There is a change to how colour values are interpreted which may need a change within product sass files
- `html.datatable` and `form.repeater` helpers now correctly add `scope="col"` to TH elements
- Retire use of Travis and move CI testing to GitHub Actions, this is to address new limits imposed by Travis on open source projects which meant builds had stopped

### Fixed
- Progress bar with warning state and a visible value failed colour contrast [#1350](https://github.com/jadu/pulsar/pull/1350)
- `form__group--top` modifier class now works when control label element is a `span` [#1330](https://github.com/jadu/pulsar/pull/1330)
- Form labels for choice block components are now properly aligned vertically with the inputs [#1332](https://github.com/jadu/pulsar/pull/1332)
- Mobile `form.compound` label spacing [#1366](https://github.com/jadu/pulsar/pull/1366)
- Stop 'more' navigation menu triggering when only one menu item is out of bounds [#1394](https://github.com/jadu/pulsar/pull/1394)
- Fix infinite loop in 'more' navigation menu [#1381](https://github.com/jadu/pulsar/pull/1381)
- Prevent situations where the last item in a piano list would be obscured [#1385](https://github.com/jadu/pulsar/pull/1385)

### Security
- Stop (old) tooltip.js from directly interpreting selectors passed through options [#1359](https://github.com/jadu/pulsar/pull/1359)
- Add escaping on values which are extracted from DOM notes then output in the view [#1331](https://github.com/jadu/pulsar/pull/1331)
- Upgrade datatables.net-responsive-dt from 2.2.3 to 2.2.6 [#1336](https://github.com/jadu/pulsar/pull/1336)
- Upgrade datatables.net-responsive from 2.2.3 to 2.2.6 [#1367](https://github.com/jadu/pulsar/pull/1367)
= Upgrade datatables.net-responsive from 2.2.6 to 2.2.7 [#1372](https://github.com/jadu/pulsar/pull/1372)
- Upgrade datatables from 1.10.22 to 1.10.23 [#1346](https://github.com/jadu/pulsar/pull/1346)
- Upgrade datatables.net-buttons-dt from 1.6.1 to 1.6.5 [#1356](https://github.com/jadu/pulsar/pull/1356)
- Upgrade elliptic from 6.5.3 to 6.5.3 [#1388](https://github.com/jadu/pulsar/pull/1388)
- Upgrade grunt from 1.0.3 to 1.3.0 [#1399](https://github.com/jadu/pulsar/pull/1399)
- Upgrade handlebars from 4.7.6 to 4.7.7 [#1396](https://github.com/jadu/pulsar/pull/1396)
- Upgrade hosted-git-info from 2.7.1 to 2.8.9 [#1400](https://github.com/jadu/pulsar/pull/1400)
- Upgrade lodash from 4.17.20 to 4.17.21 [#1398](https://github.com/jadu/pulsar/pull/1398)
- Upgrade moment from 2.27.0 to 2.29.1 [#1357](https://github.com/jadu/pulsar/pull/1357)
- Upgrade timepicker from 1.13.3 to 1.13.16 [#1355](https://github.com/jadu/pulsar/pull/1355)
- Upgrade ua-parser-js from 0.7.23 to 0.7.28 [#1395](https://github.com/jadu/pulsar/pull/1395)
- Upgrade undersctore from 1.12.0 to 1.13.1 [#1397](https://github.com/jadu/pulsar/pull/1397)
- Upgrade browser-sync from 2.17.3 to 2.26.13 [#1354](https://github.com/jadu/pulsar/pull/1354/)
- Upgrade grunt-real-favicon from 0.2.2 to 0.2.4 [#1354](https://github.com/jadu/pulsar/pull/1354/)
- Upgrade jstree from 3.3.9 to 3.3.11 [#1369](https://github.com/jadu/pulsar/pull/1369)
- Upgrade pikaday from 1.8.0 to 1.8.2 [#1368](https://github.com/jadu/pulsar/pull/1368)
- Bump ini from 1.3.5 to 1.3.7 [#1344](https://github.com/jadu/pulsar/pull/1344)
- Bump bl from 1.2.2 to 1.2.3 [#1342](https://github.com/jadu/pulsar/pull/1342)

Versions released in 2020 or earlier are detailed in GH release notes https://github.com/jadu/pulsar/releases
Loading

0 comments on commit 559fe86

Please sign in to comment.