Skip to content

Commit e870af6

Browse files
committed
Merge branch 'main' of github.com:biw/nuts into snyk-community/snyk-community-patch-1
2 parents 7ff1f01 + 5f40180 commit e870af6

File tree

9 files changed

+2180
-11
lines changed

9 files changed

+2180
-11
lines changed

.circleci/config.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
version: 2.1
2+
3+
commands:
4+
install_and_cache_yarn_linux:
5+
steps:
6+
- checkout
7+
- restore_cache:
8+
name: restore cache ➡ root
9+
keys:
10+
- dependencies-linux-root-{{ checksum "yarn.lock" }}
11+
# fallback to using the latest cache if no exact match is found
12+
- dependencies-linux-root-
13+
- run:
14+
name: yarn ➡ install
15+
command: yarn
16+
- save_cache:
17+
name: save cache
18+
paths:
19+
- ~/repo/node_modules
20+
key: dependencies-linux-root-{{ checksum "yarn.lock" }}
21+
run_all_tests:
22+
steps:
23+
- run:
24+
name: yarn test
25+
command: yarn test
26+
install_and_test:
27+
steps:
28+
- install_and_cache_yarn_linux
29+
- run_all_tests
30+
31+
# based on https://github.com/nodejs/Release schedule
32+
jobs:
33+
node_10:
34+
docker:
35+
- image: circleci/node:10
36+
steps:
37+
- install_and_test
38+
node_12:
39+
docker:
40+
- image: circleci/node:12
41+
steps:
42+
- install_and_test
43+
node_13:
44+
docker:
45+
- image: circleci/node:13
46+
steps:
47+
- install_and_test
48+
node_14:
49+
docker:
50+
- image: circleci/node:14
51+
steps:
52+
- install_and_test
53+
node_15:
54+
docker:
55+
- image: circleci/node:15
56+
steps:
57+
- install_and_test
58+
workflows:
59+
main:
60+
jobs:
61+
- node_10
62+
- node_12
63+
- node_13
64+
- node_14
65+
- node_15

.editorconfig

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
charset = utf-8
11+
indent_style = space
12+
13+
# 4 space indentation
14+
[*.{js,ts,tsx,jsx,json}]
15+
indent_size = 2
16+
17+
# Tab indentation (no size specified)
18+
[*.yml]
19+
indent_size = 4

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*

.travis.yml

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

Procfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/deploy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Deployment
22

3-
Nuts can be easily be deployed to a state-less server or PaaS. It only uses the disk as a cache for assets.
3+
Nuts can easily be deployed to a state-less server or PaaS. It only uses the disk as a cache for assets.
44

55
### On Heroku:
66

@@ -24,7 +24,7 @@ Install dependencies using:
2424
$ npm install
2525
```
2626

27-
This service requires to be configured using environment variables:
27+
The service requires configuration using environment variables:
2828

2929
```
3030
# Set the port for the service

docs/github.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ http://download.myapp.com/refresh
1414

1515
Where download.myapp.com, is the URL of your Nuts server.
1616

17+
Content-type should be `application/json`
18+
1719
It'll refresh versions cache everytime you update a release on GitHub.
1820

1921
### Secret

docs/update-osx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ var autoUpdater = require('auto-updater');
2020
var platform = os.platform() + '_' + os.arch();
2121
var version = app.getVersion();
2222

23-
autoUpdater.setFeedURL('http://download.myapp.com/update/'+platform+'/'+version);
23+
autoUpdater.setFeedURL('https://download.myapp.com/update/'+platform+'/'+version);
2424
```

0 commit comments

Comments
 (0)