Skip to content

Commit 97e14cb

Browse files
committed
Updated to Solid 1.1
1 parent 5034c80 commit 97e14cb

File tree

12 files changed

+4318
-5166
lines changed

12 files changed

+4318
-5166
lines changed

.babelrc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"plugins": [
3+
"tsconfig-paths"
4+
],
25
"presets": [
36
"solid",
47
"@babel/typescript"
@@ -17,4 +20,4 @@
1720
]
1821
}
1922
}
20-
}
23+
}

.eslintrc

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,24 @@
66
"node": true
77
},
88
"extends": [
9-
"eslint:recommended"
9+
"eslint:recommended",
10+
"plugin:unicorn/recommended",
11+
"plugin:prettier/recommended"
1012
],
1113
"globals": {
1214
"Atomics": "readonly",
1315
"SharedArrayBuffer": "readonly"
1416
},
15-
"parser": "babel-eslint",
1617
"parserOptions": {
1718
"ecmaFeatures": {
1819
"jsx": true
1920
},
20-
"ecmaVersion": 2018,
21+
"ecmaVersion": 2020,
2122
"sourceType": "module"
2223
},
23-
"rules": {
24-
"indent": [
25-
"error",
26-
2,
27-
{
28-
"SwitchCase": 1
29-
}
30-
],
31-
"linebreak-style": [
32-
"error",
33-
"unix"
34-
],
35-
"quotes": [
36-
"error",
37-
"single"
38-
],
39-
"comma-dangle": [
40-
"error",
41-
"always-multiline"
42-
],
43-
"semi": [
44-
"error",
45-
"always"
46-
]
47-
},
48-
"ignorePatterns": ["dist/*"],
24+
"ignorePatterns": [
25+
"dist/*"
26+
],
4927
"overrides": [
5028
{
5129
"files": [
@@ -55,7 +33,6 @@
5533
"parser": "@typescript-eslint/parser",
5634
"extends": [
5735
"eslint:recommended",
58-
"plugin:@typescript-eslint/eslint-recommended",
5936
"plugin:@typescript-eslint/recommended",
6037
"plugin:@typescript-eslint/recommended-requiring-type-checking",
6138
"plugin:jsx-a11y/recommended",
@@ -64,13 +41,10 @@
6441
"plugin:import/typescript",
6542
"plugin:jest/recommended",
6643
"plugin:jest/style",
67-
"plugin:testing-library/recommended",
44+
"plugin:testing-library/dom",
6845
"plugin:jest-dom/recommended",
69-
"plugin:prettier/recommended",
70-
"prettier/@typescript-eslint"
71-
],
72-
"plugins": [
73-
"local"
46+
"plugin:unicorn/recommended",
47+
"plugin:prettier/recommended"
7448
],
7549
"rules": {
7650
"@typescript-eslint/explicit-function-return-type": [
@@ -79,23 +53,31 @@
7953
"allowExpressions": true
8054
}
8155
],
82-
"local/jsx-uses-vars": "error"
56+
"unicorn/filename-case": [
57+
"error",
58+
{
59+
"cases": {
60+
"pascalCase": true,
61+
"kebabCase": true
62+
}
63+
}
64+
]
8365
},
8466
"parserOptions": {
67+
"project": [
68+
"./tsconfig.json"
69+
],
8570
"sourceType": "module",
8671
"ecmaFeatures": {
8772
"impliedStrict": true,
8873
"jsx": true
8974
},
90-
"project": "./tsconfig.json"
75+
"ecmaVersion": 2020
9176
},
9277
"settings": {
93-
"import/parsers": {
94-
"@typescript-eslint/parser": [
95-
".ts",
96-
".tsx"
97-
]
98-
}
78+
"import/resolver": {
79+
"typescript": {}
80+
},
9981
},
10082
"env": {
10183
"es2020": true,

package.json

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2+
"type": "module",
23
"scripts": {
34
"build": "run-s type:check clean rollup",
45
"clean": "rimraf dist",
56
"coverage": "jest --coverage",
6-
"nollup": "cross-env NODE_ENV=development nollup -c --hot --content-base public",
7+
"nollup": "cross-env NODE_ENV=development nollup -c --verbose --hot --content-base public",
78
"rollup": "cross-env NODE_ENV=production rollup -c",
89
"serve": "sirv dist",
910
"start": "run-p nollup type:watch",
@@ -12,57 +13,58 @@
1213
"type:watch": "tsc --noEmit --watch"
1314
},
1415
"dependencies": {
15-
"solid-js": "^0.23.9"
16+
"solid-js": "^1.1.2"
1617
},
1718
"devDependencies": {
18-
"@babel/core": "^7.12.10",
19-
"@babel/preset-env": "^7.12.11",
20-
"@babel/preset-typescript": "^7.12.7",
21-
"@rollup/plugin-babel": "^5.2.2",
22-
"@rollup/plugin-commonjs": "^17.0.0",
23-
"@rollup/plugin-node-resolve": "^11.0.1",
24-
"@rollup/plugin-replace": "^2.3.4",
25-
"@rollup/plugin-url": "^6.0.0",
26-
"@testing-library/dom": "^7.29.1",
27-
"@testing-library/jest-dom": "^5.11.8",
28-
"@types/jest": "^26.0.19",
29-
"@typescript-eslint/eslint-plugin": "^4.12.0",
30-
"@typescript-eslint/parser": "^4.12.0",
31-
"babel-eslint": "^10.1.0",
32-
"babel-preset-solid": "^0.23.8",
19+
"@babel/core": "^7.15.5",
20+
"@babel/eslint-parser": "^7.15.4",
21+
"@babel/preset-env": "^7.15.4",
22+
"@babel/preset-typescript": "^7.15.0",
23+
"@rollup/plugin-babel": "^5.3.0",
24+
"@rollup/plugin-commonjs": "^20.0.0",
25+
"@rollup/plugin-node-resolve": "^13.0.4",
26+
"@rollup/plugin-replace": "^3.0.0",
27+
"@rollup/plugin-url": "^6.1.0",
28+
"@testing-library/jest-dom": "^5.14.1",
29+
"@types/jest": "^27.0.1",
30+
"@typescript-eslint/eslint-plugin": "^4.31.0",
31+
"@typescript-eslint/parser": "^4.31.0",
32+
"babel-jest": "^27.1.0",
33+
"babel-plugin-transform-import-meta": "^2.0.0",
34+
"babel-plugin-tsconfig-paths": "^1.0.1",
35+
"babel-preset-solid": "^1.1.2",
3336
"cross-env": "^7.0.3",
34-
"eslint": "^7.17.0",
35-
"eslint-config-prettier": "^7.1.0",
36-
"eslint-plugin-import": "^2.22.1",
37-
"eslint-plugin-jest": "^24.1.3",
38-
"eslint-plugin-jest-dom": "^3.6.5",
37+
"eslint": "^7.32.0",
38+
"eslint-config-prettier": "^8.3.0",
39+
"eslint-import-resolver-typescript": "^2.4.0",
40+
"eslint-plugin-import": "^2.24.2",
41+
"eslint-plugin-jest": "^24.4.0",
42+
"eslint-plugin-jest-dom": "^3.9.0",
3943
"eslint-plugin-jsx-a11y": "^6.4.1",
4044
"eslint-plugin-local": "^1.0.0",
41-
"eslint-plugin-prettier": "^3.3.1",
42-
"eslint-plugin-testing-library": "^3.10.1",
43-
"jest": "^26.6.3",
44-
"nollup": "^0.14.4",
45+
"eslint-plugin-prettier": "^4.0.0",
46+
"eslint-plugin-testing-library": "^4.12.1",
47+
"eslint-plugin-unicorn": "^35.0.0",
48+
"jest": "^27.1.0",
49+
"nollup": "^0.18.3",
4550
"npm-run-all": "^4.1.5",
46-
"prettier": "^2.2.1",
51+
"prettier": "^2.3.2",
4752
"rimraf": "^3.0.2",
48-
"rollup": "^2.36.1",
49-
"rollup-plugin-hot-css": "0.4.0",
50-
"rollup-plugin-static-files": "0.1.0",
53+
"rollup": "^2.56.3",
54+
"rollup-plugin-hot-css": "0.5.1",
55+
"rollup-plugin-static-files": "0.2.0",
5156
"rollup-plugin-terser": "^7.0.2",
52-
"sirv-cli": "^1.0.10",
53-
"ts-jest": "^26.4.4",
54-
"typescript": "^4.1.3"
57+
"sirv-cli": "^1.0.14",
58+
"solid-jest": "^0.2.0",
59+
"solid-testing-library": "^0.2.1",
60+
"ts-jest": "^27.0.5",
61+
"typescript": "^4.4.2"
5562
},
5663
"jest": {
57-
"globals": {
58-
"ts-jest": {
59-
"babelConfig": true
60-
}
61-
},
6264
"roots": [
6365
"src"
6466
],
65-
"preset": "ts-jest",
67+
"preset": "solid-jest/preset/browser",
6668
"moduleDirectories": [
6769
"node_modules",
6870
"src"

0 commit comments

Comments
 (0)