Skip to content

Commit 043886f

Browse files
author
Nir Galon
authored
chore: update npm packages (#146)
* chore: update all npm packages * fix: lint errors * fix: update generate dependencies * ci: run CD workflow only on milestone closed event
1 parent 16a9d0c commit 043886f

File tree

8 files changed

+3958
-4540
lines changed

8 files changed

+3958
-4540
lines changed

‎.github/workflows/cd.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: Continuous Deployment
22

33
on:
4-
release:
5-
types: [created]
4+
milestone:
5+
types: [closed]
66

77
jobs:
88
build:
@@ -14,13 +14,13 @@ jobs:
1414
node-version: 12
1515
- run: npm ci
1616

17-
- name: check lint errors
17+
- name: check lint errors ⁉️
1818
run: |
1919
npm run prepublishOnly
2020
npm run pretest
2121
npm run precommit
2222
23-
- name: run tests
23+
- name: run tests 💉
2424
run: |
2525
npm run test
2626
@@ -29,7 +29,7 @@ jobs:
2929
token: ${{ secrets.CODECOV_TOKEN }}
3030
fail_ci_if_error: true
3131

32-
- name: generate project
32+
- name: generate project 🚧
3333
run: |
3434
npm install -g yo
3535
npm link

‎.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
2626
- name: check lint errors
2727
run: |
28-
npm run prepublishOnly
2928
npm run pretest
3029
npm run precommit
3130

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<img src="https://raw.githubusercontent.com/nirgn975/generator-jekyll-starter-kit/master/images/jekyll-starter-kit.png" />
22

33

4-
[![license][license-image]][license-url] ![Continuous Deployment](https://github.com/nirgn975/generator-jekyll-starter-kit/workflows/Continuous%20Deployment/badge.svg) [![Dependency Status][dependencyci-image]][dependencyci-url] [![codecov][codecov-image]][codecov-url] [![Codacy Badge][codacy-image]][codacy-url] [![Maintenance][maintenance-image]][maintenance-url]
4+
[![license][license-image]][license-url] [![GitHub release (latest by date)](https://img.shields.io/github/v/release/nirgn975/generator-jekyll-starter-kit)](https://github.com/nirgn975/generator-jekyll-starter-kit/releases) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) ![Continuous Deployment](https://github.com/nirgn975/generator-jekyll-starter-kit/workflows/Continuous%20Deployment/badge.svg) [![Dependency Status][dependencyci-image]][dependencyci-url] [![codecov][codecov-image]][codecov-url] [![Codacy Badge][codacy-image]][codacy-url] [![Maintenance][maintenance-image]][maintenance-url]
55

66
> Jekyll + Google web-starter-kit = best of both worlds
77
@@ -75,7 +75,7 @@ Great! Here is how you can install the local generator to test changes.
7575
[codecov-url]: https://codecov.io/gh/nirgn975/generator-jekyll-starter-kit
7676
[codacy-image]: https://api.codacy.com/project/badge/Grade/6dfa47fa71b64497a313cb1ddfcf26f4
7777
[codacy-url]: https://www.codacy.com/app/nirgn975/generator-jekyll-starter-kit?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nirgn975/generator-jekyll-starter-kit&amp;utm_campaign=Badge_Grade
78-
[maintenance-image]: https://img.shields.io/maintenance/yes/2021.svg
78+
[maintenance-image]: https://img.shields.io/maintenance/yes/2022.svg
7979
[maintenance-url]: https://github.com/nirgn975
8080

8181
[downloads-image]: https://img.shields.io/npm/dt/generator-jekyll-starter-kit.svg

‎__tests__/app.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe("generator-html-css-es2015-sw-travis", () => {
1717
es: true,
1818
sw: true,
1919
travis: true,
20-
deploy: "github"
20+
deploy: "github",
2121
})
2222
.toPromise();
2323
});
@@ -44,7 +44,7 @@ describe("generator-html-css-es2015-sw-travis", () => {
4444
"package.json",
4545
"README.md",
4646
"robots.txt",
47-
".travis.yml"
47+
".travis.yml",
4848
]);
4949
});
5050

@@ -54,7 +54,7 @@ describe("generator-html-css-es2015-sw-travis", () => {
5454
"scss",
5555
"sass",
5656
".firebaserc",
57-
"firebase.json"
57+
"firebase.json",
5858
]);
5959
});
6060

@@ -64,8 +64,8 @@ describe("generator-html-css-es2015-sw-travis", () => {
6464
description: "description",
6565
author: "username",
6666
repository: {
67-
url: "url"
68-
}
67+
url: "url",
68+
},
6969
});
7070
});
7171

@@ -98,7 +98,7 @@ describe("generator-pug-scss-travis", () => {
9898
es: false,
9999
sw: false,
100100
travis: true,
101-
deploy: "firebase"
101+
deploy: "firebase",
102102
})
103103
.toPromise();
104104
});
@@ -109,7 +109,7 @@ describe("generator-pug-scss-travis", () => {
109109
"scss",
110110
".travis.yml",
111111
".firebaserc",
112-
"firebase.json"
112+
"firebase.json",
113113
]);
114114
});
115115

@@ -137,7 +137,7 @@ describe("generator-pug-sass-no_travis", () => {
137137
es: true,
138138
sw: true,
139139
travis: false,
140-
deploy: "firebase"
140+
deploy: "firebase",
141141
})
142142
.toPromise();
143143
});

‎generators/app/index.js

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@ module.exports = class extends Generator {
1818
type: "input",
1919
name: "projectName",
2020
message: "(1/10) What will be your project name?",
21-
required: "false"
21+
required: "false",
2222
},
2323
{
2424
// Prompts the user for the URL of the project"s GitHub repo.
2525
type: "input",
2626
name: "githubUrl",
2727
message: "(2/10) What is the GitHub repository URL?",
28-
required: "false"
28+
required: "false",
2929
},
3030
{
3131
// Prompts the user for his GitHub username.
3232
type: "input",
3333
name: "githubUsername",
3434
message: "(3/10) What is your GitHub username?",
35-
required: "false"
35+
required: "false",
3636
},
3737
{
3838
// Prompts the user for his GitHub username.
3939
type: "input",
4040
name: "projectDescription",
4141
message: "(4/10) What is your project description?",
42-
required: "false"
42+
required: "false",
4343
},
4444
{
4545
// Prompts the user to pick a templating engine.
@@ -50,14 +50,14 @@ module.exports = class extends Generator {
5050
{
5151
name: " HTML",
5252
value: "html",
53-
checked: true
53+
checked: true,
5454
},
5555
{
5656
name: " Pug (Jade) [just for the _includes directory]",
5757
value: "pug",
58-
checked: false
59-
}
60-
]
58+
checked: false,
59+
},
60+
],
6161
},
6262
{
6363
// Prompts the user to choose stylesheets.
@@ -68,43 +68,43 @@ module.exports = class extends Generator {
6868
{
6969
name: " CSS",
7070
value: "stylesheets",
71-
checked: false
71+
checked: false,
7272
},
7373
{
7474
name: " SASS",
7575
value: "sass",
76-
checked: false
76+
checked: false,
7777
},
7878
{
7979
name: " SCSS",
8080
value: "scss",
81-
checked: false
82-
}
83-
]
81+
checked: false,
82+
},
83+
],
8484
},
8585
{
8686
// Prompts the user to decide if he want ES2015 support.
8787
type: "confirm",
8888
name: "es",
8989
message:
9090
"(7/10) Would you like to write ES2015? (ES2015 will be support using Babel and will automatically transpiled to ES5 for wide browser support).",
91-
default: true
91+
default: true,
9292
},
9393
{
9494
// Prompts the user to decide if he want offline support.
9595
type: "confirm",
9696
name: "sw",
9797
message:
9898
"(8/10) Would you like to enable Service Worker for offline use?",
99-
default: true
99+
default: true,
100100
},
101101
{
102102
// Prompts the user to decide if he want to validate his build.
103103
type: "confirm",
104104
name: "travis",
105105
message:
106106
"(9/10) Would you like to enable HTMLProofer to validate your Jekyll output on Travis-CI?",
107-
default: true
107+
default: true,
108108
},
109109
{
110110
// Prompts the user to choose deploy method.
@@ -115,18 +115,18 @@ module.exports = class extends Generator {
115115
{
116116
name: " GitHub pages",
117117
value: "github",
118-
checked: false
118+
checked: false,
119119
},
120120
{
121121
name: " Firebase",
122122
value: "firebase",
123-
checked: false
124-
}
125-
]
126-
}
123+
checked: false,
124+
},
125+
],
126+
},
127127
];
128128

129-
return this.prompt(prompts).then(props => {
129+
return this.prompt(prompts).then((props) => {
130130
// To access props later use this.props.someAnswer;
131131
this.projectName = props.projectName;
132132
this.githubUsername = props.githubUsername;
@@ -191,7 +191,7 @@ module.exports = class extends Generator {
191191
githubUsername: this.githubUsername,
192192
projectDescription: this.projectDescription,
193193
includeGithub: this.includeGithub,
194-
includeFirebase: this.includeFirebase
194+
includeFirebase: this.includeFirebase,
195195
}
196196
);
197197

@@ -212,7 +212,7 @@ module.exports = class extends Generator {
212212
this.templatePath("my-awesome-site/.babelrc"),
213213
this.destinationPath(".babelrc"),
214214
{
215-
includeES: !this.includeES
215+
includeES: !this.includeES,
216216
}
217217
);
218218

@@ -222,7 +222,7 @@ module.exports = class extends Generator {
222222
this.destinationPath(".gitignore"),
223223
{
224224
includeSass: this.includeSass,
225-
includeScss: this.includeScss
225+
includeScss: this.includeScss,
226226
}
227227
);
228228

@@ -235,7 +235,7 @@ module.exports = class extends Generator {
235235
githubUsername: this.githubUsername,
236236
projectDescription: this.projectDescription,
237237
includeTravis: this.includeTravis,
238-
includeFirebase: this.includeFirebase
238+
includeFirebase: this.includeFirebase,
239239
}
240240
);
241241

@@ -268,7 +268,7 @@ module.exports = class extends Generator {
268268
includeSW: this.includeSW,
269269
includeGithub: this.includeGithub,
270270
includeFirebase: this.includeFirebase,
271-
includeTravis: this.includeTravis
271+
includeTravis: this.includeTravis,
272272
}
273273
);
274274

@@ -277,7 +277,7 @@ module.exports = class extends Generator {
277277
this.templatePath("my-awesome-site/manifest.json"),
278278
this.destinationPath("manifest.json"),
279279
{
280-
projectName: this.projectName
280+
projectName: this.projectName,
281281
}
282282
);
283283

@@ -287,7 +287,7 @@ module.exports = class extends Generator {
287287
this.destinationPath("manifest.webapp"),
288288
{
289289
projectName: this.projectName,
290-
projectDescription: this.projectDescription
290+
projectDescription: this.projectDescription,
291291
}
292292
);
293293

@@ -296,7 +296,7 @@ module.exports = class extends Generator {
296296
this.templatePath("my-awesome-site/LICENSE"),
297297
this.destinationPath("LICENSE"),
298298
{
299-
githubUsername: this.githubUsername
299+
githubUsername: this.githubUsername,
300300
}
301301
);
302302

@@ -323,7 +323,7 @@ module.exports = class extends Generator {
323323
this.templatePath("my-awesome-site/index.html"),
324324
this.destinationPath("index.html"),
325325
{
326-
includePug: this.includePug
326+
includePug: this.includePug,
327327
}
328328
);
329329

@@ -377,7 +377,7 @@ module.exports = class extends Generator {
377377
includeES: this.includeES,
378378
includeGithub: this.includeGithub,
379379
includeFirebase: this.includeFirebase,
380-
includeSW: this.includeSW
380+
includeSW: this.includeSW,
381381
}
382382
);
383383

@@ -400,7 +400,7 @@ module.exports = class extends Generator {
400400
this.templatePath("my-awesome-site/humans.txt"),
401401
this.destinationPath("humans.txt"),
402402
{
403-
githubUsername: this.githubUsername
403+
githubUsername: this.githubUsername,
404404
}
405405
);
406406

@@ -411,7 +411,7 @@ module.exports = class extends Generator {
411411
{
412412
includeGithub: this.includeGithub,
413413
includeFirebase: this.includeFirebase,
414-
includeSW: this.includeSW
414+
includeSW: this.includeSW,
415415
}
416416
);
417417

@@ -421,7 +421,7 @@ module.exports = class extends Generator {
421421
this.destinationPath("_includes/head.html"),
422422
{
423423
includeGithub: this.includeGithub,
424-
includeFirebase: this.includeFirebase
424+
includeFirebase: this.includeFirebase,
425425
}
426426
);
427427
}
@@ -451,7 +451,7 @@ module.exports = class extends Generator {
451451
);
452452

453453
this.installDependencies({
454-
bower: false
454+
bower: false,
455455
});
456456
}
457457
};

0 commit comments

Comments
 (0)