Skip to content

Commit 89fc50b

Browse files
Andreas Müllerndu2
authored andcommitted
ES6ify
1 parent 7919882 commit 89fc50b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+269
-351
lines changed

package.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "gitlab-time-tracker",
33
"version": "1.8.0",
4+
"type": "module",
45
"description": "A command line interface for GitLabs time tracking feature.",
56
"bugs": {
67
"url": "https://github.com/ndu2/gitlab-time-tracker/issues"
@@ -20,15 +21,7 @@
2021
"gtt": "src/gtt.js"
2122
},
2223
"engines": {
23-
"node": ">=18"
24-
},
25-
"pkg": {
26-
"scripts": "src/**/*.js",
27-
"targets": [
28-
"node18-linux-x64",
29-
"node18-macos-x64",
30-
"node18-win-x64"
31-
]
24+
"node": ">=20"
3225
},
3326
"author": "kriskbx",
3427
"license": "GPL-2.0",

spec/_setup.spec.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
const sinon = require('sinon');
2-
const chai = require('chai');
1+
import sinon from "sinon";
32

43
beforeEach(function () {
5-
this.sandbox = sinon.sandbox.create()
4+
this.sandbox = sinon.createSandbox()
65
});
76

87
afterEach(function () {

spec/commands/report.date.shortcuts.spec.js

Lines changed: 0 additions & 62 deletions
This file was deleted.

spec/include/config.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const config = require('./../../src/include/config');
2-
const expect = require('chai').expect;
1+
import config from '../../src/include/config.js';
2+
import { expect } from 'chai';
33

44
describe('The config class', () => {
55
it('stores data', () => {

spec/models/time.title.spec.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
const moment = require('moment');
2-
const Config = require('../../src/include/config');
3-
const Time = require('./../../src/models/time');
4-
const issue = require('../../src/models/issue');
5-
const mergeRequest = require('../../src/models/mergeRequest');
6-
const expect = require('chai').expect;
1+
2+
import moment from 'moment';
3+
import Config from '../../src/include/file-config.js';
4+
import Time from '../../src/models/time.js';
5+
import issue from '../../src/models/issue.js';
6+
import mergeRequest from '../../src/models/mergeRequest.js';
7+
import { expect } from 'chai';
78

89
describe('time class', () => {
910
it('Returns title of parent Issue', () => {
10-
const config = new Config();
11+
const config = new Config(process.cwd());
1112
const parent = new issue(config, {title: "Test title"})
1213
const time = new Time('1h', moment(), {}, parent, config);
1314

1415
expect(time.title).to.be.equal("Test title");
1516
});
1617

1718
it('Returns title of parent MergeRequest', () => {
18-
const config = new Config();
19+
const config = new Config(process.cwd());
1920
const parent = new mergeRequest(config, {title: "Test title"})
2021
const time = new Time('1h', moment(), {}, parent, config);
2122

2223
expect(time.title).to.be.equal("Test title");
2324
});
2425

2526
it('Returns Null for missed title or parent', () => {
26-
const config = new Config();
27+
const config = new Config(process.cwd());
2728
const parent = new mergeRequest(config, {});
2829
let time;
2930
time = new Time('1h', moment(), {}, parent, config);

src/gtt-cancel.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
const program = require('commander');
2-
const colors = require('colors');
3-
const moment = require('moment');
4-
5-
const Config = require('./include/file-config');
6-
const Cli = require('./include/cli');
7-
const Tasks = require('./include/tasks');
1+
import {program} from 'commander';
2+
import colors from 'colors';
3+
import moment from 'moment';
4+
import Config from './include/file-config.js';
5+
import Cli from './include/cli.js';
6+
import Tasks from './include/tasks.js';
87

98
program
109
.option('--verbose', 'show verbose output')

src/gtt-config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
const program = require('commander');
2-
3-
const Config = require('./include/file-config');
4-
const Fs = require('./include/filesystem');
1+
import {program} from 'commander';
2+
import Config from './include/file-config.js';
3+
import Fs from './include/filesystem.js';
54

65
let config = new Config(process.cwd());
76

src/gtt-create.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
const colors = require('colors');
2-
const moment = require('moment');
3-
const program = require('commander');
4-
5-
const Config = require('./include/file-config');
6-
const Cli = require('./include/cli');
7-
const Tasks = require('./include/tasks');
1+
import colors from 'colors';
2+
import moment from 'moment';
3+
import program from 'commander';
4+
import Config from './include/file-config';
5+
import Cli from './include/cli';
6+
import Tasks from './include/tasks';
87

98
program
109
.arguments('[project] [title]')

src/gtt-delete.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
const program = require('commander');
2-
3-
const Frame = require('./models/frame');
4-
const Config = require('./include/file-config');
5-
const Cli = require('./include/cli');
6-
const Fs = require('./include/filesystem');
1+
import program from 'commander';
2+
import Frame from './models/frame';
3+
import Config from './include/file-config';
4+
import Cli from './include/cli';
5+
import Fs from './include/filesystem';
76

87
program
98
.arguments('[id]')

src/gtt-edit.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const program = require('commander');
2-
const Config = require('./include/file-config');
3-
const Cli = require('./include/cli');
4-
const Fs = require('./include/filesystem');
5-
const _ = require('underscore');
6-
const Time = require('./models/time');
7-
const Frame = require('./models/frame');
8-
const inquirer = require('inquirer');
1+
import {program} from 'commander';
2+
import Config from './include/file-config.js';
3+
import Cli from './include/cli.js';
4+
import Fs from './include/filesystem.js';
5+
import _ from 'underscore';
6+
import Time from './models/time.js';
7+
import Frame from './models/frame.js';
8+
import inquirer from 'inquirer';
99

1010

1111
program
@@ -29,12 +29,12 @@ function toHumanReadable(input) {
2929
}
3030

3131
if (!id) {
32-
lastFrames = Fs.all(config.frameDir).slice(-listSize); // last listSize frames (one page of inquirer)
32+
let lastFrames = Fs.all(config.frameDir).slice(-listSize); // last listSize frames (one page of inquirer)
3333
lastFrames = lastFrames.map((file) =>
3434
Frame.fromFile(config, Fs.join(config.frameDir, file))
3535
);
3636

37-
lastFramesDetails = lastFrames
37+
let lastFramesDetails = lastFrames
3838
.sort((a, b) => (a.start.isBefore(b.start) ? -1 : 1))
3939
.map((frame) => {
4040
let issue = `${

0 commit comments

Comments
 (0)