@monkeyplus/flow 5.0.0-rc.87 → 5.0.0-rc.9

package/dist/pages/runtime/helpers/index.mjs

@@ -1,9 +1,6 @@
 import { joinURL, withTrailingSlash } from "ufo";
-const buildPages = (page) => (location, language, _locales) => {
-  const locales = _locales.map((key) => {
-    const _page = page.locales[key];
-    return [key, _page];
-  }).filter((el) => !!el[1]);
+const buildPages = (page) => (location, language) => {
+  const locales = Object.entries(page.locales);
   return locales.map(([locale, localePage]) => {
     const [_language, _location] = locale.split("-");
     const name = joinURL("/", _location, _language, page.name);

package/dist/pages/runtime/index.d.ts

@@ -1,10 +1,3 @@
-import type { DynamicPage, PageCtx, SimplePage } from '@monkeyplus/flow-schema';
-export declare function definePage<T>(...pages: SimplePage<T>[]): SimplePage<T>[];
-export declare function defineDynamicPage<T>(...pages: DynamicPage<T>[]): DynamicPage<T>[];
-export interface SharedContext {
-    assign?: 'global' | 'local';
-    merge?: boolean;
-    setup: (cxt: PageCtx) => any;
-    locales?: Record<string, (ctx: PageCtx) => any>;
-}
-export declare function defineSharedContext(shared: SharedContext): SharedContext;
+import type { DynamicPage, SimplePage } from '@monkeyplus/flow-schema';
+export declare function definePage(page: SimplePage): SimplePage;
+export declare function defineDinamycPage(page: DynamicPage): DynamicPage;

package/dist/pages/runtime/index.mjs

@@ -1,13 +1,6 @@
-export function definePage(...pages) {
-  return pages;
+export function definePage(page) {
+  return page;
 }
-export function defineDynamicPage(...pages) {
-  return pages.map((page) => {
-    if (!page.name.endsWith("/**"))
-      page.name = `${page.name}/**`;
-    return page;
-  });
-}
-export function defineSharedContext(shared) {
-  return shared;
+export function defineDinamycPage(page) {
+  return page;
 }

package/dist/pages/runtime/plugin.mjs

@@ -0,0 +1,56 @@
+import { joinURL } from "ufo";
+import consola from "consola";
+import { definePage } from "./helpers/index.mjs";
+import { defineFlowPlugin, useRuntimeConfig } from "#app";
+import pages from "#pages";
+export default defineFlowPlugin(async (flow) => {
+  const { app } = useRuntimeConfig();
+  const allPages = [];
+  const basePages = Object.entries(pages);
+  consola.success("Parsed %i pages", basePages.length);
+  basePages.forEach(([name, page]) => {
+    const { getPages } = definePage({
+      name,
+      ...page
+    });
+    const _pages = getPages(app.locale.location, app.locale.language);
+    _pages.forEach((page2) => {
+      flow.router.byUrl.insert(page2.url, page2.context);
+      flow.router.byName.insert(page2.name, page2.context);
+      allPages.push(page2.context);
+    });
+  });
+  function getUrl(namePage, localeCode) {
+    const code = localeCode || this?.getLocale()?.code;
+    const [lang, loc] = code.split("-");
+    const name = joinURL("/", loc, lang, namePage);
+    const { path } = flow.router.byName.lookup(name) || {};
+    return path || "/404";
+  }
+  async function getUrls(withLocale = false) {
+    const urls = [];
+    for (const page of allPages) {
+      if (!page.path.includes("/**")) {
+        urls.push(withLocale ? { url: page.path, locale: page.locale.code, name: page.name } : page.path);
+      } else {
+        const dPages = await page.page.dynamic.method({
+          locale: page.locale,
+          utils: Object.assign({ getLocale: () => page.locale }, flow.app.utils)
+        });
+        dPages.forEach((dPage) => {
+          const _path = joinURL(page.path.replace("/**", ""), dPage.url);
+          urls.push(withLocale ? { url: _path, locale: page.locale.code, name: joinURL(page.name, dPage.name) } : _path);
+        });
+      }
+    }
+    return urls.sort();
+  }
+  flow.setUtil("getUrl", getUrl);
+  flow.setUtil("getUrls", getUrls);
+  flow.setUtil("getPages", () => allPages);
+  return {
+    provide: {
+      pages: { allPages }
+    }
+  };
+});

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

@@ -5,8 +5,7 @@ export const generateBundle = (config, bundle, _id) => {
     const chunks = [];
     chunk2.imports?.forEach((file) => {
       const importee = bundle[file];
-      const isChunk = file.startsWith("_") || importee.isEntry;
-      if (isChunk && !seen.has(file)) {
+      if (file.startsWith("_") && !seen.has(file)) {
         seen.add(file);
         chunks.push(...getImportedChunks(importee, seen));
         chunks.push(importee);
@@ -37,7 +36,7 @@ export const generateBundle = (config, bundle, _id) => {
       analyzedChunk.set(chunk2, 1);
       chunk2.imports?.forEach((file) => {
         const importee = bundle[file];
-        if (file.startsWith("_") || importee.isEntry)
+        if (file.startsWith("_"))
           tags.push(...getCssTagsForChunk(importee, publicBase2, seen));
       });
     }
@@ -72,7 +71,7 @@ export const generateBundle = (config, bundle, _id) => {
 export const externalRE = /^(https?:)?\/\//;
 export const isExternalUrl = (url) => externalRE.test(url);
 function toPublicPath(filename, publicBase) {
-  return isExternalUrl(filename) ? filename : joinURL(publicBase, filename);
+  return isExternalUrl(filename) ? filename : joinURL(publicBase, filename.replace("scripts", "assets"));
 }
 const unaryTags = new Set(["link", "meta", "base"]);
 function serializeTag({ tag, attrs, children }, indent = "") {

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

@@ -1,14 +1,13 @@
 import logger from "consola";
-import { joinURL } from "ufo";
 import { generateBundle } from "./injectManifest.mjs";
 import { defineFlowPlugin } from "#app";
 import manifest from "#viteManifest";
 export default defineFlowPlugin((flow) => {
   if (typeof manifest === "function") {
+    const _manifest = manifest();
     flow.hook("page:chunks", (bundle, chunks) => {
       try {
-        const data = manifest();
-        const chunk = generateBundle(flow.$config.app || {}, data.manifest, joinURL("/", data.base, `${bundle}.ts`).replace("/", ""));
+        const chunk = generateBundle(flow.$config.app || {}, _manifest, `client/pages/${bundle}.ts`);
         if (chunk) {
           chunks.head.push(chunk.head);
           chunks.body.push(chunk.body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.87",
+  "version": "5.0.0-rc.9",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,57 +25,52 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.87",
-    "@monkeyplus/flow-kit": "5.0.0-rc.87",
-    "@monkeyplus/flow-schema": "5.0.0-rc.87",
+    "@monkeyplus/flow-cli": "5.0.0-rc.9",
+    "@monkeyplus/flow-kit": "5.0.0-rc.9",
+    "@monkeyplus/flow-schema": "5.0.0-rc.9",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",
-    "c12": "^0.2.8",
+    "c12": "^0.2.7",
     "chokidar": "^3.5.3",
     "consola": "^2.15.3",
     "defu": "^6.0.0",
-    "esbuild": "^0.14.49",
+    "esbuild": "^0.14.38",
     "escape-string-regexp": "^5.0.0",
-    "esno": "^0.16.3",
+    "esno": "^0.14.1",
     "eta": "^1.12.3",
-    "externality": "^0.2.2",
+    "externality": "^0.2.1",
     "fs-extra": "^10.1.0",
     "get-port-please": "^2.5.0",
-    "globby": "^13.1.2",
-    "h3": "^0.7.16",
+    "globby": "^13.1.1",
+    "h3": "^0.7.4",
     "hookable": "^5.1.1",
-    "jiti": "^1.14.0",
-    "ohash": "^0.1.5",
-    "knitwork": "^0.1.2",
-    "listhen": "^0.2.13",
+    "jiti": "^1.13.0",
+    "knitwork": "^0.1.1",
+    "listhen": "^0.2.10",
     "magic-string": "^0.26.2",
-    "mlly": "^0.5.4",
+    "mlly": "^0.5.2",
     "mri": "^1.2.0",
-    "nitropack": "^0.4.12",
-    "pathe": "^0.3.2",
+    "nitropack": "^0.4.4",
+    "pathe": "^0.2.0",
     "perfect-debounce": "^0.1.3",
     "radix3": "^0.1.2",
     "unenv": "^0.5.2",
     "ohmyfetch": "^0.4.18",
-    "node-fetch-native": "^0.1.4",
-    "rollup": "^2.77.0",
-    "rollup-plugin-visualizer": "^5.7.1",
+    "node-fetch-native": "^0.1.3",
+    "rollup": "^2.72.1",
+    "rollup-plugin-visualizer": "^5.6.0",
     "scule": "^0.2.1",
-    "ufo": "^0.8.5",
+    "ufo": "^0.8.3",
     "unctx": "^1.1.4",
-    "unimport": "^0.4.5",
-    "unplugin": "^0.7.2",
-    "untyped": "^0.4.5",
-    "pkg-types": "^0.3.3",
-    "vite": "~3.0.9",
-    "vite-node": "^0.22.1",
-    "vite-plugin-checker": "^0.4.9",
-    "vue-bundle-renderer": "^0.4.2",
-    "vue": "^3.2.37"
+    "unimport": "^0.2.1",
+    "unplugin": "^0.6.3",
+    "untyped": "^0.4.4",
+    "vite": "^2.9.9",
+    "vue": "^3.2.33"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "vue-router": "^4.1.2"
+    "vue-router": "^4.0.15"
   },
   "engines": {
     "node": "^16.11.0 || ^17.0.0 || ^18.0.0"

package/dist/app/entry.async.d.ts

@@ -1,3 +0,0 @@
-import type { RuntimeConfig } from '@monkeyplus/flow-schema';
-declare const _default: (ctx?: RuntimeConfig) => Promise<any>;
-export default _default;

package/dist/app/entry.async.mjs

@@ -1 +0,0 @@
-export default (ctx) => import("#app/entry").then((m) => m.default(ctx));

package/dist/chunks/dev-bundler.mjs

@@ -1,245 +0,0 @@
-import { pathToFileURL } from 'node:url';
-import { existsSync } from 'node:fs';
-import { builtinModules } from 'node:module';
-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 { 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';
-import { normalizeViteManifest } from 'vue-bundle-renderer';
-import 'ohash';
-import 'externality';
-
-async function writeManifest(ctx, css = []) {
-  const clientDist = resolve(ctx.nuxt.options.buildDir, "dist/client");
-  const serverDist = resolve(ctx.nuxt.options.buildDir, "dist/server");
-  const devClientManifest = {
-    "@vite/client": {
-      isEntry: true,
-      file: "@vite/client",
-      css,
-      module: true,
-      resourceType: "script"
-    },
-    [ctx.entry]: {
-      isEntry: true,
-      file: ctx.entry,
-      module: true,
-      resourceType: "script"
-    }
-  };
-  const clientManifest = ctx.nuxt.options.dev ? devClientManifest : await fse.readJSON(resolve(clientDist, "manifest.json"));
-  const buildAssetsDir = withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir));
-  const BASE_RE = new RegExp(`^${escapeRE(buildAssetsDir)}`);
-  for (const key in clientManifest) {
-    if (clientManifest[key].file)
-      clientManifest[key].file = clientManifest[key].file.replace(BASE_RE, "");
-    for (const item of ["css", "assets"]) {
-      if (clientManifest[key][item])
-        clientManifest[key][item] = clientManifest[key][item].map((i) => i.replace(BASE_RE, ""));
-    }
-  }
-  await fse.mkdirp(serverDist);
-  const manifest = normalizeViteManifest(clientManifest);
-  await ctx.nuxt.callHook("build:manifest", manifest);
-  await fse.writeFile(resolve(serverDist, "client.manifest.json"), JSON.stringify(manifest, null, 2), "utf8");
-  await fse.writeFile(resolve(serverDist, "client.manifest.mjs"), `export default ${JSON.stringify(manifest, null, 2)}`, "utf8");
-}
-
-async function transformRequest(opts, id) {
-  if (id && id.startsWith("/@id/__x00__"))
-    id = `\0${id.slice("/@id/__x00__".length)}`;
-  if (id && id.startsWith("/@id/"))
-    id = id.slice("/@id/".length);
-  if (id && !id.startsWith("/@fs/") && id.startsWith("/")) {
-    const resolvedPath = resolve(opts.viteServer.config.root, `.${id}`);
-    if (existsSync(resolvedPath))
-      id = resolvedPath;
-  }
-  id = id.replace(/^\/?(?=\w:)/, "/@fs/");
-  const externalId = id.replace(/\?v=\w+$|^\/@fs/, "");
-  if (await opts.isExternal(externalId)) {
-    const path = builtinModules.includes(externalId.split("node:").pop()) ? externalId : isAbsolute(externalId) ? pathToFileURL(externalId).href : externalId;
-    return {
-      code: `(global, module, _, exports, importMeta, ssrImport, ssrDynamicImport, ssrExportAll) =>
-${genDynamicImport(path, { wrapper: false })}
-  .then(r => {
-    if (r.default && r.default.__esModule)
-      r = r.default
-    exports.default = r.default
-    ssrExportAll(r)
-  })
-  .catch(e => {
-    console.error(e)
-    throw new Error(${JSON.stringify(`[vite dev] Error loading external "${id}".`)})
-  })`,
-      deps: [],
-      dynamicDeps: []
-    };
-  }
-  const res = await opts.viteServer.transformRequest(id, { ssr: true }).catch((err) => {
-    console.warn(`[SSR] Error transforming ${id}:`, err);
-  }) || { code: "", map: {}, deps: [], dynamicDeps: [] };
-  const code = `async function (global, module, exports, __vite_ssr_exports__, __vite_ssr_import_meta__, __vite_ssr_import__, __vite_ssr_dynamic_import__, __vite_ssr_exportAll__) {
-${res.code || "/* empty */"};
-}`;
-  return { code, deps: res.deps || [], dynamicDeps: res.dynamicDeps || [] };
-}
-async function transformRequestRecursive(opts, id, parent = "<entry>", chunks = {}) {
-  if (chunks[id]) {
-    chunks[id].parents.push(parent);
-    return;
-  }
-  const res = await transformRequest(opts, id);
-  const deps = uniq([...res.deps, ...res.dynamicDeps]);
-  chunks[id] = {
-    id,
-    code: res.code,
-    deps,
-    parents: [parent]
-  };
-  for (const dep of deps)
-    await transformRequestRecursive(opts, dep, id, chunks);
-  return Object.values(chunks);
-}
-async function bundleRequest(opts, entryURL) {
-  const chunks = await transformRequestRecursive(opts, entryURL);
-  const listIds = (ids) => ids.map((id) => `// - ${id} (${hashId(id)})`).join("\n");
-  const chunksCode = chunks.map((chunk) => `
-// --------------------
-// Request: ${chunk.id}
-// Parents: 
-${listIds(chunk.parents)}
-// Dependencies: 
-${listIds(chunk.deps)}
-// --------------------
-const ${hashId(`${chunk.id}-${chunk.code}`)} = ${chunk.code}
-`).join("\n");
-  const manifestCode = `const __modules__ = ${genObjectFromRawEntries(chunks.map((chunk) => [chunk.id, hashId(`${chunk.id}-${chunk.code}`)]))}`;
-  const ssrModuleLoader = `
-const __pendingModules__ = new Map()
-const __pendingImports__ = new Map()
-const __ssrContext__ = { global: globalThis }
-
-function __ssrLoadModule__(url, urlStack = []) {
-  const pendingModule = __pendingModules__.get(url)
-  if (pendingModule) { return pendingModule }
-  const modulePromise = __instantiateModule__(url, urlStack)
-  __pendingModules__.set(url, modulePromise)
-  modulePromise.catch(() => { __pendingModules__.delete(url) })
-         .finally(() => { __pendingModules__.delete(url) })
-  return modulePromise
-}
-
-async function __instantiateModule__(url, urlStack) {
-  const mod = __modules__[url]
-  if (mod.stubModule) { return mod.stubModule }
-  const stubModule = { [Symbol.toStringTag]: 'Module' }
-  Object.defineProperty(stubModule, '__esModule', { value: true })
-  mod.stubModule = stubModule
-  // https://vitejs.dev/guide/api-hmr.html
-  const importMeta = { url, hot: { accept() {}, prune() {}, dispose() {}, invalidate() {}, decline() {}, on() {} } }
-  urlStack = urlStack.concat(url)
-  const isCircular = url => urlStack.includes(url)
-  const pendingDeps = []
-  const ssrImport = async (dep) => {
-    // TODO: Handle externals if dep[0] !== '.' | '/'
-    if (!isCircular(dep) && !__pendingImports__.get(dep)?.some(isCircular)) {
-      pendingDeps.push(dep)
-      if (pendingDeps.length === 1) {
-        __pendingImports__.set(url, pendingDeps)
-      }
-      await __ssrLoadModule__(dep, urlStack)
-      if (pendingDeps.length === 1) {
-        __pendingImports__.delete(url)
-      } else {
-        pendingDeps.splice(pendingDeps.indexOf(dep), 1)
-      }
-    }
-    return __modules__[dep].stubModule
-  }
-  function ssrDynamicImport (dep) {
-    // TODO: Handle dynamic import starting with . relative to url
-    return ssrImport(dep)
-  }
-
-  function ssrExportAll(sourceModule) {
-    for (const key in sourceModule) {
-      if (key !== 'default') {
-        try {
-          Object.defineProperty(stubModule, key, {
-            enumerable: true,
-            configurable: true,
-            get() { return sourceModule[key] }
-          })
-        } catch (_err) { }
-      }
-    }
-  }
-
-  const cjsModule = {
-    get exports () {
-      return stubModule.default
-    },
-    set exports (v) {
-      stubModule.default = v
-    },
-  }
-
-  await mod(
-    __ssrContext__.global,
-    cjsModule,
-    stubModule.default,
-    stubModule,
-    importMeta,
-    ssrImport,
-    ssrDynamicImport,
-    ssrExportAll
-  )
-
-  return stubModule
-}
-`;
-  const code = [
-    chunksCode,
-    manifestCode,
-    ssrModuleLoader,
-    `export default await __ssrLoadModule__(${JSON.stringify(entryURL)})`
-  ].join("\n\n");
-  return {
-    code,
-    ids: chunks.map((i) => i.id)
-  };
-}
-async function initViteDevBundler(ctx, onBuild) {
-  const viteServer = ctx.ssrServer;
-  const options = {
-    viteServer,
-    isExternal: createIsExternal(viteServer, ctx.nuxt.options.rootDir)
-  };
-  const _doBuild = async () => {
-    const start = Date.now();
-    const { code, ids } = await bundleRequest(options, ctx.entry);
-    await fse.ensureFile(resolve(ctx.nuxt.options.buildDir, "dist/server/server.mjs"));
-    await fse.writeFile(resolve(ctx.nuxt.options.buildDir, "dist/server/server.mjs"), code, "utf-8");
-    await writeManifest(ctx, ids.filter(isCSS).map((i) => i.slice(1)));
-    const time = Date.now() - start;
-    logger.success(`Vite server built in ${time}ms`);
-    await onBuild();
-    ctx.nuxt.callHook("bundler:change", {});
-  };
-  const doBuild = debounce(_doBuild);
-  await _doBuild();
-  viteServer.watcher.on("all", (_event, file) => {
-    file = normalize(file);
-    if (file.indexOf(ctx.nuxt.options.buildDir) === 0 || isIgnored(file))
-      return;
-    doBuild();
-  });
-  ctx.nuxt.hook("app:templatesGenerated", () => doBuild());
-}
-
-export { bundleRequest, initViteDevBundler };

package/dist/chunks/external.mjs

@@ -1,37 +0,0 @@
-import 'node:fs';
-import { hash } from 'ohash';
-import 'pathe';
-import { isExternal, ExternalsDefaults } from 'externality';
-
-function uniq(arr) {
-  return Array.from(new Set(arr));
-}
-const IS_CSS_RE = /\.(?:css|scss|sass|postcss|less|stylus|styl)(\?[^.]+)?$/;
-function isCSS(file) {
-  return IS_CSS_RE.test(file);
-}
-function hashId(id) {
-  return `$id_${hash(id)}`;
-}
-
-function createIsExternal(viteServer, rootDir) {
-  const externalOpts = {
-    inline: [
-      /virtual:/,
-      /\.ts$/,
-      ...ExternalsDefaults.inline || [],
-      ...viteServer.config.ssr.noExternal
-    ],
-    external: [
-      ...viteServer.config.ssr.external || [],
-      /node_modules/
-    ],
-    resolve: {
-      type: "module",
-      extensions: [".ts", ".js", ".json", ".vue", ".mjs", ".jsx", ".tsx", ".wasm"]
-    }
-  };
-  return (id) => isExternal(id, rootDir, externalOpts);
-}
-
-export { createIsExternal as c, hashId as h, isCSS as i, uniq as u };