Skip to content

Commit 757a755

Browse files
author
Modder Me
authored
Merge branch 'master' into shannon/format-on-save
2 parents 86d1e30 + 0785d83 commit 757a755

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2794
-2823
lines changed

‎.prettierignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
node_modules/
2+
dist/
3+
lib/
4+
src/defaultFiles/
5+
pnpm-lock.yaml

‎.prettierrc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"arrowParens": "always",
33
"htmlWhitespaceSensitivity": "ignore",
4-
"printWidth": 100,
4+
"printWidth": 120,
55
"semi": true,
66
"singleQuote": true,
77
"tabWidth": 2,
88
"trailingComma": "all",
9-
"useTabs": false
9+
"useTabs": false,
10+
"quoteProps": "consistent"
1011
}

‎.vscode/extensions.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
{
2-
"recommendations": [
3-
"esbenp.prettier-vscode"
4-
]
2+
"recommendations": ["esbenp.prettier-vscode"]
53
}

‎LICENSE‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2022 SolidJS Core Team
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎index.html‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66
<link rel="manifest" href="/manifest.webmanifest" />
77
<link rel="shortcut icon" href="./playground/assets/logo.png" type="image/png" />
88
<title>Solid Playground</title>
9-
<meta
10-
name="description"
11-
content="Quickly discover what the solid compiler will generate from your JSX template"
12-
/>
9+
<meta name="description" content="Quickly discover what the solid compiler will generate from your JSX template" />
1310
</head>
1411
<body>
1512
<div id="app"></div>
1613
<div id="update" class="fixed bottom-10 left-10"></div>
17-
<script src="./playground/index.ts" type="module"></script>
14+
<script src="./playground/index.tsx" type="module"></script>
1815
</body>
1916
</html>

‎package.json‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.23.10",
2+
"version": "0.24.0",
33
"name": "solid-repl",
44
"description": "Quickly discover what the solid compiler will generate from your JSX template",
55
"repository": {
@@ -18,55 +18,61 @@
1818
"dev": "vite",
1919
"build": "vite build && workbox generateSW workbox-config.js",
2020
"build:lib": "jiti rollup.config.js",
21-
"format": "prettier -w \"{src,playground}/**/*.{js,json,ts,tsx,html,css}\" \"*.{js,ts}\"",
22-
"prepublishOnly": "pnpm build:lib"
21+
"format": "prettier -w .",
22+
"tsc": "tsc"
2323
},
2424
"devDependencies": {
25-
"@babel/core": "^7.17.12",
26-
"@babel/plugin-syntax-jsx": "^7.17.12",
27-
"@babel/types": "^7.17.12",
25+
"@babel/core": "^7.18.6",
26+
"@babel/plugin-syntax-jsx": "^7.18.6",
27+
"@babel/types": "^7.18.8",
2828
"@rollup/plugin-babel": "^5.3.1",
29-
"@rollup/plugin-commonjs": "^22.0.0",
29+
"@rollup/plugin-commonjs": "^22.0.1",
3030
"@rollup/plugin-json": "^4.1.0",
3131
"@rollup/plugin-node-resolve": "^13.3.0",
3232
"@rollup/plugin-replace": "^4.0.0",
3333
"@types/babel__standalone": "^7.1.4",
3434
"@types/dedent": "^0.7.0",
3535
"@types/fs-extra": "^9.0.13",
3636
"@types/workbox-sw": "^4.3.2",
37-
"acorn": "^8.7.1",
3837
"acorn-jsx": "^5.3.2",
3938
"assert": "^2.0.0",
4039
"fs-extra": "^10.1.0",
41-
"jiti": "^1.13.0",
40+
"jiti": "^1.14.0",
4241
"mime": "^3.0.0",
4342
"monaco-editor": "~0.33.0",
4443
"register-service-worker": "^1.7.2",
4544
"rollup-plugin-delete": "^2.0.0",
4645
"rollup-plugin-import-css": "^3.0.3",
47-
"rollup-plugin-windicss": "^1.8.4",
48-
"typescript": "^4.6.4",
49-
"vite": "^2.9.9",
46+
"rollup-plugin-windicss": "^1.8.6",
47+
"solid-app-router": "^0.4.1",
48+
"typescript": "^4.7.4",
49+
"vite": "^2.9.14",
5050
"vite-plugin-solid": "^2.2.6",
51-
"vite-plugin-windicss": "^1.8.4",
52-
"windicss": "^3.5.3",
51+
"vite-plugin-windicss": "^1.8.6",
52+
"windicss": "^3.5.6",
5353
"workbox-cli": "^6.5.3"
5454
},
5555
"dependencies": {
5656
"@amoutonbrady/lz-string": "^0.0.1",
57-
"@babel/preset-typescript": "^7.17.12",
58-
"@babel/standalone": "^7.17.12",
59-
"babel-preset-solid": "1.4.0",
57+
"@babel/preset-typescript": "^7.18.6",
58+
"@babel/standalone": "^7.18.8",
59+
"@solid-primitives/media": "^2.0.0",
60+
"@solid-primitives/scheduled": "^1.0.0",
61+
"babel-preset-solid": "1.4.6",
6062
"dedent": "^0.7.0",
61-
"jszip": "^3.9.1",
62-
"mitt": "^3.0.0",
63+
"jszip": "^3.10.0",
6364
"monaco-editor-textmate": "^3.0.0",
6465
"monaco-textmate": "^3.0.1",
6566
"onigasm": "^2.2.5",
66-
"prettier": "^2.6.2",
67-
"rollup": "^2.73.0",
67+
"prettier": "^2.7.1",
68+
"rollup": "^2.76.0",
6869
"solid-dismiss": "^1.2.1",
6970
"solid-heroicons": "^2.0.3",
70-
"solid-js": "1.4.1"
71+
"solid-js": "1.4.7"
72+
},
73+
"pnpm": {
74+
"patchedDependencies": {
75+
"monaco-editor@0.33.0": "patches/monaco-editor@0.33.0.patch"
76+
}
7177
}
7278
}

‎patches/monaco-editor@0.33.0.patch‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
diff --git a/esm/vs/basic-languages/monaco.contribution.js b/esm/vs/basic-languages/monaco.contribution.js
2+
index a6b7213821d988645f27f3c349d8a987a2ea7599..742e7234e7afc17ec445f27b81ea17bfc7b75878 100644
3+
--- a/esm/vs/basic-languages/monaco.contribution.js
4+
+++ b/esm/vs/basic-languages/monaco.contribution.js
5+
@@ -7,80 +7,7 @@ import '../editor/editor.api.js';
6+
*-----------------------------------------------------------------------------*/
7+
8+
// src/basic-languages/monaco.contribution.ts
9+
-import "./abap/abap.contribution.js";
10+
-import "./apex/apex.contribution.js";
11+
-import "./azcli/azcli.contribution.js";
12+
-import "./bat/bat.contribution.js";
13+
-import "./bicep/bicep.contribution.js";
14+
-import "./cameligo/cameligo.contribution.js";
15+
-import "./clojure/clojure.contribution.js";
16+
-import "./coffee/coffee.contribution.js";
17+
-import "./cpp/cpp.contribution.js";
18+
-import "./csharp/csharp.contribution.js";
19+
-import "./csp/csp.contribution.js";
20+
import "./css/css.contribution.js";
21+
-import "./dart/dart.contribution.js";
22+
-import "./dockerfile/dockerfile.contribution.js";
23+
-import "./ecl/ecl.contribution.js";
24+
-import "./elixir/elixir.contribution.js";
25+
-import "./flow9/flow9.contribution.js";
26+
-import "./fsharp/fsharp.contribution.js";
27+
-import "./freemarker2/freemarker2.contribution.js";
28+
-import "./go/go.contribution.js";
29+
-import "./graphql/graphql.contribution.js";
30+
-import "./handlebars/handlebars.contribution.js";
31+
-import "./hcl/hcl.contribution.js";
32+
import "./html/html.contribution.js";
33+
-import "./ini/ini.contribution.js";
34+
-import "./java/java.contribution.js";
35+
import "./javascript/javascript.contribution.js";
36+
-import "./julia/julia.contribution.js";
37+
-import "./kotlin/kotlin.contribution.js";
38+
-import "./less/less.contribution.js";
39+
-import "./lexon/lexon.contribution.js";
40+
-import "./lua/lua.contribution.js";
41+
-import "./liquid/liquid.contribution.js";
42+
-import "./m3/m3.contribution.js";
43+
-import "./markdown/markdown.contribution.js";
44+
-import "./mips/mips.contribution.js";
45+
-import "./msdax/msdax.contribution.js";
46+
-import "./mysql/mysql.contribution.js";
47+
-import "./objective-c/objective-c.contribution.js";
48+
-import "./pascal/pascal.contribution.js";
49+
-import "./pascaligo/pascaligo.contribution.js";
50+
-import "./perl/perl.contribution.js";
51+
-import "./pgsql/pgsql.contribution.js";
52+
-import "./php/php.contribution.js";
53+
-import "./pla/pla.contribution.js";
54+
-import "./postiats/postiats.contribution.js";
55+
-import "./powerquery/powerquery.contribution.js";
56+
-import "./powershell/powershell.contribution.js";
57+
-import "./protobuf/protobuf.contribution.js";
58+
-import "./pug/pug.contribution.js";
59+
-import "./python/python.contribution.js";
60+
-import "./qsharp/qsharp.contribution.js";
61+
-import "./r/r.contribution.js";
62+
-import "./razor/razor.contribution.js";
63+
-import "./redis/redis.contribution.js";
64+
-import "./redshift/redshift.contribution.js";
65+
-import "./restructuredtext/restructuredtext.contribution.js";
66+
-import "./ruby/ruby.contribution.js";
67+
-import "./rust/rust.contribution.js";
68+
-import "./sb/sb.contribution.js";
69+
-import "./scala/scala.contribution.js";
70+
-import "./scheme/scheme.contribution.js";
71+
-import "./scss/scss.contribution.js";
72+
-import "./shell/shell.contribution.js";
73+
-import "./solidity/solidity.contribution.js";
74+
-import "./sophia/sophia.contribution.js";
75+
-import "./sparql/sparql.contribution.js";
76+
-import "./sql/sql.contribution.js";
77+
-import "./st/st.contribution.js";
78+
-import "./swift/swift.contribution.js";
79+
-import "./systemverilog/systemverilog.contribution.js";
80+
-import "./tcl/tcl.contribution.js";
81+
-import "./twig/twig.contribution.js";
82+
import "./typescript/typescript.contribution.js";
83+
-import "./vb/vb.contribution.js";
84+
-import "./xml/xml.contribution.js";
85+
-import "./yaml/yaml.contribution.js";

0 commit comments

Comments
 (0)