Skip to content

Commit

Permalink
Merge pull request #2659 from SuperITMan/feature/replace-karma-typesc…
Browse files Browse the repository at this point in the history
…ript-by-karma

Feature/replace karma-typescript by karma
  • Loading branch information
SuperITMan authored May 6, 2021
2 parents fb6e448 + 4e83f53 commit 4c6c9a6
Show file tree
Hide file tree
Showing 38 changed files with 13,091 additions and 12,266 deletions.
3 changes: 0 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ updates:
time: "04:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: karma-typescript-es6-transform
versions:
- ">=5.2.0"
- dependency-name: "@types/node"
versions:
- ">=11"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
env:
TZ: "Europe/Brussels"
MAIN_NODEJS: "10"
NPM_VERSION: "6.9.2"
NPM_VERSION: "latest-6"
LOGS_DIR: /tmp/stark/logs
LOGS_FILE: /tmp/stark/logs/build-perf.log
HUSKY_SKIP_INSTALL: true
Expand Down Expand Up @@ -96,13 +96,13 @@ jobs:
- name: Install dependencies
run: |
npm ci
npm run install:travis-ci:all
npm run install:ci:all
- name: Linting
run: npm run lint:travis-ci:all
run: npm run lint:all

- name: Testing
run: npm run test:travis-ci:all
run: npm run test:ci:all

- name: "Build showcase:ghpages"
run: npm run build:showcase:ghpages
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
if: env.IS_MAIN_ENVIRONMENT == 1 && github.event_name == 'push'

- name: Generate docs coverage
run: npm run docs:travis-ci:coverage
run: npm run docs:coverage
if: env.IS_MAIN_ENVIRONMENT == 1

- name: Save logs
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,6 @@ bash.exe.stackdump

# Starter exception
starter/package-lock.json

# Stark-testing exception
packages/stark-testing/package-lock.json
9 changes: 0 additions & 9 deletions combine-packages-coverage.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@ const nextStream = function () {
return fs.createReadStream(file);
};

// first prepend the base path of each package ('packages/stark-xxxx') to every source file reference in the coverage file
// this ensures that Coveralls can show the list of packages correctly including their files
for (const fileName of fileNames) {
const packageName = fileName.match(/stark-\w*/)[0];
const replacements = [{ searchValue: /SF:(.*)(\r|\n)/, replaceValue: `SF:packages/${packageName}/$1$2` }];

replaceValuesInFile(fileName, replacements);
}

// then concatenate the files (but wait X milliseconds for the files to be overwritten in the previous step)
setTimeout(() => {
const combinedStream = new StreamConcat(nextStream);
Expand Down
Loading

0 comments on commit 4c6c9a6

Please sign in to comment.