@dreamkit/dev 0.0.14-next.6 → 0.0.14-next.7

package/lib/DreamkitDevServer.js

@@ -31,7 +31,7 @@ export class DreamkitDevServer {
         options.settingsPath = resolvePath(options.settingsPath, vars);
         options.metaGlobalOutput = resolvePath(options.metaGlobalOutput, vars);
         options.metaLocalOutput = resolvePath(options.metaLocalOutput, vars);
-        options.preEntries = options.preEntries?.map((v) => resolvePath(v, vars));
+        options.presets = options.presets?.map((v) => resolvePath(v, vars));
         this.entry = new VirtualShaking({
             entry: options.entry,
             onChange: async (changes) => {
@@ -135,7 +135,7 @@ export class DreamkitDevServer {
             hmr: { logger: false },
         });
         this.entry.init();
-        for (const path of this.options.preEntries || [])
+        for (const path of this.options.presets || [])
             await this.app.add(await this.fetch(path));
         await this.app.add({
             ...(await this.fetchEntryObjects()),

package/lib/actions/generate-meta.js

@@ -17,7 +17,7 @@ export async function generateMeta(server) {
     let contents;
     if (options.metaFormat === "global") {
         const declarations = {
-            ["dreamkit/presets/global.override.js"]: createInterface("Routing", typeRoutes, 1),
+            ["dreamkit/scopes/global.override.js"]: createInterface("Routing", typeRoutes, 1),
         };
         contents =
             Object.entries(declarations)
@@ -27,13 +27,13 @@ export async function generateMeta(server) {
     else {
         contents = [
             `// prettier-ignore`,
-            `import { defineRoutePath } from "dreamkit/presets/common.js";`,
-            `import { defineLink } from "dreamkit/presets/solid.js";`,
+            `import { defineRoutePath } from "dreamkit/scopes/common.js";`,
+            `import { defineLink } from "dreamkit/scopes/solid.js";`,
             "",
             ...(options.metaLocalExports
                 ? [
-                    'export * from "dreamkit/presets/common.js";',
-                    'export * from "dreamkit/presets/solid.js";',
+                    'export * from "dreamkit/scopes/common.js";',
+                    'export * from "dreamkit/scopes/solid.js";',
                 ]
                 : []),
             createInterface("Routing", typeRoutes, 0),

package/lib/adapters/solid-start/dev-server.js

@@ -223,7 +223,7 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
     ssrRouter.middleware = selfPath("middleware.js", true);
     if (isVinxiBuild()) {
         const dreamkitEntryId = "dk:entry";
-        const dreamkitPreEntriesId = "dk:pre-entries";
+        const dreamkitPresetsId = "dk:presets";
         const dreamkitEntry = join(server.options.root, "src/dreamkit.tsx").replaceAll("\\", "/");
         const existsDreamkitEntry = existsSync(dreamkitEntry);
         addVinxiPlugin(vinxiApp, selfPath("prod-server.js"));
@@ -233,15 +233,15 @@ export function createDreamkitDevServer(vinxiApp, inOptions = {}) {
                 if (id === dreamkitEntryId) {
                     return existsDreamkitEntry ? dreamkitEntry : `\0${dreamkitEntryId}`;
                 }
-                else if (id === dreamkitPreEntriesId) {
-                    return `\0${dreamkitPreEntriesId}`;
+                else if (id === dreamkitPresetsId) {
+                    return `\0${dreamkitPresetsId}`;
                 }
             },
             load(id) {
                 if (!existsDreamkitEntry && id === `\0${dreamkitEntryId}`)
                     return { code: "export {}" };
-                if (id === `\0${dreamkitPreEntriesId}`) {
-                    const exports = server.options.preEntries?.map((entry, index) => `export * as entry_${index} from ${JSON.stringify(entry)};`);
+                if (id === `\0${dreamkitPresetsId}`) {
+                    const exports = server.options.presets?.map((entry, index) => `export * as entry_${index} from ${JSON.stringify(entry)};`);
                     return { code: [...exports, `export {};`].join("\n") };
                 }
             },

package/lib/adapters/solid-start/prod-server.js

@@ -2,11 +2,11 @@ import { App } from "@dreamkit/app";
 // @ts-ignore
 import * as objects from "dk:entry";
 // @ts-ignore
-import * as preEntries from "dk:pre-entries";
+import * as presets from "dk:presets";
 export default async function (_nitro) {
     const app = App.createGlobalInstance();
-    for (const id in preEntries)
-        await app.add(preEntries[id]);
+    for (const id in presets)
+        await app.add(presets[id]);
     await app.add(objects);
     await app.start();
 }

package/lib/options.d.ts

@@ -1,6 +1,6 @@
 export type DreamkitPluginOptions = {
     entry?: string;
-    preEntries?: string[];
+    presets?: string[];
     metaFormat?: "global" | "local";
     metaRouting?: boolean;
     metaGlobalOutput?: string;
@@ -12,7 +12,7 @@ export declare const dreamkitPluginOptions: {
     metaFormat: "global";
     metaRouting: true;
     entry: string;
-    preEntries: string[];
+    presets: string[];
     metaGlobalOutput: string;
     metaLocalOutput: string;
     metaLocalExports: true;

package/lib/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;CASD,CAAC;AAElC,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAC7C,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAChE,GACC,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;CASD,CAAC;AAElC,MAAM,MAAM,wBAAwB,GAAG,QAAQ,CAC7C,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAChE,GACC,IAAI,CAAC,qBAAqB,EAAE,MAAM,OAAO,qBAAqB,CAAC,CAAC"}

package/lib/options.js

@@ -2,7 +2,7 @@ export const dreamkitPluginOptions = {
     metaFormat: "global",
     metaRouting: true,
     entry: "./src/dreamkit.tsx",
-    preEntries: ["dreamkit/adapters/solid-start/entry.js"],
+    presets: ["dreamkit/presets/solid-start.js"],
     metaGlobalOutput: "./src/dreamkit-global.d.ts",
     metaLocalOutput: "./src/dreamkit-local.ts",
     metaLocalExports: true,

package/lib/transforms/to-solid-route.js

@@ -8,7 +8,7 @@ export function toSolidRoute(ast) {
     let routeImportName;
     const routeSpec = "$route";
     const routeSource = "dreamkit";
-    const routeNewSource = "dreamkit/adapters/solid-start/import.js";
+    const routeNewSource = "dreamkit/scopes/solid-import.js";
     replaceImportSpec(ast, {
         newSource: routeNewSource,
         source: routeSource,
@@ -20,7 +20,7 @@ export function toSolidRoute(ast) {
                 ImportDeclaration(importPath) {
                     importPath.traverse({
                         ImportSpecifier(path) {
-                            // import { route as ? } from "dreamkit/adapters/solid-start/import.js";
+                            // import { route as ? } from "dreamkit/scopes/solid-import.js";
                             const isRouteImport = path.node.imported.type === "Identifier" &&
                                 path.node.imported.name === routeSpec &&
                                 importPath.node.source.value === routeNewSource;
@@ -48,7 +48,7 @@ export function toSolidRoute(ast) {
                     // import { $route } from "dreamkit";
                     // export default route.params({}).create(() => {});
                     // [output]
-                    // import { $route as _$route } from "dreamkit/adapters/solid-start/import.js"
+                    // import { $route as _$route } from "dreamkit/scopes/solid-import.js"
                     // import { useLocation, useRouter, useParams} from "@solidjs/router"
                     // const selfRoute = _$route.params({}).clone({ deps: ? });
                     // export const route = selfRoute.createRouteDefinition();
@@ -80,7 +80,7 @@ export function toSolidRoute(ast) {
                 // export const route = $route.params({}).path('/path');
                 // export default function Users() { useRoute(route); }
                 // [output]
-                // import { $route as _$route } from "dreamkit/adapters/solid-start/import.js"
+                // import { $route as _$route } from "dreamkit/scopes/solid-import.js"
                 // import { useLocation, useRouter, useParams } from "@solidjs/router"
                 // const selfRoute = _$route.params({}).path('/path').clone({ deps: ? });
                 // export const route = selfRoute.createRouteDefinition();

package/lib/transforms/to-solid-server-action.js

@@ -9,7 +9,7 @@ export const toSolidServerAction = defineTransform({
         let changes = replaceImportSpec(ast, {
             spec: { $api: "$serverApi" },
             source: "dreamkit",
-            newSource: "dreamkit/adapters/solid-start/import.js",
+            newSource: "dreamkit/scopes/solid-import.js",
             onRenameSpec(prev, next) {
                 apiId = next;
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/dev",
-  "version": "0.0.14-next.6",
+  "version": "0.0.14-next.7",
   "description": "Development tools for DreamKit.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -46,10 +46,10 @@
     "rollup": "^4.26.0",
     "vite-plugin-solid": "^2.10.2",
     "vite-tsconfig-paths": "^5.1.2",
-    "@dreamkit/app": "0.0.7-next.5",
+    "@dreamkit/app": "0.0.7-next.6",
     "@dreamkit/kind": "0.0.2",
-    "@dreamkit/node-app": "0.0.2-next.4",
-    "@dreamkit/schema": "0.0.5-next.2",
+    "@dreamkit/node-app": "0.0.2-next.5",
+    "@dreamkit/schema": "0.0.5-next.3",
     "@dreamkit/utils": "0.0.5-next.0"
   },
   "devDependencies": {