@monkeyplus/flow 5.0.0-rc.88 → 5.0.0-rc.90

package/dist/chunks/dev-bundler.mjs

@@ -5,7 +5,7 @@ import { resolve, normalize, isAbsolute } from 'pathe';
 import { genObjectFromRawEntries, genDynamicImport } from 'knitwork';
 import fse from 'fs-extra';
 import { debounce } from 'perfect-debounce';
-import { isIgnored, logger } from '@monkeyplus/flow-kit';
+import { isIgnoredFlow, logger } from '@monkeyplus/flow-kit';
 import { h as hashId, c as createIsExternal, u as uniq, i as isCSS } from './external.mjs';
 import { withTrailingSlash, withoutLeadingSlash } from 'ufo';
 import escapeRE from 'escape-string-regexp';
@@ -235,7 +235,7 @@ async function initViteDevBundler(ctx, onBuild) {
   await _doBuild();
   viteServer.watcher.on("all", (_event, file) => {
     file = normalize(file);
-    if (file.indexOf(ctx.nuxt.options.buildDir) === 0 || isIgnored(file))
+    if (file.indexOf(ctx.nuxt.options.buildDir) === 0 || isIgnoredFlow(file))
       return;
     doBuild();
   });

package/dist/chunks/external.mjs

@@ -1,7 +1,7 @@
 import 'node:fs';
 import { hash } from 'ohash';
 import 'pathe';
-import { isExternal, ExternalsDefaults } from 'externality';
+import { ExternalsDefaults, isExternal } from 'externality';
 
 function uniq(arr) {
   return Array.from(new Set(arr));

package/dist/chunks/index.mjs

@@ -1,6 +1,6 @@
 import { createHooks } from 'hookable';
 import { dirname, resolve, normalize, join, isAbsolute, relative, extname } from 'pathe';
-import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, useNuxt, resolveAlias, resolveFilesFlow, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, isIgnored, isIgnoredFlow } from '@monkeyplus/flow-kit';
+import { defineFlowModule, addPlugin, defineNuxtModule, logger, addTemplate, addPluginTemplate, addVitePlugin, useNuxt, resolveAlias, resolveFilesFlow, nuxtCtx, installModule, loadFlowConfig, templateUtils, normalizeTemplate, compileTemplate, normalizePlugin, isIgnoredFlow } from '@monkeyplus/flow-kit';
 import { fileURLToPath } from 'url';
 import { defineUnimportPreset, createUnimport, toImports, scanDirExports } from 'unimport';
 import { pathToFileURL } from 'node:url';
@@ -26,7 +26,7 @@ import replace from '@rollup/plugin-replace';
 import { sanitizeFilePath } from 'mlly';
 import { resolveTSConfig } from 'pkg-types';
 
-const version = "5.0.0-rc.88";
+const version = "5.0.0-rc.90";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.endsWith("chunks"))
@@ -231,23 +231,25 @@ ${ctx.generateTypeDeclarations({ resolvePath: r })}`
 async function resolveFiles(dir) {
   const nuxt = useNuxt();
   const dirs = [resolve(nuxt.options.srcDir, dir)];
-  const allRoutes = (await Promise.all(dirs.map(async (dir2) => {
-    const files = await resolveFilesFlow(dir2, `**/*{${nuxt.options.extensions.join(",")}}`);
-    files.sort();
-    return files.filter((file) => {
-      if (file.includes(" copy"))
-        return false;
-      if (!fs.readFileSync(file, "utf8").includes("export"))
-        return false;
-      return true;
-    }).map((file) => {
-      const segments = relative(dir2, file).replace(new RegExp(`${escapeRE(extname(file))}$`), "").split("/").join("_");
-      return {
-        file,
-        name: camelCase(segments)
-      };
-    });
-  }))).flat();
+  const allRoutes = (await Promise.all(
+    dirs.map(async (dir2) => {
+      const files = await resolveFilesFlow(dir2, `**/*{${nuxt.options.extensions.join(",")}}`);
+      files.sort();
+      return files.filter((file) => {
+        if (file.includes(" copy"))
+          return false;
+        if (!fs.readFileSync(file, "utf8").includes("export"))
+          return false;
+        return true;
+      }).map((file) => {
+        const segments = relative(dir2, file).replace(new RegExp(`${escapeRE(extname(file))}$`), "").split("/").join("_");
+        return {
+          file,
+          name: camelCase(segments)
+        };
+      });
+    })
+  )).flat();
   return allRoutes;
 }
 function normalizeExports(files) {
@@ -370,6 +372,7 @@ const createClient = async (flow) => {
   });
   return vite;
 };
+
 const builClient = async (flow) => {
   return await build$1({
     base: flow.options.dev ? "/" : flow.options.app.baseURL,
@@ -381,7 +384,6 @@ const builClient = async (flow) => {
     }
   });
 };
-
 const viteModule = defineFlowModule({
   meta: {
     name: "vite-client",
@@ -736,22 +738,30 @@ const schemaTemplate = {
       "import { FlowModule } from '@monkeyplus/flow-schema'",
       "declare module '@monkeyplus/flow-schema' {",
       "  interface FlowConfig {",
-      ...moduleInfo.filter(Boolean).map((meta) => `    [${genString(meta.configKey)}]?: typeof ${genDynamicImport(meta.importName, { wrapper: false })}.default extends FlowModule<infer O> ? Partial<O> : Record<string, any>`),
+      ...moduleInfo.filter(Boolean).map(
+        (meta) => `    [${genString(meta.configKey)}]?: typeof ${genDynamicImport(meta.importName, { wrapper: false })}.default extends FlowModule<infer O> ? Partial<O> : Record<string, any>`
+      ),
       "  }",
-      generateTypes(resolveSchema(Object.fromEntries(Object.entries(nuxt.options.runtimeConfig).filter(([key]) => key !== "public"))), {
-        interfaceName: "RuntimeConfig",
-        addExport: false,
-        addDefaults: false,
-        allowExtraKeys: false,
-        indentation: 2
-      }),
-      generateTypes(resolveSchema(nuxt.options.runtimeConfig.public), {
-        interfaceName: "PublicRuntimeConfig",
-        addExport: false,
-        addDefaults: false,
-        allowExtraKeys: false,
-        indentation: 2
-      }),
+      generateTypes(
+        resolveSchema(Object.fromEntries(Object.entries(nuxt.options.runtimeConfig).filter(([key]) => key !== "public"))),
+        {
+          interfaceName: "RuntimeConfig",
+          addExport: false,
+          addDefaults: false,
+          allowExtraKeys: false,
+          indentation: 2
+        }
+      ),
+      generateTypes(
+        resolveSchema(nuxt.options.runtimeConfig.public),
+        {
+          interfaceName: "PublicRuntimeConfig",
+          addExport: false,
+          addDefaults: false,
+          allowExtraKeys: false,
+          indentation: 2
+        }
+      ),
       "}"
     ].join("\n");
   }
@@ -792,35 +802,41 @@ function createApp(flow, options = {}) {
 }
 async function generateApp(flow, app) {
   await resolveApp(flow, app);
-  app.templates = Object.values(defaultTemplates).concat(flow.options.build.templates);
+  app.templates = Object.values(defaultTemplates).concat(
+    flow.options.build.templates
+  );
   await flow.callHook("app:templates", app);
   app.templates = app.templates.map((tmpl) => normalizeTemplate(tmpl));
   const templateContext = { utils: templateUtils, nuxt: flow, app };
-  await Promise.all(app.templates.map(async (template) => {
-    const contents = await compileTemplate(template, templateContext);
-    const fullPath = template.dst || resolve(flow.options.buildDir, template.filename);
-    flow.vfs[fullPath] = contents;
-    const aliasPath = `#build/${template.filename.replace(/\.\w+$/, "")}`;
-    flow.vfs[aliasPath] = contents;
-    if (process.platform === "win32")
-      flow.vfs[fullPath.replace(/\//g, "\\")] = contents;
-    if (template.write) {
-      await promises.mkdir(dirname(fullPath), { recursive: true });
-      await promises.writeFile(fullPath, contents, "utf8");
-    }
-  }));
+  await Promise.all(
+    app.templates.map(async (template) => {
+      const contents = await compileTemplate(template, templateContext);
+      const fullPath = template.dst || resolve(flow.options.buildDir, template.filename);
+      flow.vfs[fullPath] = contents;
+      const aliasPath = `#build/${template.filename.replace(/\.\w+$/, "")}`;
+      flow.vfs[aliasPath] = contents;
+      if (process.platform === "win32")
+        flow.vfs[fullPath.replace(/\//g, "\\")] = contents;
+      if (template.write) {
+        await promises.mkdir(dirname(fullPath), { recursive: true });
+        await promises.writeFile(fullPath, contents, "utf8");
+      }
+    })
+  );
   await flow.callHook("app:templatesGenerated", app);
 }
 async function resolveApp(flow, app) {
   app.plugins = [...flow.options.plugins.map(normalizePlugin)];
   for (const config of flow.options._layers.map((layer) => layer.config)) {
-    app.plugins.push(...[
-      ...config.plugins || [],
-      ...await resolveFilesFlow(config.srcDir, [
-        "plugins/*.{ts,js,mjs,cjs,mts,cts}",
-        "plugins/*/index.*{ts,js,mjs,cjs,mts,cts}"
-      ])
-    ].map((plugin) => normalizePlugin(plugin)));
+    app.plugins.push(
+      ...[
+        ...config.plugins || [],
+        ...await resolveFilesFlow(config.srcDir, [
+          "plugins/*.{ts,js,mjs,cjs,mts,cts}",
+          "plugins/*/index.*{ts,js,mjs,cjs,mts,cts}"
+        ])
+      ].map((plugin) => normalizePlugin(plugin))
+    );
   }
   app.plugins = uniqueBy(app.plugins, "src");
   await flow.callHook("app:resolve", app);
@@ -1010,51 +1026,54 @@ async function bundle$1(nuxt) {
   const ctx = {
     nuxt,
     entry,
-    config: vite.mergeConfig({
-      configFile: false,
-      resolve: {
-        alias: {
-          ...nuxt.options.alias,
-          "#app": nuxt.options.appDir,
-          "#build/plugins": "",
-          "#build": nuxt.options.buildDir,
-          "web-streams-polyfill/ponyfill/es2018": "unenv/runtime/mock/empty",
-          "abort-controller": "unenv/runtime/mock/empty"
-        }
-      },
-      optimizeDeps: {
-        entries: [entry],
-        include: []
-      },
-      build: {
-        rollupOptions: {
-          output: { sanitizeFileName: sanitizeFilePath },
-          input: resolve(nuxt.options.appDir, "entry")
+    config: vite.mergeConfig(
+      {
+        configFile: false,
+        resolve: {
+          alias: {
+            ...nuxt.options.alias,
+            "#app": nuxt.options.appDir,
+            "#build/plugins": "",
+            "#build": nuxt.options.buildDir,
+            "web-streams-polyfill/ponyfill/es2018": "unenv/runtime/mock/empty",
+            "abort-controller": "unenv/runtime/mock/empty"
+          }
         },
-        watch: {
-          exclude: nuxt.options.ignore
+        optimizeDeps: {
+          entries: [entry],
+          include: []
+        },
+        build: {
+          rollupOptions: {
+            output: { sanitizeFileName: sanitizeFilePath },
+            input: resolve(nuxt.options.appDir, "entry")
+          },
+          watch: {
+            exclude: nuxt.options.ignore
+          }
+        },
+        plugins: [
+          replace({
+            ...Object.fromEntries([";", "(", "{", "}", " ", "	", "\n"].map((d) => [`${d}global.`, `${d}globalThis.`])),
+            preventAssignment: true
+          }),
+          virtual(nuxt.vfs)
+        ],
+        vue: {
+          reactivityTransform: nuxt.options.experimental.reactivityTransform
+        },
+        server: {
+          watch: { ignored: isIgnoredFlow },
+          fs: {
+            allow: [
+              nuxt.options.appDir
+            ]
+          },
+          hmr: false
         }
       },
-      plugins: [
-        replace({
-          ...Object.fromEntries([";", "(", "{", "}", " ", "	", "\n"].map((d) => [`${d}global.`, `${d}globalThis.`])),
-          preventAssignment: true
-        }),
-        virtual(nuxt.vfs)
-      ],
-      vue: {
-        reactivityTransform: nuxt.options.experimental.reactivityTransform
-      },
-      server: {
-        watch: { ignored: isIgnored },
-        fs: {
-          allow: [
-            nuxt.options.appDir
-          ]
-        },
-        hmr: false
-      }
-    }, nuxt.options.vite)
+      nuxt.options.vite
+    )
   };
   if (!nuxt.options.dev) {
     ctx.config.server.watch = void 0;

package/dist/chunks/vite-node.mjs

@@ -142,8 +142,14 @@ async function initViteNodeServer(ctx) {
   process.env.NUXT_VITE_NODE_OPTIONS = JSON.stringify(viteNodeServerOptions);
   const serverResolvedPath = resolve$1(distDir, "core/runtime/vite-node.mjs");
   const manifestResolvedPath = resolve$1(distDir, "core/runtime/client.manifest.mjs");
-  await fse.writeFile(resolve$1(ctx.nuxt.options.buildDir, "dist/server/server.mjs"), `export { default } from ${JSON.stringify(pathToFileURL(serverResolvedPath).href)}`);
-  await fse.writeFile(resolve$1(ctx.nuxt.options.buildDir, "dist/server/client.manifest.mjs"), `export { default } from ${JSON.stringify(pathToFileURL(manifestResolvedPath).href)}`);
+  await fse.writeFile(
+    resolve$1(ctx.nuxt.options.buildDir, "dist/server/server.mjs"),
+    `export { default } from ${JSON.stringify(pathToFileURL(serverResolvedPath).href)}`
+  );
+  await fse.writeFile(
+    resolve$1(ctx.nuxt.options.buildDir, "dist/server/client.manifest.mjs"),
+    `export { default } from ${JSON.stringify(pathToFileURL(manifestResolvedPath).href)}`
+  );
 }
 
 export { initViteNodeServer, registerViteNodeMiddleware, viteNodePlugin };

package/dist/pages/runtime/pages.mjs

@@ -16,7 +16,11 @@ export default defineFlowPlugin(async (flow) => {
         name,
         ...page
       });
-      const _pages2 = getPages(app.locale.location, app.locale.language, app.locale.locales);
+      const _pages2 = getPages(
+        app.locale.location,
+        app.locale.language,
+        app.locale.locales
+      );
       _pages2.forEach((page2) => {
         flow.router.byUrl.insert(page2.url, page2.context);
         flow.router.byName.insert(page2.name, page2.context);

package/dist/vite-client/runtime/injectManifest.mjs

@@ -1,7 +1,7 @@
 import { joinURL } from "ufo";
 export const generateBundle = (config, bundle, _id) => {
-  const analyzedChunk = new Map();
-  const getImportedChunks = (chunk2, seen = new Set()) => {
+  const analyzedChunk = /* @__PURE__ */ new Map();
+  const getImportedChunks = (chunk2, seen = /* @__PURE__ */ new Set()) => {
     const chunks = [];
     chunk2.imports?.forEach((file) => {
       const importee = bundle[file];
@@ -31,7 +31,7 @@ export const generateBundle = (config, bundle, _id) => {
       href: toPublicPath(chunk2.file, publicBase2)
     }
   });
-  const getCssTagsForChunk = (chunk2, publicBase2, seen = new Set()) => {
+  const getCssTagsForChunk = (chunk2, publicBase2, seen = /* @__PURE__ */ new Set()) => {
     const tags = [];
     if (!analyzedChunk.has(chunk2)) {
       analyzedChunk.set(chunk2, 1);
@@ -57,7 +57,9 @@ export const generateBundle = (config, bundle, _id) => {
   };
   const publicBase = config.baseURL || "/";
   const isAsync = false;
-  const chunk = Object.values(bundle).find((chunk2) => chunk2.isEntry && chunk2.src === _id);
+  const chunk = Object.values(bundle).find(
+    (chunk2) => chunk2.isEntry && chunk2.src === _id
+  );
   if (chunk) {
     const imports = getImportedChunks(chunk);
     const assetTags = [
@@ -74,12 +76,15 @@ export const isExternalUrl = (url) => externalRE.test(url);
 function toPublicPath(filename, publicBase) {
   return isExternalUrl(filename) ? filename : joinURL(publicBase, filename);
 }
-const unaryTags = new Set(["link", "meta", "base"]);
+const unaryTags = /* @__PURE__ */ new Set(["link", "meta", "base"]);
 function serializeTag({ tag, attrs, children }, indent = "") {
   if (unaryTags.has(tag)) {
     return `<${tag}${serializeAttrs(attrs)}>`;
   } else {
-    return `<${tag}${serializeAttrs(attrs)}>${serializeTags(children, incrementIndent(indent))}</${tag}>`;
+    return `<${tag}${serializeAttrs(attrs)}>${serializeTags(
+      children,
+      incrementIndent(indent)
+    )}</${tag}>`;
   }
 }
 function serializeTags(tags, indent = "") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.88",
+  "version": "5.0.0-rc.90",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,9 +25,9 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.88",
-    "@monkeyplus/flow-kit": "5.0.0-rc.88",
-    "@monkeyplus/flow-schema": "5.0.0-rc.88",
+    "@monkeyplus/flow-cli": "5.0.0-rc.90",
+    "@monkeyplus/flow-kit": "5.0.0-rc.90",
+    "@monkeyplus/flow-schema": "5.0.0-rc.90",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",
     "c12": "^0.2.8",
@@ -62,12 +62,12 @@
     "rollup-plugin-visualizer": "^5.7.1",
     "scule": "^0.2.1",
     "ufo": "^0.8.5",
-    "unctx": "^1.1.4",
+    "unctx": "^2.0.1",
     "unimport": "^0.4.5",
-    "unplugin": "^0.7.2",
+    "unplugin": "^0.9.4",
     "untyped": "^0.4.5",
     "pkg-types": "^0.3.3",
-    "vite": "~3.0.9",
+    "vite": "2.9.15",
     "vite-node": "^0.22.1",
     "vite-plugin-checker": "^0.4.9",
     "vue-bundle-renderer": "^0.4.2",