Skip to content

Commit d1236d6

Browse files
committed
Merge branch 'sandcastle-v2' into stratakit-css
2 parents 1400b19 + 8126080 commit d1236d6

File tree

14 files changed

+714
-58
lines changed

14 files changed

+714
-58
lines changed

eslint.config.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default [
2222
"packages/sandcastle/public/",
2323
"packages/sandcastle/templates/Sandcastle.d.ts",
2424
"packages/sandcastle/templates/Sandcastle.js",
25+
"packages/sandcastle/gallery/pagefind/",
2526
"packages/engine/Source/Scene/GltfPipeline/**/*",
2627
"packages/engine/Source/Shaders/**/*",
2728
"Specs/jasmine/*",
@@ -39,7 +40,13 @@ export default [
3940
...configCesium.configs.node,
4041
},
4142
{
42-
files: [".github/**/*.js", "scripts/**/*.js", "gulpfile.js", "server.js"],
43+
files: [
44+
".github/**/*.js",
45+
"scripts/**/*.js",
46+
"packages/sandcastle/scripts/**/*.js",
47+
"gulpfile.js",
48+
"server.js",
49+
],
4350
...configCesium.configs.node,
4451
languageOptions: {
4552
...configCesium.configs.node.languageOptions,
@@ -48,6 +55,7 @@ export default [
4855
},
4956
{
5057
files: ["packages/**/*.js", "Apps/**/*.js", "Specs/**/*.js", "**/*.html"],
58+
ignores: ["packages/sandcastle/scripts/**/*.js"],
5159
...configCesium.configs.browser,
5260
plugins: { html },
5361
rules: {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"prismjs": "^1.28.0",
102102
"rimraf": "^6.0.1",
103103
"tsd-jsdoc": "^2.5.0",
104-
"typescript": "^5.3.2",
104+
"typescript": "~5.8.3",
105105
"typescript-eslint": "^8.30.1",
106106
"yargs": "^18.0.0"
107107
},
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
title: Viewerless Sandcastle
22
description: A Sandcastle that does not construct the viewer for faster, easier development of Sandcastle itself
33
development: true
4+
labels:
5+
- Development

packages/sandcastle/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"scripts": {
1010
"dev": "npm run build-gallery && vite --config vite.config.dev.ts",
1111
"build": "npm run build-app",
12-
"build-app": "tsc -b && vite build --config vite.config.app.ts",
13-
"build-ci": "tsc -b && vite build --config vite.config.ci.ts",
14-
"build-prod": "npm run build-gallery && tsc -b && vite build --config vite.config.prod.ts",
12+
"build-app": "tsc -b && npm run build-gallery && vite build --config vite.config.app.ts",
13+
"build-ci": "tsc -b && npm run build-gallery && vite build --config vite.config.ci.ts",
14+
"build-prod": "tsc -b && npm run build-gallery && vite build --config vite.config.prod.ts",
1515
"build-gallery": "node scripts/buildGallery.js"
1616
},
1717
"dependencies": {
@@ -37,9 +37,10 @@
3737
"@vitejs/plugin-react": "^4.3.4",
3838
"globals": "^15.15.0",
3939
"globby": "^14.1.0",
40+
"pagefind": "^1.3.0",
4041
"jsdom": "^26.1.0",
4142
"slugify": "^1.6.6",
42-
"typescript": "~5.7.2",
43+
"typescript": "~5.8.3",
4344
"vite": "^6.2.0",
4445
"vite-plugin-static-copy": "^2.3.1",
4546
"yaml": "^2.8.0"

0 commit comments

Comments
 (0)