Skip to content

Commit 77838e2

Browse files
author
Queenie Ma
authored
Merge pull request #134 from IBMStreams/develop
Update with latest code for v1.1.0
2 parents 774f42d + 0e08424 commit 77838e2

File tree

240 files changed

+27852
-12941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+27852
-12941
lines changed

‎.babelrc‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
2-
"presets": [
3-
"@babel/env",
4-
"@babel/preset-typescript",
5-
"@babel/preset-react"
6-
],
2+
"presets": ["@babel/env", "@babel/preset-typescript", "@babel/preset-react"],
73
"plugins": [
84
"@babel/proposal-class-properties",
95
"@babel/proposal-object-rest-spread",

‎.eslintrc.js‎

Lines changed: 29 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,31 @@ module.exports = {
77
},
88
overrides: [
99
{
10-
files: [
11-
'src/**/*.ts',
12-
'src/**/*.d.ts'
13-
],
10+
files: ['src/**/*.ts', 'src/**/*.d.ts'],
1411
parser: '@typescript-eslint/parser',
1512
parserOptions: {
1613
sourceType: 'module'
1714
},
18-
plugins: [
19-
'@typescript-eslint'
20-
],
15+
plugins: ['@typescript-eslint'],
2116
extends: [
22-
'plugin:@typescript-eslint/recommended'
17+
'plugin:@typescript-eslint/recommended',
18+
'prettier',
19+
'prettier/@typescript-eslint'
2320
],
2421
rules: {
25-
'arrow-parens': ['error', 'always'],
26-
'import/extensions': 'off',
27-
'import/no-self-import': 'off',
28-
'import/no-unresolved': ['error', { 'ignore': ['keytar'] }],
29-
'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }],
30-
'no-empty-function': ['error', { allow: ['constructors'] }],
31-
'no-useless-constructor': 'off',
32-
'object-curly-newline': ['error', { multiline: true, minProperties: 5 }],
33-
'@typescript-eslint/explicit-function-return-type': ['error', { allowExpressions: true }],
34-
'@typescript-eslint/explicit-member-accessibility': ['error', { overrides: { constructors: 'no-public' } }],
35-
'@typescript-eslint/interface-name-prefix': 'off',
36-
'@typescript-eslint/member-delimiter-style': ['error', {
37-
multiline: {
38-
delimiter: 'comma',
39-
requireLast: false
40-
},
41-
singleline: {
42-
delimiter: 'comma',
43-
requireLast: false
44-
},
45-
overrides: {
46-
interface: {
47-
multiline: {
48-
delimiter: 'semi',
49-
requireLast: true
50-
}
51-
}
22+
'@typescript-eslint/camelcase': [
23+
'error',
24+
{
25+
allow: ['env_id', 'env_type', 'last_modified'],
26+
ignoreDestructuring: true
5227
}
53-
}],
54-
'@typescript-eslint/no-explicit-any': 'off',
55-
'@typescript-eslint/no-parameter-properties': ['error', { allows: ['public', 'private'] }],
56-
'@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
57-
'@typescript-eslint/no-use-before-define': ['error', { classes: false, functions: false }],
58-
'@typescript-eslint/no-useless-constructor': 'error'
28+
],
29+
'@typescript-eslint/interface-name-prefix': 'off',
30+
'@typescript-eslint/no-explicit-any': 'off'
5931
}
6032
},
6133
{
62-
files: [
63-
'src/**/*.js'
64-
],
34+
files: ['src/**/*.js'],
6535
parser: 'babel-eslint',
6636
parserOptions: {
6737
sourceType: 'module',
@@ -71,63 +41,37 @@ module.exports = {
7141
},
7242
extends: [
7343
'airbnb',
74-
'plugin:react/recommended'
44+
'plugin:react/recommended',
45+
'prettier',
46+
'prettier/react'
7547
],
7648
rules: {
77-
'arrow-body-style': 'off',
78-
'arrow-parens': 'off',
7949
'class-methods-use-this': 'off',
80-
'comma-dangle': 'off',
81-
'consistent-return': 'off',
82-
'func-names': 'off',
8350
'import/no-cycle': 'off',
84-
'import/no-extraneous-dependencies': 'off',
85-
'indent': 'off',
86-
'max-len': 'off',
87-
'no-cond-assign': ['error', 'except-parens'],
88-
'no-console': 'off',
8951
'no-control-regex': 'off',
90-
'no-return-assign': 'off',
91-
'no-underscore-dangle': 'off',
92-
'no-unused-vars': ['error', { args: 'none' }],
93-
'no-use-before-define': 'off',
94-
'no-useless-escape': 'off',
95-
'prefer-destructuring': ['error', { array: false }],
96-
'react/jsx-curly-newline': 'off',
97-
'react/jsx-filename-extension': ['error', { extensions: ['.js', '.jsx'] }],
98-
'react/jsx-one-expression-per-line': 'off',
52+
'react/forbid-prop-types': ['error', { forbid: ['any', 'array'] }],
53+
'react/jsx-filename-extension': [
54+
'error',
55+
{ extensions: ['.js', '.jsx'] }
56+
],
9957
'react/jsx-props-no-spreading': ['error', { custom: 'ignore' }],
100-
'react/sort-comp': 'off',
101-
'semi': 'off',
102-
'space-before-function-paren': ['error', {
103-
anonymous: 'never',
104-
named: 'never',
105-
asyncArrow: 'always'
106-
}],
107-
'template-curly-spacing': 'off'
58+
'react/sort-comp': 'off'
10859
}
10960
},
11061
{
111-
files: [
112-
'test/**/*.ts'
113-
],
62+
files: ['test/**/*.ts'],
11463
parserOptions: {
11564
sourceType: 'module'
11665
},
117-
plugins: [
118-
'@typescript-eslint',
119-
'mocha'
120-
],
66+
plugins: ['@typescript-eslint', 'mocha'],
12167
extends: [
12268
'plugin:@typescript-eslint/recommended',
123-
'plugin:mocha/recommended'
69+
'plugin:mocha/recommended',
70+
'prettier',
71+
'prettier/@typescript-eslint'
12472
],
12573
rules: {
126-
'mocha/no-hooks-for-single-case': 'off',
127-
'mocha/no-setup-in-describe': 'off',
128-
'mocha/prefer-arrow-callback': 'error',
129-
'no-unused-expressions': 'off',
130-
'prefer-arrow-callback': 'off'
74+
'mocha/no-setup-in-describe': 'off'
13175
}
13276
}
13377
],

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
_site
12
.DS_Store
23
.vscode-test
34
dist
45
ibm-streams-*.vsix
56
node_modules
67
out
8+
package-lock.json
9+
stats.json
710
toolkitsCache
11+
yarn-debug.log*
12+
yarn-error.log*

‎.prettierignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
dist
2+
src/webviews/**/*.html

‎.prettierrc.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
singleQuote: true,
3+
trailingComma: 'none'
4+
};

‎.vscode/launch.json‎

Lines changed: 45 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,48 @@
33
// Hover to view descriptions of existing attributes.
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
{
6-
"version": "0.2.0",
7-
"configurations": [
8-
{
9-
"name": "Launch Extension",
10-
"type": "extensionHost",
11-
"request": "launch",
12-
"runtimeExecutable": "${execPath}",
13-
"args": [
14-
"--extensionDevelopmentPath=${workspaceFolder}"
15-
],
16-
"outFiles": [
17-
"${workspaceFolder}/dist/**/*.js"
18-
],
19-
"preLaunchTask": "npm: webpack:dev-watch",
20-
"sourceMaps": true,
21-
"skipFiles": [
22-
"<node_internals>/**/*.js"
23-
]
24-
},
25-
{
26-
"name": "Launch Extension (Extensions and Logging Disabled)",
27-
"type": "extensionHost",
28-
"request": "launch",
29-
"runtimeExecutable": "${execPath}",
30-
"args": [
31-
"--disable-extensions",
32-
"--extensionDevelopmentPath=${workspaceFolder}"
33-
],
34-
"outFiles": [
35-
"${workspaceFolder}/dist/**/*.js"
36-
],
37-
"preLaunchTask": "npm: webpack:dev-watch",
38-
"sourceMaps": true,
39-
"skipFiles": [
40-
"<node_internals>/**/*.js"
41-
],
42-
"env": {
43-
"LOGGING_ENABLED": "false"
44-
}
45-
},
46-
{
47-
"name": "Launch Extension Tests",
48-
"type": "extensionHost",
49-
"request": "launch",
50-
"runtimeExecutable": "${execPath}",
51-
"args": [
52-
"--disable-extensions",
53-
"--extensionDevelopmentPath=${workspaceFolder}",
54-
"--extensionTestsPath=${workspaceFolder}/out/test/index"
55-
],
56-
"outFiles": [
57-
"${workspaceFolder}/out/test/**/*.js"
58-
],
59-
"preLaunchTask": "npm: test:compile"
60-
}
61-
]
62-
}
6+
"version": "0.2.0",
7+
"configurations": [
8+
{
9+
"name": "Launch Extension",
10+
"type": "extensionHost",
11+
"request": "launch",
12+
"runtimeExecutable": "${execPath}",
13+
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
14+
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
15+
"preLaunchTask": "npm: webpack:dev-watch",
16+
"sourceMaps": true,
17+
"skipFiles": ["<node_internals>/**/*.js"]
18+
},
19+
{
20+
"name": "Launch Extension (Extensions and Logging Disabled)",
21+
"type": "extensionHost",
22+
"request": "launch",
23+
"runtimeExecutable": "${execPath}",
24+
"args": [
25+
"--disable-extensions",
26+
"--extensionDevelopmentPath=${workspaceFolder}"
27+
],
28+
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
29+
"preLaunchTask": "npm: webpack:dev-watch",
30+
"sourceMaps": true,
31+
"skipFiles": ["<node_internals>/**/*.js"],
32+
"env": {
33+
"LOGGING_ENABLED": "false"
34+
}
35+
},
36+
{
37+
"name": "Launch Extension Tests",
38+
"type": "extensionHost",
39+
"request": "launch",
40+
"runtimeExecutable": "${execPath}",
41+
"args": [
42+
"--disable-extensions",
43+
"--extensionDevelopmentPath=${workspaceFolder}",
44+
"--extensionTestsPath=${workspaceFolder}/out/test/index"
45+
],
46+
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
47+
"preLaunchTask": "npm: test:compile"
48+
}
49+
]
50+
}

‎.vscode/settings.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
"editor.codeActionsOnSave": {
33
"source.fixAll.eslint": true
44
},
5+
"editor.defaultFormatter": "esbenp.prettier-vscode",
6+
"editor.formatOnSave": true,
7+
"editor.tabSize": 2,
58
"eslint.enable": true,
69
"eslint.packageManager": "yarn",
7-
"eslint.validate": [
8-
"javascript",
9-
"javascriptreact",
10-
"typescript",
11-
"typescriptreact"
12-
],
1310
"files.trimTrailingWhitespace": true,
14-
"npm.packageManager": "yarn",
11+
"prettier.packageManager": "yarn",
1512
"search.exclude": {
1613
"**/dist": true,
1714
"**/out": true

0 commit comments

Comments
 (0)