Skip to content

Commit

Permalink
Merge pull request #134 from IBMStreams/develop
Browse files Browse the repository at this point in the history
Update with latest code for v1.1.0
  • Loading branch information
Queenie Ma authored Nov 19, 2020
2 parents 774f42d + 0e08424 commit 77838e2
Show file tree
Hide file tree
Showing 240 changed files with 27,852 additions and 12,941 deletions.
6 changes: 1 addition & 5 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"presets": [
"@babel/env",
"@babel/preset-typescript",
"@babel/preset-react"
],
"presets": ["@babel/env", "@babel/preset-typescript", "@babel/preset-react"],
"plugins": [
"@babel/proposal-class-properties",
"@babel/proposal-object-rest-spread",
Expand Down
114 changes: 29 additions & 85 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,31 @@ module.exports = {
},
overrides: [
{
files: [
'src/**/*.ts',
'src/**/*.d.ts'
],
files: ['src/**/*.ts', 'src/**/*.d.ts'],
parser: '@typescript-eslint/parser',
parserOptions: {
sourceType: 'module'
},
plugins: [
'@typescript-eslint'
],
plugins: ['@typescript-eslint'],
extends: [
'plugin:@typescript-eslint/recommended'
'plugin:@typescript-eslint/recommended',
'prettier',
'prettier/@typescript-eslint'
],
rules: {
'arrow-parens': ['error', 'always'],
'import/extensions': 'off',
'import/no-self-import': 'off',
'import/no-unresolved': ['error', { 'ignore': ['keytar'] }],
'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }],
'no-empty-function': ['error', { allow: ['constructors'] }],
'no-useless-constructor': 'off',
'object-curly-newline': ['error', { multiline: true, minProperties: 5 }],
'@typescript-eslint/explicit-function-return-type': ['error', { allowExpressions: true }],
'@typescript-eslint/explicit-member-accessibility': ['error', { overrides: { constructors: 'no-public' } }],
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/member-delimiter-style': ['error', {
multiline: {
delimiter: 'comma',
requireLast: false
},
singleline: {
delimiter: 'comma',
requireLast: false
},
overrides: {
interface: {
multiline: {
delimiter: 'semi',
requireLast: true
}
}
'@typescript-eslint/camelcase': [
'error',
{
allow: ['env_id', 'env_type', 'last_modified'],
ignoreDestructuring: true
}
}],
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-parameter-properties': ['error', { allows: ['public', 'private'] }],
'@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
'@typescript-eslint/no-use-before-define': ['error', { classes: false, functions: false }],
'@typescript-eslint/no-useless-constructor': 'error'
],
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/no-explicit-any': 'off'
}
},
{
files: [
'src/**/*.js'
],
files: ['src/**/*.js'],
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module',
Expand All @@ -71,63 +41,37 @@ module.exports = {
},
extends: [
'airbnb',
'plugin:react/recommended'
'plugin:react/recommended',
'prettier',
'prettier/react'
],
rules: {
'arrow-body-style': 'off',
'arrow-parens': 'off',
'class-methods-use-this': 'off',
'comma-dangle': 'off',
'consistent-return': 'off',
'func-names': 'off',
'import/no-cycle': 'off',
'import/no-extraneous-dependencies': 'off',
'indent': 'off',
'max-len': 'off',
'no-cond-assign': ['error', 'except-parens'],
'no-console': 'off',
'no-control-regex': 'off',
'no-return-assign': 'off',
'no-underscore-dangle': 'off',
'no-unused-vars': ['error', { args: 'none' }],
'no-use-before-define': 'off',
'no-useless-escape': 'off',
'prefer-destructuring': ['error', { array: false }],
'react/jsx-curly-newline': 'off',
'react/jsx-filename-extension': ['error', { extensions: ['.js', '.jsx'] }],
'react/jsx-one-expression-per-line': 'off',
'react/forbid-prop-types': ['error', { forbid: ['any', 'array'] }],
'react/jsx-filename-extension': [
'error',
{ extensions: ['.js', '.jsx'] }
],
'react/jsx-props-no-spreading': ['error', { custom: 'ignore' }],
'react/sort-comp': 'off',
'semi': 'off',
'space-before-function-paren': ['error', {
anonymous: 'never',
named: 'never',
asyncArrow: 'always'
}],
'template-curly-spacing': 'off'
'react/sort-comp': 'off'
}
},
{
files: [
'test/**/*.ts'
],
files: ['test/**/*.ts'],
parserOptions: {
sourceType: 'module'
},
plugins: [
'@typescript-eslint',
'mocha'
],
plugins: ['@typescript-eslint', 'mocha'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:mocha/recommended'
'plugin:mocha/recommended',
'prettier',
'prettier/@typescript-eslint'
],
rules: {
'mocha/no-hooks-for-single-case': 'off',
'mocha/no-setup-in-describe': 'off',
'mocha/prefer-arrow-callback': 'error',
'no-unused-expressions': 'off',
'prefer-arrow-callback': 'off'
'mocha/no-setup-in-describe': 'off'
}
}
],
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
_site
.DS_Store
.vscode-test
dist
ibm-streams-*.vsix
node_modules
out
package-lock.json
stats.json
toolkitsCache
yarn-debug.log*
yarn-error.log*
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist
src/webviews/**/*.html
4 changes: 4 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
singleQuote: true,
trailingComma: 'none'
};
102 changes: 45 additions & 57 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,48 @@
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.2.0",
"configurations": [
{
"name": "Launch Extension",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "npm: webpack:dev-watch",
"sourceMaps": true,
"skipFiles": [
"<node_internals>/**/*.js"
]
},
{
"name": "Launch Extension (Extensions and Logging Disabled)",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--disable-extensions",
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "npm: webpack:dev-watch",
"sourceMaps": true,
"skipFiles": [
"<node_internals>/**/*.js"
],
"env": {
"LOGGING_ENABLED": "false"
}
},
{
"name": "Launch Extension Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--disable-extensions",
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test/index"
],
"outFiles": [
"${workspaceFolder}/out/test/**/*.js"
],
"preLaunchTask": "npm: test:compile"
}
]
}
"version": "0.2.0",
"configurations": [
{
"name": "Launch Extension",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "npm: webpack:dev-watch",
"sourceMaps": true,
"skipFiles": ["<node_internals>/**/*.js"]
},
{
"name": "Launch Extension (Extensions and Logging Disabled)",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--disable-extensions",
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
"preLaunchTask": "npm: webpack:dev-watch",
"sourceMaps": true,
"skipFiles": ["<node_internals>/**/*.js"],
"env": {
"LOGGING_ENABLED": "false"
}
},
{
"name": "Launch Extension Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--disable-extensions",
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test/index"
],
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
"preLaunchTask": "npm: test:compile"
}
]
}
11 changes: 4 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.tabSize": 2,
"eslint.enable": true,
"eslint.packageManager": "yarn",
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"files.trimTrailingWhitespace": true,
"npm.packageManager": "yarn",
"prettier.packageManager": "yarn",
"search.exclude": {
"**/dist": true,
"**/out": true
Expand Down
Loading

0 comments on commit 77838e2

Please sign in to comment.