feat(create-analog): add support for Vite 5.1 to template apps (#925)

brandonroberts · web-flow · commit 8c6d45fbb181 · 2024-03-07T22:39:06.000-06:00
diff --git a/packages/content/src/lib/content-files-token.ts b/packages/content/src/lib/content-files-token.ts
@@ -25,7 +25,7 @@ export const CONTENT_FILES_TOKEN = new InjectionToken<
 
       const newFilename = lookup[filename];
       if (newFilename !== undefined) {
-        objectUsingSlugAttribute[newFilename] = value;
+        objectUsingSlugAttribute[newFilename] = value as () => Promise<string>;
       }
     });
 
diff --git a/packages/content/src/lib/get-content-files.ts b/packages/content/src/lib/get-content-files.ts
@@ -22,5 +22,6 @@ export const getContentFilesList = () =>
  */
 export const getContentFiles = () =>
   import.meta.glob(['/src/content/**/*.md', '/src/content/**/*.agx'], {
-    as: 'raw',
+    query: '?raw',
+    import: 'default',
   });
diff --git a/packages/create-analog/template-angular-v17/package.json b/packages/create-analog/template-angular-v17/package.json
@@ -45,7 +45,7 @@
     "nx": "~18.0.0",
     "jsdom": "^22.1.0",
     "typescript": "~5.3.0",
-    "vite": "~5.0.0",
+    "vite": "^5.0.0",
     "vitest": "^1.3.1"
   }
 }
diff --git a/packages/create-analog/template-angular-v17/tsconfig.app.json b/packages/create-analog/template-angular-v17/tsconfig.app.json
@@ -2,7 +2,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": false,
     "outDir": "./out-tsc/app",
     "types": []
   },
diff --git a/packages/create-analog/template-angular-v17/tsconfig.json b/packages/create-analog/template-angular-v17/tsconfig.json
@@ -27,9 +27,5 @@
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true
-  },
-  "references": [
-    { "path": "tsconfig.app.json" },
-    { "path": "tsconfig.spec.json" }
-  ]
+  }
 }
diff --git a/packages/create-analog/template-angular-v17/tsconfig.spec.json b/packages/create-analog/template-angular-v17/tsconfig.spec.json
@@ -2,7 +2,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": false,
     "outDir": "./out-tsc/spec",
     "target": "es2016",
     "types": ["node", "vitest/globals"]
diff --git a/packages/create-analog/template-blog/package.json b/packages/create-analog/template-blog/package.json
@@ -45,7 +45,7 @@
     "nx": "~18.0.0",
     "jsdom": "^22.1.0",
     "typescript": "~5.3.0",
-    "vite": "~5.0.0",
+    "vite": "^5.0.0",
     "vitest": "^1.3.1"
   }
 }
diff --git a/packages/create-analog/template-blog/tsconfig.app.json b/packages/create-analog/template-blog/tsconfig.app.json
@@ -2,7 +2,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": false,
     "outDir": "./out-tsc/app",
     "types": []
   },
diff --git a/packages/create-analog/template-blog/tsconfig.json b/packages/create-analog/template-blog/tsconfig.json
@@ -27,9 +27,5 @@
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
     "strictTemplates": true
-  },
-  "references": [
-    { "path": "tsconfig.app.json" },
-    { "path": "tsconfig.spec.json" }
-  ]
+  }
 }
diff --git a/packages/create-analog/template-blog/tsconfig.spec.json b/packages/create-analog/template-blog/tsconfig.spec.json
@@ -2,7 +2,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "composite": false,
     "outDir": "./out-tsc/spec",
     "target": "es2016",
     "types": ["node", "vitest/globals"]
diff --git a/packages/router/src/lib/routes.ts b/packages/router/src/lib/routes.ts
@@ -17,7 +17,7 @@ const FILES = import.meta.glob<RouteExport>([
 
 const CONTENT_FILES = import.meta.glob<string>(
   ['/src/app/routes/**/*.md', '/src/app/pages/**/*.md'],
-  { as: 'raw' }
+  { query: '?raw', import: 'default' }
 );
 
 export type Files = Record<string, () => Promise<RouteExport | string>>;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export const CONTENT_FILES_TOKEN = new InjectionToken<`
`25`	`25`
`26`	`26`	`const newFilename = lookup[filename];`
`27`	`27`	`if (newFilename !== undefined) {`
`28`		`- objectUsingSlugAttribute[newFilename] = value;`
	`28`	`+ objectUsingSlugAttribute[newFilename] = value as () => Promise<string>;`
`29`	`29`	`}`
`30`	`30`	`});`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`"nx": "~18.0.0",`
`46`	`46`	`"jsdom": "^22.1.0",`
`47`	`47`	`"typescript": "~5.3.0",`
`48`		`- "vite": "~5.0.0",`
	`48`	`+ "vite": "^5.0.0",`
`49`	`49`	`"vitest": "^1.3.1"`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`"extends": "./tsconfig.json",`
`4`	`4`	`"compilerOptions": {`
`5`		`- "composite": false,`
`6`	`5`	`"outDir": "./out-tsc/app",`
`7`	`6`	`"types": []`
`8`	`7`	`},`