Skip to content

Commit 1f1f487

Browse files
authoredJun 6, 2021
Merge pull request #491 from coderoad/release/0.14.3
Release/0.14.3
2 parents 1a6a120 + e77f2be commit 1f1f487

File tree

7 files changed

+27
-45
lines changed

7 files changed

+27
-45
lines changed
 

‎.eslintrc.js

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
33
plugins: ['prettier'],
4-
extends: [
5-
'react-app',
6-
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
7-
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
8-
'plugin:prettier/recommended',
9-
],
4+
extends: ['react-app', 'plugin:prettier/recommended'],
105
parserOptions: {
116
ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
127
sourceType: 'module', // Allows for the use of imports
138
},
149
rules: {
15-
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
16-
'@typescript-eslint/explicit-function-return-type': 'off',
17-
'@typescript-eslint/no-explicit-any': 'off',
18-
'@typescript-eslint/ban-ts-ignore': 'off',
19-
'@typescript-eslint/no-unused-vars': 'off',
20-
'@typescript-eslint/camelcase': 'off',
21-
'@typescript-eslint/ban-ts-comment': 'off',
2210
// 'react/forbid-component-props': [1, { forbid: ['style'] }],
2311
// 'react/forbid-dom-props': [1, { forbid: ['style'] }],
12+
'space-before-function-paren': 0,
13+
'prettier/prettier': 'error',
2414
},
2515
}

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "coderoad",
3-
"version": "0.14.2",
3+
"version": "0.14.3",
44
"description": "Play interactive coding tutorials in your editor",
55
"keywords": [
66
"tutorial",
@@ -51,13 +51,13 @@
5151
"@types/assert": "1.5.4",
5252
"@types/jest": "26.0.23",
5353
"@types/jsdom": "16.2.10",
54-
"@types/node": "14.14.19",
54+
"@types/node": "15.0.2",
5555
"@types/node-fetch": "2.5.10",
5656
"@types/semver": "7.3.5",
5757
"@typescript-eslint/eslint-plugin": "4.23.0",
5858
"@typescript-eslint/parser": "4.23.0",
59-
"eslint-config-prettier": "^6.11.0",
60-
"eslint-config-react-app": "^5.2.1",
59+
"eslint-config-prettier": "8.3.0",
60+
"eslint-config-react-app": "6.0.0",
6161
"eslint-plugin-flowtype": "5.7.2",
6262
"eslint-plugin-import": "2.22.1",
6363
"eslint-plugin-jsx-a11y": "6.4.1",

‎scripts/package.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ echo "Building..."
1515
yarn build
1616

1717
echo "Packaging Extension..."
18-
vsce package --yarn --out ./$RELEASES_FOLDER
18+
mkdir -p ./$RELEASES_FOLDER
19+
npx vsce package --yarn --out ./$RELEASES_FOLDER
1920

2021
echo "Installing Extension..."
2122
code --install-extension ./$RELEASES_FOLDER/$OUTPUT_FILE

‎src/actions/onRunReset.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as T from 'typings'
22
import * as TT from 'typings/tutorial'
33
import Context from '../services/context/context'
4-
import { exec } from '../services/node'
54
import reset from '../services/reset'
65
import * as hooks from '../services/hooks'
76
import getCommitHashByPosition from '../services/reset/lastHash'

‎src/commands.ts

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import createTestRunner from './services/testRunner'
55
import createWebView from './services/webview'
66
import * as hooks from './services/hooks'
77
import logger from './services/logger'
8-
import * as actions from './actions'
98
import Channel from './channel'
109

1110
export const COMMANDS = {

‎web-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "coderoad-app",
3-
"version": "0.14.2",
3+
"version": "0.14.3",
44
"private": true,
55
"scripts": {
66
"build": "react-app-rewired build",

‎yarn.lock

+17-24
Original file line numberDiff line numberDiff line change
@@ -709,10 +709,10 @@
709709
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.0.tgz#30d2d09f623fe32cde9cb582c7a6eda2788ce4a8"
710710
integrity sha512-WE4IOAC6r/yBZss1oQGM5zs2D7RuKR6Q+w+X2SouPofnWn+LbCqClRyhO3ZE7Ix8nmFgo/oVuuE01cJT2XB13A==
711711

712-
"@types/node@14.14.19":
713-
version "14.14.19"
714-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.19.tgz#5135176a8330b88ece4e9ab1fdcfc0a545b4bab4"
715-
integrity sha512-4nhBPStMK04rruRVtVc6cDqhu7S9GZai0fpXgPXrFpcPX6Xul8xnrjSdGB4KPBVYG/R5+fXWdCM8qBoiULWGPQ==
712+
"@types/node@15.0.2":
713+
version "15.0.2"
714+
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
715+
integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
716716

717717
"@types/normalize-package-data@^2.4.0":
718718
version "2.4.0"
@@ -1510,10 +1510,10 @@ concat-map@0.0.1:
15101510
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
15111511
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
15121512

1513-
confusing-browser-globals@^1.0.9:
1514-
version "1.0.9"
1515-
resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
1516-
integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==
1513+
confusing-browser-globals@^1.0.10:
1514+
version "1.0.10"
1515+
resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59"
1516+
integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==
15171517

15181518
contains-path@^0.1.0:
15191519
version "0.1.0"
@@ -1954,19 +1954,17 @@ escodegen@^2.0.0:
19541954
optionalDependencies:
19551955
source-map "~0.6.1"
19561956

1957-
eslint-config-prettier@^6.11.0:
1958-
version "6.11.0"
1959-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
1960-
integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
1961-
dependencies:
1962-
get-stdin "^6.0.0"
1957+
eslint-config-prettier@8.3.0:
1958+
version "8.3.0"
1959+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
1960+
integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
19631961

1964-
eslint-config-react-app@^5.2.1:
1965-
version "5.2.1"
1966-
resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz#698bf7aeee27f0cea0139eaef261c7bf7dd623df"
1967-
integrity sha512-pGIZ8t0mFLcV+6ZirRgYK6RVqUIKRIi9MmgzUEmrIknsn3AdO0I32asO86dJgloHq+9ZPl8UIg8mYrvgP5u2wQ==
1962+
eslint-config-react-app@6.0.0:
1963+
version "6.0.0"
1964+
resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-6.0.0.tgz#ccff9fc8e36b322902844cbd79197982be355a0e"
1965+
integrity sha512-bpoAAC+YRfzq0dsTk+6v9aHm/uqnDwayNAXleMypGl6CpxI9oXXscVHo4fk3eJPIn+rsbtNetB4r/ZIidFIE8A==
19681966
dependencies:
1969-
confusing-browser-globals "^1.0.9"
1967+
confusing-browser-globals "^1.0.10"
19701968

19711969
eslint-import-resolver-node@^0.3.4:
19721970
version "0.3.4"
@@ -2513,11 +2511,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
25132511
has "^1.0.3"
25142512
has-symbols "^1.0.1"
25152513

2516-
get-stdin@^6.0.0:
2517-
version "6.0.0"
2518-
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
2519-
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
2520-
25212514
get-stream@^4.0.0:
25222515
version "4.1.0"
25232516
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"

0 commit comments

Comments
 (0)
Failed to load comments.