Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- master
- typescript
pull_request:
branches:
- master
- typescript

jobs:
test:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ node_modules
package-lock.json
jspm_packages

# TypeScript output
lib/

# Don't commit generated JS bundles
examples/**/static/dist/bundle.js
examples/**/dist
13 changes: 11 additions & 2 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
const js = require("@eslint/js");
const jsEslint = require("@eslint/js");
const {
defineConfig,
globalIgnores,
} = require("eslint/config");
const eslintConfigGoogle = require('eslint-config-google');
const tsEslint = require('typescript-eslint');

// The ESLint ecmaVersion argument is inconsistently used. Some rules will ignore it entirely, so if the rule has
// been set, it will still error even if it's not applicable to that version number. Since Google sets these
Expand Down Expand Up @@ -54,7 +55,8 @@ var SHAREDB_RULES = {
module.exports = defineConfig([
{
extends: [eslintConfigGoogle],
ignores: ['eslint.config.js'],
files: ["**/*.js"],
ignores: ["eslint.config.js", "lib/**"],

languageOptions: {
ecmaVersion: 3,
Expand All @@ -67,6 +69,13 @@ module.exports = defineConfig([

rules: Object.assign({}, DISABLED_ES6_OPTIONS, SHAREDB_RULES),
},
// {
// extends: [
// jsEslint.configs.recommended,
// tsEslint.configs.recommended,
// ],
// files: ["**/*.ts"],
// },
globalIgnores(["docs/"]),
{
files: ["examples/counter-json1-vite/*.js"],
Expand Down
Loading
Loading