Skip to content

Commit ddeb502

Browse files
author
Jen Lampton
committed
Merge branch '1.x-2.x' of github.com:jenlampton/colorbox into 1.x-2.x
2 parents 809e398 + 7ee564b commit ddeb502

File tree

13 files changed

+199
-0
lines changed

13 files changed

+199
-0
lines changed

libraries/DOMPurify/.babelrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"presets": [
3+
[
4+
"env",
5+
{
6+
"targets": {
7+
"chrome": 22,
8+
"ie": 8,
9+
"firefox": 15,
10+
"opera": 31,
11+
"safari": 8,
12+
"edge": 13
13+
},
14+
"modules": false
15+
}
16+
]
17+
]
18+
}

libraries/DOMPurify/.editorconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# http://EditorConfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
end_of_line = lf
8+
indent_size = 2
9+
indent_style = space
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github: cure53
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
> This issue proposes a [bug, feature] which...
2+
3+
### Background & Context
4+
5+
Please provide some more detailed information about the general background and context of this issue and delete non applicable sections below.
6+
7+
### Bug
8+
9+
#### Input
10+
11+
Some HTML which is thrown at DOMPurify.
12+
13+
#### Given output
14+
15+
The output given by DOMPurify.
16+
17+
#### Expected output
18+
19+
The expected output.
20+
21+
### Feature
22+
23+
Briefly outline the proposed feature, its value and a potentially proposed implementation from a high level.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
> This pull request [implements, fixes, changes]...
2+
3+
### Background & Context
4+
5+
Briefly outline why this PR was needed, a minimal context, culminating in your implementation.
6+
7+
### Tasks
8+
9+
- Add tasks to give a quick overview for QA and reviewers
10+
11+
### Dependencies
12+
13+
If there are any dependencies on PRs or API work then list them here.
14+
15+
- [x] Resolved dependency
16+
- [ ] Open dependency
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Build and Test
2+
3+
# The event triggers are configured as following:
4+
# - on `main` -> trigger the workflow on every push
5+
# - on any pull request -> trigger the workflow
6+
# This is to avoid running the workflow twice on pull requests.
7+
on:
8+
push:
9+
branches:
10+
- main
11+
pull_request:
12+
13+
jobs:
14+
install:
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
matrix:
19+
node-version: [14.x, 15.x, 16.x, 17.x]
20+
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v2
24+
- name: Setup Node.js ${{ matrix.node-version }}
25+
uses: actions/setup-node@v2
26+
with:
27+
node-version: ${{ matrix.node-version }}
28+
cache: 'npm'
29+
- name: Install Dependencies
30+
run: npm ci
31+
- name: Build
32+
run: npm run build
33+
- name: Lint
34+
run: npm run lint
35+
- name: Test
36+
uses: GabrielBB/xvfb-action@v1.0
37+
with:
38+
run: npm run test:ci
39+
env:
40+
TEST_BROWSERSTACK: ${{ startsWith(matrix.node-version, '17') }}
41+
TEST_PROBE_ONLY: ${{ github.ref != 'refs/heads/main' }}
42+
BS_USERNAME: ${{ secrets.BS_USERNAME }}
43+
BS_ACCESSKEY: ${{ secrets.BS_ACCESSKEY }}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [main]
9+
schedule:
10+
- cron: '0 19 * * 4'
11+
12+
jobs:
13+
analyze:
14+
name: Analyze
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
# Override automatic language detection by changing the below list
21+
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
22+
language: ['javascript']
23+
# Learn more...
24+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
25+
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v2
29+
with:
30+
# We must fetch at least the immediate parents so that if this is
31+
# a pull request then we can checkout the head.
32+
fetch-depth: 2
33+
34+
# If this run was triggered by a pull request event, then checkout
35+
# the head of the pull request instead of the merge commit.
36+
- run: git checkout HEAD^2
37+
if: ${{ github.event_name == 'pull_request' }}
38+
39+
# Initializes the CodeQL tools for scanning.
40+
- name: Initialize CodeQL
41+
uses: github/codeql-action/init@v1
42+
with:
43+
languages: ${{ matrix.language }}
44+
45+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
46+
# If this step fails, then you should remove it and run the build manually (see below)
47+
- name: Autobuild
48+
uses: github/codeql-action/autobuild@v1
49+
50+
# ℹ️ Command-line programs to run using the OS shell.
51+
# 📚 https://git.io/JvXDl
52+
53+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
54+
# and modify them (or add more) to build your code if your project
55+
# uses a compiled language
56+
57+
#- run: |
58+
# make bootstrap
59+
# make release
60+
61+
- name: Perform CodeQL Analysis
62+
uses: github/codeql-action/analyze@v1

libraries/DOMPurify/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.project
2+
node_modules
3+
bower_components
4+
npm-debug.log
5+
.vscode
6+
yarn-error.log

libraries/DOMPurify/.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lts/*

libraries/DOMPurify/.prettierignore

Whitespace-only changes.

0 commit comments

Comments
 (0)