@monkeyplus/flow 5.0.0-rc.1 → 5.0.0-rc.10

package/src/core/runtime/nitro/renderer.ts

@@ -1,74 +0,0 @@
-import { eventHandler, useQuery } from 'h3';
-import type{ FlowApp } from '#app/flow';
-
-export default eventHandler(async(event) => {
-  const url = event.req.url?.split('?')[0];
-
-  // console.debug(url);
-
-  const flow = event.context.flow as FlowApp;
-  if (url.includes('_urls')) {
-    const urls = await flow.app.utils.getUrls();
-    return urls;
-  }
-  const scripts = { head: [], bodyStart: [], bodyEnd: [] };
-  const chunks = { head: [], body: [] };
-  const generate = {};
-
-  // console.log(flow);
-  const { page, locale, params, view } = flow.router.byUrl.lookup(url!) || {};
-  // Truncate page
-  if (!page) return;
-
-  await flow.callHook('page:scripts', scripts);
-  if (view.bundle)
-    await flow.callHook('page:chunks', view.bundle, chunks);
-
-  const templateContext = {} as any;
-
-  const dynamyc = params?._;
-  const contextPage = {} as any;
-  const utils = Object.assign({ getLocale: () => locale }, flow.app.utils);
-  templateContext.url = url;
-  templateContext.locale = locale;
-  templateContext.view = view;
-
-  if (dynamyc && page.dynamic) {
-    const pages = await page.dynamic.method({ locale, utils });
-    const dynamicPage = pages.find((_page) => _page.url === dynamyc);
-    if (!dynamicPage) return;
-    if (page.dynamic.assign)
-      templateContext[page.dynamic.assign] = dynamicPage.context;
-
-    contextPage.dynamyc = dynamicPage;
-  }
-
-  templateContext.seo = {};
-  templateContext.context = {};
-  templateContext.sharedContext = {};
-  templateContext.utils = utils;
-  templateContext.seo = await page.seo?.({ ...contextPage, utils }) || {};
-  templateContext.context = await page.context?.({ ...contextPage, utils }) || {};
-  templateContext.getHeadScripts = () => {
-    return scripts.head.join('\n');
-  };
-  templateContext.getHeadChunks = () => {
-    return chunks.head.join('\n');
-  };
-  templateContext.getBodyChunks = () => {
-    return chunks.body.join('\n');
-  };
-  const query = useQuery(event);
-  if (query?.context)
-    return { ...templateContext, utils: Object.keys(utils) };
-
-  const html = await flow.render(view as any, templateContext);
-  event.res.setHeader('Content-Type', 'text/html;charset=UTF-8');
-
-  if (flow.generate) {
-    await flow.callHook('page:generate', generate);
-    globalThis.generate = generate;
-  }
-
-  return html;
-});

package/src/core/templates.ts

@@ -1,119 +0,0 @@
-import { templateUtils } from '@monkeyplus/flow-kit';
-import type { Nuxt, NuxtApp, NuxtTemplate } from '@monkeyplus/flow-schema';
-import { genArrayFromRaw, genDynamicImport, genString } from 'knitwork';
-import { isAbsolute, join, relative } from 'pathe';
-import { generateTypes, resolveSchema } from 'untyped';
-
-import escapeRE from 'escape-string-regexp';
-
-export interface TemplateContext {
-  nuxt: Nuxt
-  app: NuxtApp
-}
-// export const cssTemplate = {
-//   filename: 'css.mjs',
-//   getContents: (ctx: TemplateContext) => ctx.flow.options.css.map((i) => genImport(i)).join('\n'),
-// };
-
-export const serverPluginTemplate = {
-  filename: 'plugins/server.mjs',
-  getContents(ctx: TemplateContext) {
-    const serverPlugins = ctx.app.plugins;
-    return [
-      templateUtils.importSources(serverPlugins.map((p) => p.src)),
-      `export default ${genArrayFromRaw([
-        ...serverPlugins.map((p) => templateUtils.importName(p.src)),
-      ])}`,
-    ].join('\n');
-  },
-};
-
-export const pluginsDeclaration = {
-  filename: 'types/plugins.d.ts',
-  getContents: (ctx: TemplateContext) => {
-    // console.log(ctx);
-
-    const EXTENSION_RE = new RegExp(`(?<=\\w)(${ctx.nuxt.options.extensions.map((e) => escapeRE(e)).join('|')})$`, 'g');
-    const tsImports = ctx.app.plugins.map((p) => (isAbsolute(p.src) ? relative(join(ctx.nuxt.options.buildDir, 'types'), p.src) : p.src).replace(EXTENSION_RE, ''));
-
-    return `// Generated by Flow'
-import type { Plugin } from '#app'
-
-type Decorate<T extends Record<string, any>> = { [K in keyof T as K extends string ? \`$\${K}\` : never]: T[K] }
-
-type InjectionType<A extends Plugin> = A extends Plugin<infer T> ? Decorate<T> : unknown
-
-type FlowAppInjections = \n  ${tsImports.map((p) => `InjectionType<typeof ${genDynamicImport(p, { wrapper: false })}.default>`).join(' &\n  ')}
-
-declare module '#app' {
-  interface FlowApp extends FlowAppInjections { }
-}
-// TODO: Insert extend types
-
-
-export { }
-`;
-  },
-};
-
-const adHocModules = ['auto-imports', 'meta', 'pages', 'vite-client'];
-export const schemaTemplate = {
-  filename: 'types/schema.d.ts',
-  getContents: ({ nuxt }: TemplateContext) => {
-    const moduleInfo = nuxt.options._installedModules.map((m) => ({
-      ...m.meta || {},
-      importName: m.entryPath || m.meta?.name,
-    })).filter((m) => m.configKey && m.name && !adHocModules.includes(m.name));
-
-    return [
-      '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>`,
-      ),
-      '  }',
-      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');
-  },
-};
-
-export const publicPathTemplate: NuxtTemplate = {
-  filename: 'paths.mjs',
-  getContents({ nuxt }) {
-    return [
-      'import { joinURL } from \'ufo\'',
-      !nuxt.options.dev && 'import { useRuntimeConfig } from \'#internal/nitro\'',
-
-      nuxt.options.dev
-        ? `const appConfig = ${JSON.stringify(nuxt.options.app)}`
-        : 'const appConfig = useRuntimeConfig().app',
-
-      'export const baseURL = () => appConfig.baseURL',
-      'export const buildAssetsDir = () => appConfig.buildAssetsDir',
-
-      'export const buildAssetsURL = (...path) => joinURL(publicAssetsURL(), buildAssetsDir(), ...path)',
-
-      'export const publicAssetsURL = (...path) => {',
-      '  const publicBase = appConfig.cdnURL || appConfig.baseURL',
-      '  return path.length ? joinURL(publicBase, ...path) : publicBase',
-      '}',
-    ].filter(Boolean).join('\n');
-  },
-};

package/src/core/vite/builder/css.ts

@@ -1,28 +0,0 @@
-import { requireModule } from '@monkeyplus/flow-kit';
-import type { Flow } from '@monkeyplus/flow-schema';
-import { distDir } from '../../../dirs';
-import type { ViteOptions } from './types';
-
-export function resolveCSSOptions(flow: Flow): ViteOptions['css'] {
-  const css: ViteOptions['css'] & { postcss: Exclude<ViteOptions['css']['postcss'], string> } = {
-    postcss: {
-      plugins: [],
-    },
-  };
-
-  const lastPlugins = ['autoprefixer', 'cssnano'];
-  css.postcss.plugins = Object.entries(flow.options.postcss?.plugins || {})
-    .sort((a, b) => lastPlugins.indexOf(a[0]) - lastPlugins.indexOf(b[0]))
-    .filter(([, opts]) => opts)
-    .map(([name, opts]) => {
-      const plugin = requireModule(name, {
-        paths: [
-          ...flow.options.modulesDir,
-          distDir,
-        ],
-      });
-      return plugin(opts);
-    });
-
-  return css;
-}

package/src/core/vite/builder/dev-bundler.ts

@@ -1,248 +0,0 @@
-import { pathToFileURL } from 'node:url';
-import { existsSync } from 'node:fs';
-import { builtinModules } from 'node:module';
-import { resolve } from 'pathe';
-import type * as vite from 'vite';
-import type { ExternalsOptions } from 'externality';
-import { ExternalsDefaults, isExternal as _isExternal } from 'externality';
-import { genDynamicImport, genObjectFromRawEntries } from 'knitwork';
-import { hashId, uniq } from './utils';
-
-export interface TransformChunk {
-  id: string
-  code: string
-  deps: string[]
-  parents: string[]
-}
-
-export interface SSRTransformResult {
-  code: string
-  map: object
-  deps: string[]
-  dynamicDeps: string[]
-}
-
-export interface TransformOptions {
-  viteServer: vite.ViteDevServer
-}
-
-function isExternal(opts: TransformOptions, id: string) {
-  // Externals
-  const ssrConfig = (opts.viteServer.config as any).ssr;
-
-  const externalOpts: ExternalsOptions = {
-    inline: [
-      /virtual:/,
-      /\.ts$/,
-      ...ExternalsDefaults.inline,
-      ...ssrConfig.noExternal,
-    ],
-    external: [
-      // * Remove to omit fixed un build
-      // ...ssrConfig.external,
-      /node_modules/,
-    ],
-    resolve: {
-      type: 'module',
-      extensions: ['.ts', '.js', '.json', '.vue', '.mjs', '.jsx', '.tsx', '.wasm'],
-    },
-  };
-  return _isExternal(id, opts.viteServer.config.root, externalOpts);
-}
-
-async function transformRequest(opts: TransformOptions, id: string) {
-  // Virtual modules start with `\0`
-  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/')) {
-    // Absolute path
-    id = id.slice('/@fs'.length);
-    // On Windows, this may be `/C:/my/path` at this point, in which case we want to remove the `/`
-    if (id.match(/^\/\w:/))
-      id = id.slice(1);
-  }
-  else if (!id.includes('entry') && id.startsWith('/')) {
-    // Relative to the root directory
-    const resolvedPath = resolve(opts.viteServer.config.root, `.${id}`);
-    if (existsSync(resolvedPath))
-      id = resolvedPath;
-  }
-
-  // Vite will add ?v=123 to bypass browser cache
-  // Remove for externals
-  const withoutVersionQuery = id.replace(/\?v=\w+$/, '');
-  if (await isExternal(opts, withoutVersionQuery)) {
-    const path = builtinModules.includes(withoutVersionQuery.split('node:').pop())
-      ? withoutVersionQuery
-      : pathToFileURL(withoutVersionQuery).href;
-    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: [],
-    };
-  }
-
-  // Transform
-  const res: SSRTransformResult = await opts.viteServer.transformRequest(id, { ssr: true }).catch((err) => {
-    // eslint-disable-next-line no-console
-    console.warn(`[SSR] Error transforming ${id}:`, err);
-    // console.error(err)
-  }) as SSRTransformResult || { code: '', map: {}, deps: [], dynamicDeps: [] };
-
-  // Wrap into a vite module
-  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: TransformOptions, id: any, parent = '<entry>', chunks: Record<string, TransformChunk> = {}) {
-  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],
-  } as TransformChunk;
-  for (const dep of deps)
-    await transformRequestRecursive(opts, dep, id, chunks);
-
-  return Object.values(chunks);
-}
-
-export async function bundleRequest(opts: TransformOptions, entryURL: string) {
-  const chunks = await transformRequestRecursive(opts, entryURL);
-
-  const listIds = (ids: string[]) => ids.map((id) => `// - ${id} (${hashId(id)})`).join('\n');
-  const chunksCode = chunks!.map((chunk) => `
-// --------------------
-// Request: ${chunk.id}
-// Parents: \n${listIds(chunk.parents)}
-// Dependencies: \n${listIds(chunk.deps)}
-// --------------------
-const ${hashId(chunk.id)} = ${chunk.code}
-`).join('\n');
-
-  const manifestCode = `const __modules__ = ${
-    genObjectFromRawEntries(chunks!.map((chunk) => [chunk.id, hashId(chunk.id)]))
-  }`;
-
-  // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/ssr/ssrModuleLoader.ts
-  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),
-  };
-}

package/src/core/vite/builder/index.ts

@@ -1,96 +0,0 @@
-import { isIgnoredFlow, logger } from '@monkeyplus/flow-kit';
-import type { Flow } from '@monkeyplus/flow-schema';
-import { getPort } from 'get-port-please';
-import * as vite from 'vite';
-import { resolve } from 'pathe';
-import { sanitizeFilePath } from 'mlly';
-import replace from '@rollup/plugin-replace';
-import { warmupViteServer } from './utils/warmup';
-import { buildServer } from './server';
-import type { ViteBuildContext } from './types';
-import virtual from './plugins/virtual';
-import { DynamicBasePlugin } from './plugins/dynamic-base';
-
-export async function bundleVite(flow: Flow) {
-  const hmrPortDefault = 24678; // Vite's default HMR port
-  const hmrPort = await getPort({
-    port: hmrPortDefault,
-    ports: Array.from({ length: 20 }, (_, i) => hmrPortDefault + 1 + i),
-  });
-
-  const ctx: ViteBuildContext = {
-    nuxt: flow,
-    flow,
-    config: vite.mergeConfig({
-      mode: flow.options.dev ? 'development' : undefined,
-      resolve: {
-        alias: {
-          ...flow.options.alias,
-          '#app': flow.options.appDir,
-          '#build/plugins': resolve(flow.options.buildDir, 'plugins/server'),
-          '#build': flow.options.buildDir,
-          '/entry.mjs': resolve(flow.options.appDir, 'entry'),
-
-        },
-      },
-      optimizeDeps: {
-        entries: [
-          resolve(flow.options.appDir, 'entry.ts'),
-        ],
-        include: [],
-      },
-      // css: resolveCSSOptions(nuxt),
-      build: {
-        rollupOptions: {
-          output: { sanitizeFileName: sanitizeFilePath },
-          input: resolve(flow.options.appDir, 'entry'),
-        },
-      },
-      plugins: [
-        replace({
-          ...Object.fromEntries([';', '(', '{', '}', ' ', '\t', '\n'].map((d) => [`${d}global.`, `${d}globalThis.`])),
-          preventAssignment: true,
-        }),
-        virtual(flow.vfs),
-        DynamicBasePlugin.vite({ sourcemap: flow.options.sourcemap }),
-      ],
-      server: {
-        watch: {
-          ignored: isIgnoredFlow,
-        },
-        hmr: {
-          // https://github.com/nuxt/framework/issues/4191
-          protocol: 'ws',
-          clientPort: hmrPort,
-          port: hmrPort,
-        },
-        fs: {
-          allow: [
-            flow.options.appDir,
-          ],
-        },
-      },
-    }, flow.options.vite),
-  };
-  if (flow.options.dev)
-    ctx.config.mode = process.env.NODE_ENV || 'development';
-
-  await flow.callHook('vite:extend', ctx);
-
-  flow.hook('vite:serverCreated', (server: vite.ViteDevServer) => {
-    // Invalidate virtual modules when templates are re-generated
-    ctx.nuxt.hook('app:templatesGenerated', () => {
-      for (const [id, mod] of server.moduleGraph.idToModuleMap) {
-        if (id.startsWith('\x00virtual:'))
-          server.moduleGraph.invalidateModule(mod);
-      }
-    });
-
-    const start = Date.now();
-    warmupViteServer(server, ['/entry.mjs'])
-      .then(() => logger.info(`Vite server warmed up in ${Date.now() - start}ms`))
-      .catch(logger.error);
-  });
-
-  await buildServer(ctx);
-}

package/src/core/vite/builder/manifest.ts

@@ -1,33 +0,0 @@
-import fse from 'fs-extra';
-import { resolve } from 'pathe';
-import { joinURL } from 'ufo';
-import type { ViteBuildContext } from './types';
-
-export async function writeManifest(ctx: ViteBuildContext, extraEntries: string[] = []) {
-  // Write client manifest for use in vue-bundle-renderer
-  const clientDist = resolve(ctx.flow.options.buildDir, 'dist/client');
-  const serverDist = resolve(ctx.flow.options.buildDir, 'dist/server');
-
-  const entries = [
-    '@vite/client',
-    'entry.mjs',
-    ...extraEntries,
-  ];
-
-  // Legacy dev manifest
-  const devClientManifest = {
-    publicPath: joinURL(ctx.flow.options.app.baseURL, ctx.flow.options.app.buildAssetsDir),
-    all: entries,
-    initial: entries,
-    async: [],
-    modules: {},
-  };
-
-  const clientManifest = ctx.flow.options.dev
-    ? devClientManifest
-    : await fse.readJSON(resolve(clientDist, 'manifest.json'));
-
-  await fse.mkdirp(serverDist);
-  await fse.writeFile(resolve(serverDist, 'client.manifest.json'), JSON.stringify(clientManifest, null, 2), 'utf8');
-  await fse.writeFile(resolve(serverDist, 'client.manifest.mjs'), `export default ${JSON.stringify(clientManifest, null, 2)}`, 'utf8');
-}

package/src/core/vite/builder/plugins/analyze.ts

@@ -1,32 +0,0 @@
-// import type { Plugin } from 'vite';
-// import { transform } from 'esbuild';
-// // import { visualizer } from 'rollup-plugin-visualizer';
-// import type { ViteBuildContext } from '../types';
-
-// export function analyzePlugin(ctx: ViteBuildContext): Plugin[] {
-//   return [
-//     {
-//       name: 'nuxt:analyze-minify',
-//       async generateBundle(_opts, outputBundle) {
-//         for (const [_bundleId, bundle] of Object.entries(outputBundle)) {
-//           if (bundle.type !== 'chunk') continue;
-//           const originalEntries = Object.entries(bundle.modules);
-//           const minifiedEntries = await Promise.all(originalEntries.map(async([moduleId, module]) => {
-//             const { code } = await transform(module.code || '', { minify: true });
-//             return [moduleId, { ...module, code }];
-//           }));
-//           bundle.modules = Object.fromEntries(minifiedEntries);
-//         }
-//         return null;
-//       },
-//     },
-//     // visualizer({
-//     //   // @ts-ignore
-//     //   ...ctx.flow.options?.build?.analyze as any,
-//     //   // @ts-ignore
-//     //   filename: ctx.flow.options.build.analyze.filename.replace('{name}', 'client'),
-//     //   title: 'Client bundle stats',
-//     //   gzipSize: true,
-//     // }),
-//   ];
-// }

package/src/core/vite/builder/plugins/cache-dir.ts

@@ -1,13 +0,0 @@
-import { resolve } from 'pathe';
-import type { Plugin } from 'vite';
-
-export function cacheDirPlugin(rootDir: string, name: string) {
-  const optimizeCacheDir = resolve(rootDir, 'node_modules/.cache/vite', name);
-  return <Plugin> {
-    name: 'flow:cache-dir',
-    configResolved(resolvedConfig) {
-      // @ts-ignore
-      resolvedConfig.optimizeCacheDir = optimizeCacheDir;
-    },
-  };
-}