10000 Merge branch 'master' into master · stacktracejs/error-stack-parser@51fac41 · GitHub
[go: up one dir, main page]
Skip to content

Commit 51fac41

Browse files
eriweneriwen
authored
Merge branch 'master' into master
2 parents 3622f54 + 1f7562c commit 51fac41

File tree

7 files changed

+63
-8
lines changed

7 files changed

+63
-8
lines changed

‎.github/ISSUE_TEMPLATE.md renamed to ‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
<!--- Provide a general summary of the issue in the Title above -->
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: a:bug
6+
assignees: ''
7+
8+
---
9+
10+
<!--- Provide a general summary of the issue in the title above -->
211

312
## Expected Behavior
413
<!--- If you're describing a bug, tell us what should happen -->
@@ -18,9 +27,9 @@
1827

1928
## Your Environment
2029
<!--- Include as many relevant details about the environment you experienced the bug in -->
21-
* stacktrace.js version:
22-
* Browser Name and version:
23-
* Operating System and version (desktop or mobile):
30+
* Package version:
31+
* Browser name and version:
32+
* OS version (desktop or mobile):
2433
* Link to your project:
2534

2635
## Possible Solution

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: a:feature
6+
assignees: ''
7+
8+
---
9+
10+
<!--- Provide a general summary of the issue in the title above -->
11+
12+
## Expected Behavior
13+
<!--- If you're describing a bug, tell us what should happen -->
14+
<!--- If you're suggesting a change/improvement, tell us how it should work -->
15+
16+
## Context
17+
<!--- How has this issue affected you? What are you trying to accomplish? -->
18+
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
19+
20+
## Possible Solution
21+
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
22+
<!--- or ideas how to implement the addition or change -->

‎.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,13 @@ jobs:
3636
- name: Run browser tests in Saucelabs
3737
run: npm run test-ci
3838
timeout-minutes: 5
39+
- name: Install lcov
40+
run: |
41+
sudo apt update
42+
sudo apt install lcov
43+
- name: Merge lcov reports
44+
run: find coverage -name lcov.info -exec echo -a \"{}\" \; | xargs lcov -o coverage/lcov.info
45+
- name: Coveralls
46+
uses: coverallsapp/github-action@master
47+
with:
48+
github-token: ${{ secrets.github_token }}

‎error-stack-parser.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import StackFrame from "stackframe";
77

88
declare namespace ErrorStackParser {
9+
export type {StackFrame};
910
/**
1011
* Given an Error object, extract the most information from it.
1112
*

‎karma.conf.ci.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ module.exports = function(config) {
101101
},
102102
coverageReporter: {
103103
type: 'lcov',
104-
dir: 'coverage'
104+
dir: 'coverage',
105+
subdir: function(browser) {
106+
return browser.toLowerCase().split(/[ /-]/)[0];
107+
}
105108
},
106109
singleRun: true
107110
});

‎karma.conf.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,28 @@ module.exports = function(config) {
99
'spec/spec-helper.js',
1010
'spec/*-spec.js'
1111
],
12-
reporters: ['spec'],
1312
port: 9876,
1413
colors: true,
1514
logLevel: config.LOG_INFO,
1615
autoWatch: true,
1716
customLaunchers: {
18-
Chrome_Travis: {
17+
Chrome_No_Sandbox: {
1918
base: 'Chrome',
2019
flags: ['--no-sandbox']
2120
}
2221
},
2322
browsers: ['PhantomJS'],
23+
reporters: ['spec', 'saucelabs', 'coverage', 'coveralls'],
24+
preprocessors: {
25+
'error-stack-parser.js': 'coverage'
26+
},
27+
coverageReporter: {
28+
type: 'lcov',
29+
dir: 'coverage',
30+
subdir: function(browser) {
31+
return browser.toLowerCase().split(/[ /-]/)[0];
32+
}
33+
},
2434
singleRun: false
2535
});
2636
};

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"scripts": {
5757
"lint": "eslint --fix .",
5858
"test": "karma start karma.conf.js --single-run",
59-
"test-pr": "karma start karma.conf.js --single-run --browsers Firefox,Chrome_Travis",
59+
"test-pr": "karma start karma.conf.js --single-run --browsers Firefox,Chrome_No_Sandbox",
6060
"test-ci": "karma start karma.conf.ci.js --single-run",
6161
"prepare": "cp error-stack-parser.js dist/ && uglifyjs node_modules/stackframe/stackframe.js error-stack-parser.js -o dist/error-stack-parser.min.js --compress --mangle --source-map \"url=error-stack-parser.min.js.map\""
6262
}

0 commit comments

Comments
 (0)
0