Skip to content

Commit

Permalink
Merge pull request #4317 from GordonSmith/V3TWEAKS_ECLWATCH
Browse files Browse the repository at this point in the history
feat:  Drop preact-shim and bump versions
  • Loading branch information
GordonSmith authored Nov 28, 2024
2 parents 1c01a39 + 92add6f commit 29f2684
Show file tree
Hide file tree
Showing 55 changed files with 2,128 additions and 6,748 deletions.
100 changes: 0 additions & 100 deletions .eslintrc.cjs

This file was deleted.

46 changes: 0 additions & 46 deletions .github/workflows/ossar-analysis.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.eclcc
.env
.nx
.vite-inspect/
node_modules
dist/
dist-test/
Expand Down
14 changes: 11 additions & 3 deletions demos/gallery/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Launch Edge",
"name": "index.html",
"request": "launch",
"type": "msedge",
"url": "http://localhost:5173",
"webRoot": "${workspaceFolder}"
"url": "http://localhost:5173/index.html",
"runtimeArgs": [
"--disable-web-security"
],
"webRoot": "${workspaceFolder}",
"outFiles": [
"${workspaceFolder}/**/*.js",
"!**/node_modules/**"
]
}
]
}
1 change: 1 addition & 0 deletions demos/gallery/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Gallery</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@hpcc-js/common/font-awesome/css/font-awesome.min.css">
<script src="https://cdn.jsdelivr.net/npm/@hpcc-js/[email protected]/dist/index.min.js"></script>
</head>

Expand Down
2 changes: 1 addition & 1 deletion demos/gallery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"devDependencies": {
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@vitejs/plugin-react-swc": "3.7.1",
"@vitejs/plugin-react-swc": "3.7.2",
"react": "18.3.1",
"react-dom": "18.3.1"
},
Expand Down
14 changes: 7 additions & 7 deletions demos/imdb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"update": "npx --yes npm-check-updates -u -t minor"
},
"dependencies": {
"@hpcc-js/common": "^3.1.0",
"@hpcc-js/dgrid": "^3.0.0",
"@hpcc-js/dgrid-shim": "^3.0.0",
"@hpcc-js/graph": "^3.0.0",
"@hpcc-js/layout": "^3.0.0",
"@hpcc-js/phosphor": "^3.0.0",
"@hpcc-js/util": "^3.1.0",
"@hpcc-js/common": "^3.2.0",
"@hpcc-js/dgrid": "^3.1.0",
"@hpcc-js/dgrid-shim": "^3.1.0",
"@hpcc-js/graph": "^3.1.1",
"@hpcc-js/layout": "^3.1.1",
"@hpcc-js/phosphor": "^3.1.0",
"@hpcc-js/util": "^3.2.0",
"d3-fetch": "^1"
},
"devDependencies": {}
Expand Down
117 changes: 117 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";
// import pluginReact from "eslint-plugin-react";
// import pluginReactHooks from "eslint-plugin-react-hooks";

/** @type {import('eslint').Linter.Config[]} */
export default [
{
files: [
"**/*.{js,mjs,cjs,ts,jsx,tsx}"
]
},
{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
"dojo": "readonly",
"dijit": "readonly",
"dojoConfig": "readonly"
}
}
},
pluginJs.configs.recommended,
...tseslint.configs.recommended,
// pluginReact.configs.flat.recommended,
{
plugins: {
// "react-hooks": pluginReactHooks,
},
settings: {
react: {
version: "17"
}
},
rules: {
// ...pluginReactHooks.configs.recommended.rules,
"no-redeclare": "off",
"no-empty": "off",
"no-empty-pattern": "off",
"no-constant-condition": "off",
"no-case-declarations": "off",
"no-prototype-builtins": "off",
"no-unused-vars": "off",
"no-useless-escape": "off",
"no-unexpected-multiline": "off",
"no-extra-boolean-cast": "off",
"no-self-assign": "off",
"no-multiple-empty-lines": [
"error", {
max: 1
}
],
"no-console": [1, {
"allow": ["info", "warn", "error"]
}],
"func-call-spacing": ["error", "never"],
"space-before-function-paren": ["error", {
"anonymous": "always",
"named": "never",
"asyncArrow": "always"
}],
"comma-spacing": [
"error", {
"before": false,
"after": true
}
],

"prefer-rest-params": "off",
"prefer-spread": "off",

"semi": ["error", "always"],
"quotes": [
"error",
"double", {
"avoidEscape": true
}
],

"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-inferrable-types": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-this-alias": "off",
// "@typescript-eslint/ban-types": [
// "error",
// {
// "types": {
// // add a custom message, AND tell the plugin how to fix it
// "String": {
// "message": "Use string instead",
// "fixWith": "string"
// },

// "{}": {
// "message": "Use object instead",
// "fixWith": "object"
// },

// "object": false
// }
// }
// ],
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-var-require": "off",
"@typescript-eslint/no-unsafe-declaration-merging": "off",
"@typescript-eslint/no-empty-object-type": "off",
// "react-hooks/exhaustive-deps": "warn"
}
}
];
Loading

0 comments on commit 29f2684

Please sign in to comment.