Skip to content

Commit

Permalink
Merge pull request #5 from neptunelabs/framework-update
Browse files Browse the repository at this point in the history
updated framework, added/changed github/workflow files, editorconfig,…
  • Loading branch information
nelabiernat committed Aug 8, 2023
2 parents b13aa74 + 5a27559 commit 63917e1
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 120
2 changes: 1 addition & 1 deletion .github/workflows/publish-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- name: Build Samples
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-on-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- name: Build Samples
run: |
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
auto-install-peers = true
13 changes: 0 additions & 13 deletions .prettierrc.json

This file was deleted.

6 changes: 6 additions & 0 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
trailingComma: "all"
semi: false
singleQuote: true
printWidth: 120
options:
editorconfig: true
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "NeptuneLabs GmbH",
"url": "https://www.neptunelabs.com/"
},
"version": "23.05.26",
"version": "23.08.08",
"homepage": "https://www.neptunelabs.com/fsi-viewer-360",
"repository": {
"type": "git",
Expand All @@ -16,8 +16,8 @@
"npm": ">=6.0.0"
},
"devDependencies": {
"@neptunelabs/fsi-samples-framework": "^1.0.16",
"prettier": "^2.8.8"
"@neptunelabs/fsi-samples-framework": "^1.0.18",
"prettier": "^3.0.1"
},
"scripts": {
"start": "start-sample",
Expand Down

0 comments on commit 63917e1

Please sign in to comment.