Skip to content

Commit d816438

Browse files
author
Jannik
authored
Merge pull request #119 from Becklyn/next
Compile auslese by default + bump all dependencies
2 parents bba21e3 + 5a4da14 commit d816438

File tree

5 files changed

+36
-39
lines changed

5 files changed

+36
-39
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ dist: bionic
22
language: node_js
33

44
node_js:
5-
- 12
5+
- node
66

77
script:
8-
- npm run-script build
8+
- npm run build
99
- npm audit
1010
- npx prettier-package-json package.json --list-different --tab-width 4
1111
- npm test

package.json

+22-23
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,41 @@
1818
"prepublishOnly": "npm run-script build",
1919
"test": "npm run-script build && ava"
2020
},
21-
"optionalDependencies": {
22-
"kaba-scss": "^3.3.5",
23-
"webpack-bundle-analyzer": "^3.6.0"
24-
},
21+
"optionalDependencies": {},
2522
"dependencies": {
26-
"@babel/core": "^7.8.4",
23+
"@babel/core": "^7.9.0",
2724
"@becklyn/typescript-error-formatter": "^1.0.4",
28-
"babel-eslint": "^10.0.3",
29-
"babel-loader": "^8.0.6",
25+
"babel-eslint": "^10.1.0",
26+
"babel-loader": "^8.1.0",
3027
"clean-webpack-plugin": "^3.0.0",
31-
"core-js": "^3.6.4",
28+
"core-js": "^3.6.5",
3229
"duplicate-package-checker-webpack-plugin": "^3.0.0",
3330
"eslint": "^6.8.0",
34-
"eslint-loader": "^3.0.3",
35-
"eslint-plugin-jsdoc": "^21.0.0",
36-
"eslint-plugin-react": "^7.18.3",
37-
"eslint-plugin-react-hooks": "^2.3.0",
38-
"fs-extra": "^8.1.0",
31+
"eslint-loader": "^4.0.0",
32+
"eslint-plugin-jsdoc": "^23.0.0",
33+
"eslint-plugin-react": "^7.19.0",
34+
"eslint-plugin-react-hooks": "^3.0.0",
35+
"fs-extra": "^9.0.0",
3936
"kaba-babel-preset": "^4.1.2",
4037
"kleur": "^3.0.3",
4138
"postcss-loader": "^3.0.0",
4239
"pretty-hrtime": "^1.0.3",
4340
"progress-bar-webpack-plugin": "^2.1.0",
44-
"raw-loader": "^4.0.0",
45-
"sade": "^1.7.0",
46-
"style-loader": "^1.1.3",
47-
"terser-webpack-plugin": "^2.3.4",
48-
"ts-loader": "^6.2.1",
49-
"typescript": "^3.7.5",
50-
"webpack": "^4.41.5"
41+
"raw-loader": "^4.0.1",
42+
"sade": "^1.7.3",
43+
"style-loader": "^1.1.4",
44+
"terser-webpack-plugin": "^2.3.5",
45+
"ts-loader": "^7.0.0",
46+
"typescript": "^3.8.3",
47+
"webpack": "^4.42.1"
5148
},
5249
"devDependencies": {
5350
"@types/terser-webpack-plugin": "^2.2.0",
54-
"ava": "^2.4.0",
55-
"kaba-scss": "^3.3.5",
56-
"webpack-bundle-analyzer": "^3.6.0"
51+
"ava": "^3.7.0",
52+
"esm": "^3.2.25",
53+
"execa": "^4.0.0",
54+
"kaba-scss": "^3.3.7",
55+
"webpack-bundle-analyzer": "^3.7.0"
5756
},
5857
"engines": {
5958
"node": ">= 12.0"

src/Kaba.ts

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ export class Kaba
100100
/^@becklyn/,
101101
/^@mayd/,
102102
/^mojave/,
103+
/^auslese/,
103104
];
104105
private postCssLoaderOptions: PostCssLoaderOptions = {};
105106

tests/all_fixtures.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {runKaba} from "./lib/runner";
1414

1515
/* eslint-disable camelcase */
1616
/** @var {Object<string,FixtureConfig>} fixtureTests */
17-
let fixtureTests = {
17+
const fixtureTests = {
1818
js: {
1919
status: 0,
2020
},
@@ -39,24 +39,21 @@ let fixtureTests = {
3939

4040
Object.keys(fixtureTests).forEach(key =>
4141
{
42-
test(`File: ${key}`, t =>
42+
test(`File: ${key}`, async t =>
4343
{
44-
let expected = fixtureTests[key];
45-
let result = runKaba(expected.dir || key, expected.args || []);
46-
let stdout = null !== result.stdout
47-
? result.stdout.toString()
48-
: "";
44+
const expected = fixtureTests[key];
45+
const result = await runKaba(expected.dir || key, expected.args || []);
4946

50-
t.is(result.status, expected.status);
47+
t.is(result.exitCode, expected.status);
5148

5249
if (undefined !== expected.match)
5350
{
54-
t.truthy(expected.match.test(stdout));
51+
t.truthy(expected.match.test(result.stdout));
5552
}
5653

5754
if (undefined !== expected.noMatch)
5855
{
59-
t.falsy(expected.noMatch.test(stdout));
56+
t.falsy(expected.noMatch.test(result.stdout));
6057
}
6158
});
6259
});

tests/lib/runner.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
const path = require("path");
2-
const {spawnSync} = require("child_process");
2+
const execa = require("execa");
33

44
/**
55
* @param {string} directory
66
* @param {string[]} args
7-
* @returns {SpawnSyncReturns<Buffer> | SpawnSyncReturns<string>}
87
*/
9-
exports.runKaba = function (directory, args = [])
8+
exports.runKaba = async function (directory, args = [])
109
{
11-
return spawnSync(
10+
return execa(
1211
path.join(__dirname, "../../bin/run.js"),
1312
args,
1413
{
1514
cwd: path.join(__dirname, "../fixtures", directory),
15+
reject: false,
1616
}
1717
);
1818
};

0 commit comments

Comments
 (0)