Skip to content

Commit

Permalink
Merge pull request #217 from Open-MBEE/release/5.0.0
Browse files Browse the repository at this point in the history
Release/5.0.0
  • Loading branch information
dlamoris authored Sep 18, 2023
2 parents 487776c + 333e672 commit 2d88930
Show file tree
Hide file tree
Showing 254 changed files with 12,975 additions and 12,601 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
build:
docker:
# specify the version you desire here
- image: circleci/node:8.11.2-browsers
- image: cimg/node:20.1.0-browsers

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand All @@ -25,11 +25,11 @@ jobs:
# fallback to using the latest cache if no exact match is found
- openmbee-ve-

- run: npm install
- run: yarn install

- save_cache:
paths:
- node_modules
key: openmbee-ve-{{ checksum "package.json" }}

- run: ./node_modules/grunt/bin/grunt #--ARTIFACTORY_URL=https://oss.jfrog.org --ARTIFACTORY_USER=$ARTIFACTORY_USER --ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD --SNAPSHOT_REPO=oss-snapshot-local --RELEASE_REPO=oss-release-local --GROUP_ID=org.openmbee deploy
- run: VE_ENV=example yarn test
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
src/lib/**/*.js
src/ve-extensions/present-plots/*
src/ve-extensions/ts-diagram/*
208 changes: 111 additions & 97 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,105 +1,119 @@
{
"settings": {
"import/extensions": [".js", ".ts"],
"import/parsers": {
"@typescript-eslint/parser": [
".ts"
]
},
"import/resolver": {
"typescript": {
"alwaysCheckTypes": true,
"project": "./tsconfig.json",
"extensions": [".js", ".jsx", ".ts", ".tsx"]
},
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"],
"moduleDirectory": ["node_modules"]
}
}
"root": true,
"extends": ["eslint:recommended"],
"env": {
"browser": true,
"es2021": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json",
"tsconfigRootDir": "./"
"ecmaVersion": 12,
"sourceType": "module"
},
"plugins": ["unused-imports"],
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:prettier/recommended"
],
"rules": {
"@typescript-eslint/no-unused-vars": "off",
"unused-imports/no-unused-imports": "error",
"no-multiple-empty-lines": 2,
"import/newline-after-import": [
2
],
"@typescript-eslint/explicit-function-return-type": 2,
"@typescript-eslint/no-inferrable-types": [
2,
{
"ignoreProperties": true
}
],
"import/order": ["error", {
"newlines-between": "always",
"alphabetize": {
"order": "asc",
"caseInsensitive": true
},
"pathGroups": [
{
"pattern": "@/**",
"group": "external",
"position": "after"
},
{
"pattern": "@ve-app",
"group": "internal",
"position": "after"
},
{
"pattern": "@ve-components",
"group": "internal",
"position": "after"
"overrides": [
{
"files": ["**/*.ts"],
"settings": {
"import/extensions": [".js", ".ts"],
"import/parsers": {
"@typescript-eslint/parser": [".ts"]
},
{
"pattern": "@ve-core",
"group": "internal",
"position": "after"
},
{
"pattern": "@ve-utils",
"group": "internal",
"position": "after"
},
{
"pattern": "@ve-types/**",
"group": "type",
"position": "after"
},
{
"pattern": "../../lib/**",
"group": "external",
"position": "after"
"import/resolver": {
"typescript": {
"alwaysCheckTypes": true,
"project": "./tsconfig.json",
"extensions": [".ts", ".tsx"]
},
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"],
"moduleDirectory": ["node_modules"]
}
}
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json",
"tsconfigRootDir": "./"
},
"plugins": ["unused-imports"],
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:prettier/recommended"
],
"groups": [
"builtin",
"external",
"internal",
"unknown",
"parent",
"sibling",
"index",
"object",
"type"
]
}]
}
"rules": {
"@typescript-eslint/no-unused-vars": "off",
"unused-imports/no-unused-imports": "error",
"no-multiple-empty-lines": 2,
"import/newline-after-import": [2],
"@typescript-eslint/explicit-function-return-type": 2,
"@typescript-eslint/no-inferrable-types": [
2,
{
"ignoreProperties": true
}
],
"import/order": [
"error",
{
"newlines-between": "always",
"alphabetize": {
"order": "asc",
"caseInsensitive": true
},
"pathGroups": [
{
"pattern": "@/**",
"group": "external",
"position": "after"
},
{
"pattern": "@ve-app",
"group": "internal",
"position": "after"
},
{
"pattern": "@ve-components",
"group": "internal",
"position": "after"
},
{
"pattern": "@ve-core",
"group": "internal",
"position": "after"
},
{
"pattern": "@ve-utils",
"group": "internal",
"position": "after"
},
{
"pattern": "@ve-types/**",
"group": "type",
"position": "after"
},
{
"pattern": "../../lib/**",
"group": "external",
"position": "after"
}
],
"groups": [
"builtin",
"external",
"internal",
"unknown",
"parent",
"sibling",
"index",
"object",
"type"
]
}
]
}
}
]
}
1 change: 0 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
module.exports = {
trailingComma: 'es5',
tabWidth: 4,
semi: false,
singleQuote: true,
printWidth: 120,
}
Loading

0 comments on commit 2d88930

Please sign in to comment.