Skip to content

Commit 2ac6022

Browse files
author
Ives van Hoorne
committed
Fix error
1 parent b2037d4 commit 2ac6022

File tree

3 files changed

+85
-21
lines changed

3 files changed

+85
-21
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
],
3939
"devDependencies": {
4040
"all-contributors-cli": "^4.3.0",
41-
"babel-eslint": "^7.2.3",
41+
"babel-eslint": "^8.2.1",
4242
"eslint": "CompuIves/eslint#add/define-parser",
4343
"eslint-config-airbnb": "^15.0.1",
4444
"eslint-config-prettier": "^2.1.1",

‎packages/app/src/app/components/CodeEditor/Monaco/workers/linter/index.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import Linter from 'eslint/lib/linter';
22

33
import monkeypatch from './monkeypatch-babel-eslint';
4-
import {
5-
getConfig as getVueConfig,
6-
getVerifyOptions as getVueVerifyOptions,
7-
} from './vue';
84

95
/* eslint-disable global-require */
106
const allRules = {
@@ -313,9 +309,10 @@ monkeypatch({}, defaultConfig.parserOptions);
313309

314310
const linter = new Linter();
315311

316-
linter.defineParser('babel-eslint', {
317-
parse: require('babel-eslint').parseNoPatch, // eslint-disable-line global-require
318-
});
312+
linter.defineParser(
313+
'babel-eslint',
314+
require('babel-eslint') // eslint-disable-line global-require
315+
);
319316

320317
linter.defineRules(allRules);
321318

@@ -353,6 +350,11 @@ self.addEventListener('message', async event => {
353350
let options = { filename };
354351

355352
if (template === 'vue-cli') {
353+
const {
354+
getConfig: getVueConfig,
355+
getVerifyOptions: getVueVerifyOptions,
356+
} = await import('./vue');
357+
356358
config = await getVueConfig(linter);
357359
config.rules = {
358360
...defaultConfig.rules,

‎yarn.lock‎

Lines changed: 75 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
# yarn lockfile v1
33

44

5+
"@babel/[email protected]":
6+
version "7.0.0-beta.36"
7+
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4"
8+
dependencies:
9+
chalk "^2.0.0"
10+
esutils "^2.0.2"
11+
js-tokens "^3.0.0"
12+
513
"@babel/code-frame@^7.0.0-beta.35":
614
version "7.0.0-beta.38"
715
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.38.tgz#c0af5930617e55e050336838e3a3670983b0b2b2"
@@ -16,6 +24,50 @@
1624
dependencies:
1725
"@babel/types" "7.0.0-beta.38"
1826

27+
"@babel/[email protected]":
28+
version "7.0.0-beta.36"
29+
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d"
30+
dependencies:
31+
"@babel/helper-get-function-arity" "7.0.0-beta.36"
32+
"@babel/template" "7.0.0-beta.36"
33+
"@babel/types" "7.0.0-beta.36"
34+
35+
"@babel/[email protected]":
36+
version "7.0.0-beta.36"
37+
resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8"
38+
dependencies:
39+
"@babel/types" "7.0.0-beta.36"
40+
41+
"@babel/[email protected]":
42+
version "7.0.0-beta.36"
43+
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00"
44+
dependencies:
45+
"@babel/code-frame" "7.0.0-beta.36"
46+
"@babel/types" "7.0.0-beta.36"
47+
babylon "7.0.0-beta.36"
48+
lodash "^4.2.0"
49+
50+
"@babel/[email protected]":
51+
version "7.0.0-beta.36"
52+
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261"
53+
dependencies:
54+
"@babel/code-frame" "7.0.0-beta.36"
55+
"@babel/helper-function-name" "7.0.0-beta.36"
56+
"@babel/types" "7.0.0-beta.36"
57+
babylon "7.0.0-beta.36"
58+
debug "^3.0.1"
59+
globals "^11.1.0"
60+
invariant "^2.2.0"
61+
lodash "^4.2.0"
62+
63+
"@babel/[email protected]":
64+
version "7.0.0-beta.36"
65+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23"
66+
dependencies:
67+
esutils "^2.0.2"
68+
lodash "^4.2.0"
69+
to-fast-properties "^2.0.0"
70+
1971
"@babel/[email protected]":
2072
version "7.0.0-beta.38"
2173
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.38.tgz#2ce2443f7dc6ad535a67db4940cbd34e64035a6f"
@@ -915,14 +967,16 @@ babel-core@^6.0.0, babel-core@^6.24.1, babel-core@^6.26.0:
915967
slash "^1.0.0"
916968
source-map "^0.5.6"
917969

918-
babel-eslint@^7.2.3:
919-
version "7.2.3"
920-
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
970+
babel-eslint@^8.2.1:
971+
version "8.2.1"
972+
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951"
921973
dependencies:
922-
babel-code-frame "^6.22.0"
923-
babel-traverse "^6.23.1"
924-
babel-types "^6.23.0"
925-
babylon "^6.17.0"
974+
"@babel/code-frame" "7.0.0-beta.36"
975+
"@babel/traverse" "7.0.0-beta.36"
976+
"@babel/types" "7.0.0-beta.36"
977+
babylon "7.0.0-beta.36"
978+
eslint-scope "~3.7.1"
979+
eslint-visitor-keys "^1.0.0"
926980

927981
babel-generator@^6.18.0, babel-generator@^6.24.1, babel-generator@^6.26.0:
928982
version "6.26.0"
@@ -1997,7 +2051,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-te
19972051
babylon "^6.18.0"
19982052
lodash "^4.17.4"
19992053

2000-
babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
2054+
babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
20012055
version "6.26.0"
20022056
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
20032057
dependencies:
@@ -2019,7 +2073,7 @@ [email protected]:
20192073
lodash "^4.2.0"
20202074
to-fast-properties "^2.0.0"
20212075

2022-
babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.26.0:
2076+
babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
20232077
version "6.26.0"
20242078
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
20252079
dependencies:
@@ -2036,7 +2090,11 @@ babili-webpack-plugin@^0.1.1:
20362090
babel-preset-babili "^0.1.4"
20372091
webpack-sources "^1.0.1"
20382092

2039-
babylon@^6.17.0, babylon@^6.17.3, babylon@^6.18.0:
2093+
[email protected]:
2094+
version "7.0.0-beta.36"
2095+
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e"
2096+
2097+
babylon@^6.17.3, babylon@^6.18.0:
20402098
version "6.18.0"
20412099
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
20422100

@@ -4865,7 +4923,7 @@ eslint-restricted-globals@^0.1.1:
48654923
version "0.1.1"
48664924
resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"
48674925

4868-
eslint-scope@^3.7.1:
4926+
eslint-scope@^3.7.1, eslint-scope@~3.7.1:
48694927
version "3.7.1"
48704928
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
48714929
dependencies:
@@ -6520,6 +6578,10 @@ global@^4.3.0, global@^4.3.2, global@~4.3.0:
65206578
min-document "^2.19.0"
65216579
process "~0.5.1"
65226580

6581+
globals@^11.1.0:
6582+
version "11.3.0"
6583+
resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
6584+
65236585
globals@^9.17.0, globals@^9.18.0:
65246586
version "9.18.0"
65256587
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -9468,7 +9530,7 @@ [email protected], lodash@^3.6.0:
94689530
version "3.10.1"
94699531
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
94709532

9471-
lodash@4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.1.0, lodash@^4.11.2, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
9533+
lodash@4, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.1.0, lodash@^4.11.2, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
94729534
version "4.17.4"
94739535
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
94749536

@@ -9480,7 +9542,7 @@ [email protected]:
94809542
version "4.17.2"
94819543
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
94829544

9483-
lodash@^4:
9545+
lodash@^4, lodash@^4.17.4:
94849546
version "4.17.5"
94859547
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
94869548

0 commit comments

Comments
 (0)