Skip to content

Commit a59a964

Browse files
committed
fix: #4623 re-adds js linting, fixes typechecking in vscode
1 parent 0fdc308 commit a59a964

Some content is hidden

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

62 files changed

+120
-110
lines changed

.eslintignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
packages/foundations-ts-definitions/types/**/*
22
packages/**/*.graphql
3-
packages/**/*.js

packages/admin-portal/babel.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/admin-portal/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"start": "webpack serve --hot --color --mode development",
1212
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1313
"build": "rimraf public/dist && NODE_ENV=production webpack",
14-
"lint": "eslint --cache --ext=ts,tsx src --fix",
14+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1515
"release": "serverless deploy",
1616
"publish": "echo '...skipping...'",
1717
"conf": "yarn config-manager --namespace cloud --entity admin-portal --name local --mode fetch",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/aml-checklist/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"start": "webpack serve --hot --color --mode development",
1515
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1616
"build": "rimraf public/dist && NODE_ENV=production webpack",
17-
"lint": "eslint --cache --ext=ts,tsx src --fix",
17+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1818
"release": "serverless deploy",
1919
"publish": "echo '...skipping...'",
2020
"conf": "yarn config-manager --namespace cloud --entity aml-checklist --name local --mode fetch",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/api-key-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"scripts": {
2525
"start": "reapit-fetch-public-keys && yarn build && yarn serverless offline start --runtime nodejs12.x --stage local",
2626
"build": "echo '...skipping...'",
27-
"lint": "eslint --cache --ext=ts,tsx src --fix",
27+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
2828
"test": "reapit-fetch-public-keys --test && cross-env TZ=UTC jest --colors --watch --silent",
2929
"conf": "yarn config-manager --namespace cloud --entity api-key-service --name local --mode fetch",
3030
"release": "reapit-fetch-public-keys && serverless deploy",

packages/api-key-verify/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"start": "echo '...skipping...'",
1414
"test": "cross-env TZ=UTC jest --watch --colors",
1515
"build": "echo '...skipping...'",
16-
"lint": "eslint --cache --ext=ts,tsx src --fix",
16+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1717
"release": "echo '...skipping...'",
1818
"publish": "yarn npm publish --access public",
1919
"conf": "echo '...skipping...'",

packages/app-builder/babel.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/app-builder/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"start": "webpack serve --hot --color --mode development",
1515
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1616
"build": "rimraf public/dist && NODE_ENV=production webpack",
17-
"lint": "eslint --cache --ext=ts,tsx src --fix",
17+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1818
"release": "serverless deploy",
1919
"publish": "echo '...skipping...'",
2020
"conf": "yarn config-manager --namespace cloud --entity app-builder --name local --mode fetch",

packages/cli/babel.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"scripts": {
4242
"run": "ts-node src/index.ts",
4343
"build": "tsc -p .",
44-
"lint": "eslint --cache --ext=ts,tsx src --fix",
44+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
4545
"conf": "echo '...skipping...'",
4646
"test": "echo '...skipping...'",
4747
"release": "echo '...skipping...'",

packages/cloud-alert/babel.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/cloud-alert/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "cypress run",
99
"test": "echo '...skipping...'",
1010
"build": "echo '...skipping...'",
11-
"lint": "echo '...skipping...'",
11+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1212
"release": "echo '...skipping...'",
1313
"publish": "echo '...skipping...'",
1414
"conf": "echo '...skipping...'",
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/cognito-custom-mail-lambda/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"start": "yarn serverless offline start --runtime nodejs12.x --stage local --printOutput",
1111
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1212
"build": "echo '...skipping...'",
13-
"lint": "eslint --cache --ext=ts,tsx src --fix",
13+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1414
"release": "serverless deploy",
1515
"publish": "echo '...skipping...'",
1616
"conf": "yarn config-manager --namespace cloud --entity cognito-custom-mail-lambda --name local --mode fetch",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/config-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"start": "yarn serverless offline start --runtime nodejs12.x --stage local --printOutput",
1212
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1313
"build": "echo '...skipping...'",
14-
"lint": "eslint --cache --ext=ts,tsx src --fix",
14+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1515
"release": "serverless deploy",
1616
"publish": "echo '...skipping...'",
1717
"conf": "yarn config-manager --namespace cloud --entity config-service --name local --mode fetch",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/connect-session/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"start": "echo '...skipping...'",
2727
"test": "cross-env TZ=UTC jest --watch --colors --silent",
2828
"build": "cross-env NODE_ENV=production tsdx build --format=cjs,esm,umd",
29-
"lint": "eslint --cache --ext=ts,tsx src --fix",
29+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
3030
"release": "echo '...skipping...'",
3131
"publish": "yarn npm publish --access public",
3232
"conf": "echo '...skipping...'",

packages/cra-template-foundations/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"start": "echo '...skipping...'",
88
"test": "echo '...skipping...'",
99
"build": "echo '...skipping...'",
10-
"lint": "eslint --cache --ext=ts,tsx template --fix",
10+
"lint": "eslint --cache --ext=ts,tsx,js template --fix",
1111
"release": "echo '...skipping...'",
1212
"publish": "yarn npm publish --access public",
1313
"conf": "echo '...skipping...'",

packages/cra-template-foundations/template/config-overrides.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const path = require('path')
1212
* disable useTypescriptIncrementalApi of react-scripts ForkTsCheckerWebpackPlugin
1313
* Fix Hanging at 'Files successfully emitted, waiting for typecheck results...' when yarn start on the first time
1414
*/
15-
const removeOriginalForkTsCheckerWebpackPlugin = config => {
16-
config.plugins = config.plugins.filter(plugin => {
15+
const removeOriginalForkTsCheckerWebpackPlugin = (config) => {
16+
config.plugins = config.plugins.filter((plugin) => {
1717
return plugin.constructor.name !== 'ForkTsCheckerWebpackPlugin'
1818
})
1919

@@ -49,7 +49,7 @@ const patchForkTsCheckerWebpackPlugin = (config, env) => {
4949
/**
5050
* Add linaria loader after babel loader
5151
*/
52-
const transformLoader = loader => {
52+
const transformLoader = (loader) => {
5353
const options = loader.options || {}
5454
const presets = options.presets || []
5555
options.presets = presets
@@ -76,23 +76,23 @@ const transformLoader = loader => {
7676
}
7777
}
7878

79-
const updateJestSetupTestFiles = config => {
79+
const updateJestSetupTestFiles = (config) => {
8080
const setupTestFile = path.resolve(__dirname, './src/setup-tests.js')
8181
config.setupFiles.push(setupTestFile)
8282
return config
8383
}
8484

85-
const addLinariaLoader = config => {
85+
const addLinariaLoader = (config) => {
8686
/**
8787
* cra scripts rules atm (version 3)
8888
* https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/config/webpack.config.js
8989
*/
90-
const ruleWithOneOf = config.module.rules.find(rule => rule.oneOf)
90+
const ruleWithOneOf = config.module.rules.find((rule) => rule.oneOf)
9191
if (ruleWithOneOf === null) {
9292
throw Error('Cant find webpack rule with oneOf')
9393
}
9494

95-
let subRuleWithTsxIndex = ruleWithOneOf.oneOf.findIndex(rule => rule.test.toString().includes('tsx'))
95+
let subRuleWithTsxIndex = ruleWithOneOf.oneOf.findIndex((rule) => rule.test.toString().includes('tsx'))
9696
if (subRuleWithTsxIndex === -1) {
9797
throw Error('Cant find rule match ts/tsx')
9898
}
@@ -105,13 +105,13 @@ const addLinariaLoader = config => {
105105
// react-rewired configuration https://github.com/timarney/react-app-rewired
106106
module.exports = {
107107
// The Webpack config to use when compiling your react app for development or production.
108-
webpack: function(config, env) {
108+
webpack: function (config, env) {
109109
return {
110110
...override(addBabelPreset('linaria/babel'), addLinariaLoader, removeOriginalForkTsCheckerWebpackPlugin)(config),
111111
...patchForkTsCheckerWebpackPlugin(config, env),
112112
}
113113
},
114-
jest: function(config) {
114+
jest: function (config) {
115115
return updateJestSetupTestFiles(config)
116116
},
117117
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/data-warehouse/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"start": "webpack serve --hot --color --mode development",
1212
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1313
"build": "rimraf public/dist && NODE_ENV=production webpack",
14-
"lint": "eslint --cache --ext=ts,tsx src --fix",
14+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1515
"release": "serverless deploy",
1616
"publish": "echo '...skipping...'",
1717
"conf": "yarn config-manager --namespace cloud --entity data-warehouse --name local --mode fetch",
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/deployment-service-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"start": "webpack serve --hot --color --mode development",
1515
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1616
"build": "rimraf public/dist && NODE_ENV=production webpack",
17-
"lint": "eslint --cache --ext=ts,tsx src --fix",
17+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1818
"release": "serverless deploy",
1919
"publish": "echo '...skipping...'",
2020
"conf": "yarn config-manager --namespace cloud --entity deployment-service-ui --name local --mode fetch",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/deployment-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"start": "reapit-fetch-public-keys yarn build && yarn serverless offline start --runtime nodejs12.x --stage local",
2121
"test": "reapit-fetch-public-keys --test && echo '...skipping...'",
2222
"build": "echo '...skipping...'",
23-
"lint": "eslint --cache --ext=ts,tsx src --fix",
23+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
2424
"release": "yarn reapit-fetch-public-keys && serverless deploy",
2525
"publish": "echo '...skipping...'",
2626
"conf": "yarn config-manager --namespace cloud --entity deployment-service --name local --mode fetch",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/developer-portal/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"start": "webpack serve --hot --color --mode development",
1212
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1313
"build": "rimraf public/dist && NODE_ENV=production webpack",
14-
"lint": "eslint --cache --ext=ts,tsx src --fix",
14+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1515
"release": "serverless deploy",
1616
"publish": "echo '...skipping...'",
1717
"conf": "yarn config-manager --namespace cloud --entity developer-portal --name local --mode fetch",
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/elements-legacy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"build:v3": "cross-env NODE_ENV=production && rimraf ./v3 && yarn workspace @reapit/elements run build:dist && cd ../elements && move-file dist/ ../elements-legacy/v3/",
2929
"commit": "concurrently \"yarn test --coverage --no-cache --silent --forceExit --detectOpenHandles --runInBand --watch=false && jest-coverage-badges --input src/tests/coverage/coverage-summary.json --output src/tests/badges\" \"yarn lint\"",
3030
"conf": "yarn config-manager --namespace cloud --entity elements-legacy --name local --mode fetch",
31-
"lint": "eslint --cache --ext=ts,tsx src --fix",
31+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
3232
"publish": "yarn npm publish --access public",
3333
"release": "serverless deploy",
3434
"start": "start-storybook -p 6006",

packages/elements-legacy/src/scripts/jest-setup.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ global.fetch = fetchMock
88
const mockStorage = (() => {
99
let store = {}
1010
return {
11-
getItem: key => {
11+
getItem: (key) => {
1212
return store[key]
1313
},
1414
setItem: (key, value) => {
1515
store[key] = value.toString()
1616
},
17-
removeItem: key => {
17+
removeItem: (key) => {
1818
store[key] = undefined
1919
},
2020
clear: () => {

packages/elements/babel.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/elements/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"build:dist": "cross-env NODE_ENV=production && rimraf public/dist && tsdx build --format=cjs,esm,umd",
2828
"commit": "concurrently \"yarn test --coverage --no-cache --silent --forceExit --detectOpenHandles --runInBand --watch=false && jest-coverage-badges --input src/tests/coverage/coverage-summary.json --output src/tests/badges\" \"yarn lint\"",
2929
"conf": "yarn config-manager --namespace cloud --entity elements --name local --mode fetch",
30-
"lint": "eslint --cache --ext=ts,tsx src --fix",
30+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
3131
"publish": "yarn npm publish --access public",
3232
"release": "serverless deploy",
3333
"start": "start-storybook -p 6006",

packages/events-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"build": "echo '...skipping...'",
1111
"commit": "concurrently \"yarn test --coverage --no-cache --silent --forceExit --detectOpenHandles --runInBand --watch=false && jest-coverage-badges --input src/tests/coverage/coverage-summary.json --output src/tests/badges\" \"yarn lint\"",
1212
"conf": "yarn config-manager --namespace cloud --entity events-service --name local --mode fetch",
13-
"lint": "eslint --cache --ext=ts,tsx src --fix",
13+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1414
"publish": "echo '...skipping...'",
1515
"release": "serverless deploy",
1616
"start": "serverless dynamodb install && yarn serverless offline start --runtime nodejs12.x --stage local --printOutput",

packages/geo-diary/babel.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { baseBabel } = require('@reapit/ts-scripts')
22

33
module.exports = {
4-
...baseBabel
5-
}
4+
...baseBabel,
5+
}

packages/geo-diary/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"start": "webpack serve --hot --color --mode development",
1515
"test": "cross-env TZ=UTC jest --watch --colors --silent",
1616
"build": "rimraf public/dist && NODE_ENV=production webpack",
17-
"lint": "eslint --cache --ext=ts,tsx src --fix",
17+
"lint": "eslint --cache --ext=ts,tsx,js src --fix",
1818
"release": "serverless deploy",
1919
"publish": "echo '...skipping...'",
2020
"conf": "yarn config-manager --namespace cloud --entity geo-diary --name local --mode fetch",

0 commit comments

Comments
 (0)