Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
awlayton committed Apr 21, 2022
1 parent bdd9b3e commit 8d8d001
Show file tree
Hide file tree
Showing 20 changed files with 2,746 additions and 2,461 deletions.
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@
**/GRTAGS
**/.session*
**/.undodir
**/.history
**/.dccache

# Built TS etc.
**/dist
**/coverage
**/.test
**/*.tsbuildinfo

# yarn 2 stuff
Expand Down
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
dist
bundle.*
.test
coverage
.pnp.*
.yarn
11 changes: 10 additions & 1 deletion .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ extends:
- plugin:unicorn/recommended
- plugin:security/recommended
- plugin:sonarjs/recommended
- plugin:ava/recommended
- xo
- prettier

Expand All @@ -27,13 +28,14 @@ plugins:
- security
- no-secrets
- sonarjs
- ava
- notice

parser: '@typescript-eslint/parser'

parserOptions:
ecmaVersion: 2020
project: './tsconfig.eslint.json'
project: './**/tsconfig.*'

overrides:
- files: '*.ts'
Expand All @@ -42,6 +44,9 @@ overrides:
- plugin:import/typescript
- xo-typescript
- prettier
parserOptions:
ecmaVersion: 2020
project: './**/tsconfig.*'
rules:
'@typescript-eslint/naming-convention':
[
Expand Down Expand Up @@ -116,3 +121,7 @@ rules:
no-constructor-bind/no-constructor-bind: error
no-constructor-bind/no-constructor-state: error
sort-imports: [warn, { allowSeparatedGroups: true }]
ava/no-ignored-test-files: off
ava/no-import-test-files: off
ava/no-skip-test: warn
ava/no-skip-assert: warn
147 changes: 138 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,157 @@
node_modules
# Use yarn not npm
package.lock

*.log
# Mac nonsense
.DS_Store

# vscode stuff
.dccache
.history

# TypeScript
# vim/nvim stuff
.nvimlog

# Build output
dist
*.tsbuildinfo
.test

# Docker overrides
docker-compose.override.yml
.env

# Ignore act stuff?
# Ignore act stuff
.actrc
act/

# yarn 2 stuff
# ignore sdk stuff
.vim

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional stylelint cache
.stylelintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# vuepress v2.x temp and cache directory
.temp
.cache

# Docusaurus cache and generated files
.docusaurus

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/*
!.yarn/releases
!.yarn/plugins
!.yarn/versions
.pnp.*
# ignore sdk stuff
.vim
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
dist
bundle.*
.test
coverage
node_modules
yarn-cache
services-available

LICENSE

tags*
.history
.dccache

**/yarn.lock
**/yarn-error.log
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"asns",
"Buildx",
"codeql",
"lcov",
"Snyk",
"sonarjs",
"trellisfw",
Expand Down
343 changes: 263 additions & 80 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

768 changes: 0 additions & 768 deletions .yarn/releases/yarn-3.1.1.cjs

This file was deleted.

785 changes: 785 additions & 0 deletions .yarn/releases/yarn-3.2.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.1.1.cjs
yarnPath: .yarn/releases/yarn-3.2.0.cjs
88 changes: 56 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,60 +13,84 @@
"scripts": {
"start": "node --enable-source-maps dist/index.js",
"build": "tsc -b",
"test": "mocha"
"test": "yarn build test && c8 ava",
"test:debug": "ava -T 60m -svc 1 --no-worker-threads"
},
"mocha": {
"require": "ts-node/register",
"extension": [
"ts"
"ava": {
"failFast": false,
"files": [
"**/*.test.ts"
],
"typescript": {
"extensions": [
"ts"
],
"rewritePaths": {
"src/": "dist/",
"test/": ".test/"
},
"compile": false
}
},
"c8": {
"reporter": [
"text",
"lcov"
],
"all": true,
"src": "src",
"exclude": [
"*.d.ts",
".pnp.*",
".test"
]
},
"dependencies": {
"@oada/client": "^2.6.5",
"convict": "^6.2.1",
"debug": "^4.3.3",
"dotenv": "^10.0.0",
"moment": "^2.29.1",
"@oada/client": "^4.0.0",
"convict": "^6.2.2",
"debug": "^4.3.4",
"dotenv": "^16.0.0",
"moment": "^2.29.3",
"tslib": "^2.3.1"
},
"devDependencies": {
"@ava/typescript": "^3.0.1",
"@tsconfig/node16": "^1.0.2",
"@types/convict": "^6.1.1",
"@types/debug": "^4.1.7",
"@types/node": "^16.11.12",
"@types/prettier": "^2.4.2",
"@typescript-eslint/eslint-plugin": "^5.6.0",
"@typescript-eslint/parser": "^5.6.0",
"@yarnpkg/sdks": "^2.5.1-rc.5",
"chai": "^4.3.4",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-xo": "^0.39.0",
"eslint-config-xo-typescript": "^0.47.1",
"@types/node": "^16.11.27",
"@types/prettier": "^2.6.0",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"@yarnpkg/sdks": "^3.0.0-rc.2",
"ava": "^4.2.0",
"eslint": "^8.13.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-xo": "^0.40.0",
"eslint-config-xo-typescript": "^0.50.0",
"eslint-formatter-pretty": "^4.1.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-array-func": "^3.1.7",
"eslint-plugin-ava": "^13.2.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-github": "^4.3.5",
"eslint-plugin-github": "^4.3.6",
"eslint-plugin-i18n-text": "^1.0.1",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-no-constructor-bind": "^2.0.4",
"eslint-plugin-no-only-tests": "^2.6.0",
"eslint-plugin-no-secrets": "^0.8.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-notice": "^0.9.10",
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-promise": "^5.2.0",
"eslint-plugin-regexp": "^1.5.1",
"eslint-plugin-security": "^1.4.0",
"eslint-plugin-sonarjs": "^0.11.0",
"eslint-plugin-unicorn": "^39.0.0",
"mocha": "^9.1.3",
"prettier": "^2.5.1",
"ts-node": "^10.4.0",
"typescript": "^4.4.4"
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-regexp": "^1.6.0",
"eslint-plugin-security": "^1.5.0",
"eslint-plugin-sonarjs": "^0.13.0",
"eslint-plugin-unicorn": "^42.0.0",
"prettier": "^2.6.2",
"typescript": "^4.6.3"
},
"packageManager": "yarn@3.1.1"
"packageManager": "yarn@3.2.0"
}
4 changes: 1 addition & 3 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
* limitations under the License.
*/

import 'dotenv/config';
import convict from 'convict';
import { config as load } from 'dotenv';

load();

const config = convict({
oada: {
Expand Down
Loading

0 comments on commit 8d8d001

Please sign in to comment.