Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ export default [
'glimmer-vm/repo-metadata/',
'glimmer-vm/**/rollup.config.mjs',
'glimmer-vm/packages/@glimmer/vm-babel-plugins/',
'glimmer-vm/guides/',
// to Delete
'glimmer-vm/benchmark/',
'glimmer-vm/packages/@glimmer-workspace/benchmark-env',
'glimmer-vm/packages/@glimmer-workspace/build/',
'glimmer-vm/packages/@glimmer-workspace/eslint-plugin/',
],
},
pluginJs.configs.recommended,
Expand Down Expand Up @@ -133,17 +139,6 @@ export default [
'@typescript-eslint/no-unsafe-declaration-merging': 'off',
},
},
{
files: ['glimmer-vm/**/*.ts'],
languageOptions: {
ecmaVersion: 5,
sourceType: 'module',
parserOptions: {
project: './tsconfig-vm.json',
tsconfigRootDir: __dirname,
},
},
},
{
// TODO: files: ['packages/**/*.[jt]s'],
files: ['packages/**/*.js'],
Expand Down Expand Up @@ -251,6 +246,8 @@ export default [
'broccoli/**/*.js',
'**/ember-cli-build.js',
'**/*.cjs',
'glimmer-vm/bin/**/*',
'glimmer-vm/packages/@glimmer-workspace/**/*',
],

languageOptions: {
Expand All @@ -268,6 +265,13 @@ export default [
'disable-features/disable-generator-functions': 'off',
},
},
{
// scripts that are allowed to print things
files: ['glimmer-vm/bin/**/*'],
rules: {
'no-console': 'off',
},
},
{
files: ['node-tests/**/*.js'],

Expand All @@ -286,4 +290,24 @@ export default [
},
},
},
...tseslint.configs.recommendedTypeChecked.map((x) => {
x.languageOptions ||= {};
x.languageOptions.parserOptions = {
...x.languageOptions?.parserOptions,
project: './tsconfig.json',
tsconfigRootDir: __dirname,
};
x.files = [
'glimmer-vm/packages/@glimmer/**/*',
'glimmer-vm/packages/@glimmer-workspace/integration-tests/**/*',
];

x.rules = {
...x.rules,
'prefer-const': 'off',
'no-implicit-coercion': 'off',
};

return x;
}),
];
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
"@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js",
"@ember/-internals/views/lib/component_lookup.js": "ember-source/@ember/-internals/views/lib/component_lookup.js",
"@ember/-internals/views/lib/mixins/action_support.js": "ember-source/@ember/-internals/views/lib/mixins/action_support.js",
"@ember/-internals/views/lib/system/action_manager.js": "ember-source/@ember/-internals/views/lib/system/action_manager.js",
"@ember/-internals/views/lib/system/event_dispatcher.js": "ember-source/@ember/-internals/views/lib/system/event_dispatcher.js",
"@ember/-internals/views/lib/system/utils.js": "ember-source/@ember/-internals/views/lib/system/utils.js",
"@ember/-internals/views/lib/views/core_view.js": "ember-source/@ember/-internals/views/lib/views/core_view.js",
Expand Down Expand Up @@ -345,7 +346,6 @@
"@simple-dom/document/index.js": "ember-source/@simple-dom/document/index.js",
"backburner.js/index.js": "ember-source/backburner.js/index.js",
"dag-map/index.js": "ember-source/dag-map/index.js",
"ember-template-compiler/index.js": "ember-source/ember-template-compiler/index.js",
"ember-testing/index.js": "ember-source/ember-testing/index.js",
"ember-testing/lib/adapters/adapter.js": "ember-source/ember-testing/lib/adapters/adapter.js",
"ember-testing/lib/adapters/qunit.js": "ember-source/ember-testing/lib/adapters/qunit.js",
Expand Down
12 changes: 0 additions & 12 deletions tsconfig-vm.json

This file was deleted.

2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"outDir": "dist",
"noEmit": true
},
"include": ["packages/**/*.ts"],
"include": ["packages/**/*.ts", "glimmer-vm/packages/**/*"],
"exclude": ["dist", "node_modules", "tmp", "types"]
}
2 changes: 1 addition & 1 deletion tsconfig/compiler-options.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"target": "esnext",
"module": "esnext",
"sourceMap": true,
"rootDir": "../packages",
"rootDir": "../",

// Environment Configuration
"experimentalDecorators": true,
Expand Down
Loading