Skip to content

Commit 48b6855

Browse files
committed
fix(legacy-colors-command): fixed the legacy-colors-command
1 parent df93b36 commit 48b6855

5 files changed

Lines changed: 14799 additions & 14759 deletions

File tree

.eslintrc.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var baseTsRules = {
3232
'error',
3333
'always',
3434
{
35-
ignorePattern: 'pragma|ignore|prettier-ignore',
35+
ignorePattern: 'pragma|ignore|prettier-ignore|webpack',
3636
ignoreInlineComments: true,
3737
ignoreConsecutiveComments: true,
3838
},
@@ -205,7 +205,7 @@ var baseTsRules = {
205205
],
206206
'keyword-spacing': 'off',
207207
'lines-around-comment': [
208-
'error',
208+
'off',
209209
{
210210
beforeBlockComment: true,
211211
afterBlockComment: false,
@@ -219,7 +219,7 @@ var baseTsRules = {
219219
allowArrayEnd: false,
220220
beforeLineComment: true,
221221
allowBlockStart: true,
222-
ignorePattern: 'pragma|ignore|prettier-ignore',
222+
ignorePattern: 'pragma|ignore|prettier-ignore|Webpack|webpack',
223223
},
224224
],
225225
'lines-between-class-members': 'off',
@@ -469,7 +469,7 @@ var baseTsRules = {
469469
var tsRules = {
470470
...baseTsRules,
471471
'max-classes-per-file': ['error', { ignoreExpressions: true, max: 1 }],
472-
'@typescript-eslint/no-require-imports': ['error'],
472+
'@typescript-eslint/no-require-imports': ['off'],
473473
'prettier/prettier': 2,
474474
};
475475

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"test": "node ./out/test/runTest.js && npx vscode-tmgrammar-test -g syntaxes/html-template.ng.json -g test/externalGrammars/source.css.tmLanguage.json -g test/externalGrammars/source.ts.tmLanguage.json -g test/externalGrammars/source.css.scss.tmLanguage.json -g test/externalGrammars/source.css.less.tmLanguage.json -g test/externalGrammars/source.stylus.tmLanguage.json -g test/externalGrammars/source.sassdoc.tmLanguage.json -g test/externalGrammars/source.js.tmLanguage.json -g test/externalGrammars/source.coffee.tmLanguage.json -g test/externalGrammars/source.dart.tmLanguage.json -g test/externalGrammars/source.postcss.tmLanguage.plist -g test/externalGrammars/source.sass.tmLanguage.json -g test/externalGrammars/source.js.regexp.tmLanguage.plist test/*.html",
3636
"update-snapshots": "npx vscode-tmgrammar-snap -s html-template.ng -g syntaxes/html-template.ng.json -g test/externalGrammars/source.css.tmLanguage.json -g test/externalGrammars/source.ts.tmLanguage.json -g test/externalGrammars/source.css.scss.tmLanguage.json -g test/externalGrammars/source.css.less.tmLanguage.json -g test/externalGrammars/source.stylus.tmLanguage.json -g test/externalGrammars/source.sassdoc.tmLanguage.json -g test/externalGrammars/source.js.tmLanguage.json -g test/externalGrammars/source.coffee.tmLanguage.json -g test/externalGrammars/source.dart.tmLanguage.json -g test/externalGrammars/source.postcss.tmLanguage.plist -g test/externalGrammars/source.sass.tmLanguage.json -g test/externalGrammars/source.js.regexp.tmLanguage.plist --updateSnapshot test/*.html",
3737
"webpack": "npx webpack --mode development",
38-
"webpack-dev": "npx webpack --mode development --watch",
39-
"package": "npx webpack --mode production --devtool hidden-source-map"
38+
"webpack-dev": "npx webpack --mode development --watch --stats-error-details",
39+
"package": "npx webpack --mode production"
4040
},
4141
"engines": {
4242
"vscode": "^1.73.0"

src/ts/themes/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const updateScopeColors = async (): Promise<void> => {
120120
) as unknown as SupportedThemes;
121121

122122
if (supportedThemes.includes(theme)) {
123-
scopeColors = await import(`./${theme}`);
123+
scopeColors = require(`./${theme}`);
124124
} else {
125125
const themeColors = await fetchThemeColors();
126126
scopeColors = fetchScopeColors(themeColors);

0 commit comments

Comments
 (0)