Skip to content

Commit ec9171d

Browse files
twharmontwharmon
committed
Merge branch 'master' into warmup-counts-cfg
2 parents 2d49641 + a376f49 commit ec9171d

Some content is hidden

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

58 files changed

+2636
-2213
lines changed

‎frameworks/keyed/frei-hooks/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>React Hooks</title>
5+
<title>Frei Hooks</title>
66
<link href="/css/currentStyle.css" rel="stylesheet"/>
77
</head>
88
<body>

‎frameworks/keyed/frei-hooks/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frameworks/keyed/frei-hooks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
"webpack-cli": "5.0.1"
3535
},
3636
"dependencies": {
37-
"@aimwhy/frei": "^1.0.40"
37+
"@aimwhy/frei": "^1.0.43"
3838
}
3939
}

‎frameworks/keyed/gxt/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frameworks/keyed/gxt/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@glint/environment-ember-template-imports": "^1.2.2",
2323
"@glint/environment-glimmerx": "^1.2.2",
2424
"@glint/template": "^1.2.2",
25-
"@lifeart/gxt": "0.0.16",
25+
"@lifeart/gxt": "0.0.21",
2626
"prettier": "^3.1.1",
2727
"prettier-plugin-ember-template-tag": "^2.0.0",
2828
"terser": "^5.26.0"

‎frameworks/keyed/gxt/src/main.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { renderComponent } from '@lifeart/gxt';
22
import { Application } from './App.gts';
3-
43
// @ts-expect-error app is unknown
5-
renderComponent(new Application().template(), window['app']);
4+
renderComponent(new Application({}), window['app']);

‎frameworks/keyed/gxt/vite.config.mts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ export default defineConfig(({ mode }) => ({
2727
mangle: {
2828
module: true,
2929
toplevel: true,
30-
properties: {
31-
builtins: false,
32-
},
30+
properties: false,
3331
},
3432
},
3533
},

‎frameworks/keyed/mikado-proxy/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<head>
44
<meta charset="utf-8"/>
55
<meta name="viewport" content="width=device-width">
6+
<link rel="preload" href="/css/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2" as="font" type="font/woff2" crossorigin>
7+
<link href="/css/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" media="screen">
8+
<link href="/css/main.css" rel="stylesheet" media="screen">
9+
<script src="dist/main.js" async></script>
610
<title>Mikado-Proxy-"keyed"</title>
7-
<link rel="preload" href="dist/main.js" as="script">
8-
<link href="/css/currentStyle.css" rel="stylesheet"/>
911
</head>
10-
<body>
11-
<script src="dist/main.js"></script>
12-
</body>
12+
<body></body>
1313
</html>

‎frameworks/keyed/mikado-proxy/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frameworks/keyed/mikado-proxy/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
},
1818
"scripts": {
1919
"compile": "npx mikado-compile --src src/template --type module -i -f && echo Compile Complete. && exit 0",
20-
"build": "npm run compile && node task/build RELEASE=custom DEBUG=false POLYFILL=false SUPPORT_CACHE=true SUPPORT_EVENTS=true SUPPORT_DOM_HELPERS=false SUPPORT_ASYNC=false SUPPORT_TRANSPORT=false SUPPORT_TEMPLATE_EXTENSION=false SUPPORT_REACTIVE=true REACTIVE_ONLY=true SUPPORT_CACHE_HELPERS=false SUPPORT_KEYED=true SUPPORT_POOLS=false SUPPORT_CALLBACKS=false SUPPORT_COMPILE=false && exit 0",
20+
"build": "npm run compile && node task/build RELEASE=custom DEBUG=false POLYFILL=false SUPPORT_CACHE=true SUPPORT_EVENTS=true SUPPORT_DOM_HELPERS=false SUPPORT_ASYNC=false SUPPORT_TRANSPORT=false SUPPORT_TEMPLATE_EXTENSION=false SUPPORT_REACTIVE=true REACTIVE_ONLY=true SUPPORT_CACHE_HELPERS=false SUPPORT_KEYED=true SUPPORT_POOLS=false SUPPORT_CALLBACKS=false SUPPORT_COMPILE=false SUPPORT_WEB_COMPONENTS=false && exit 0",
2121
"build-prod": "npm run build"
2222
},
2323
"dependencies": {
24-
"mikado": "^0.8.134"
24+
"mikado": "^0.8.213"
2525
},
2626
"devDependencies": {
2727
"google-closure-compiler": "^20230802.0.0"

0 commit comments

Comments
 (0)