@monkeyplus/flow 5.0.0-rc.138 → 5.0.0-rc.139

package/dist/index.mjs

@@ -24,7 +24,7 @@ import replace from '@rollup/plugin-replace';
 import { resolveTSConfig } from 'pkg-types';
 import fse from 'fs-extra';
 
-const version = "5.0.0-rc.138";
+const version = "5.0.0-rc.139";
 
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (_distDir.match(/(chunks|shared)$/))
@@ -81,6 +81,7 @@ const TransformPlugin = createUnplugin(({ ctx, options, sourcemap }) => {
 });
 
 const commonPresets = [
+  // #head
   defineUnimportPreset({
     from: "#head",
     imports: [
@@ -111,10 +112,12 @@ const appPreset = defineUnimportPreset({
 const vuePreset = defineUnimportPreset({
   from: "vue",
   imports: [
+    // Components
     "defineComponent",
     "getCurrentInstance",
     "useSlots",
     "h",
+    // Reactivity
     "computed"
   ]
 });
@@ -410,8 +413,10 @@ async function initNitro(flow) {
     buildDir: flow.options.buildDir,
     scanDirs,
     renderer: resolve(distDir, "core/runtime/nitro/renderer"),
+    // errorHandler: resolve(distDir, 'core/runtime/nitro/error'),
     nodeModulesDirs: flow.options.modulesDir,
     handlers: [
+      //* Important middleware
       {
         middleware: true,
         handler: resolve(distDir, "core/runtime/nitro/flow")
@@ -443,6 +448,7 @@ async function initNitro(flow) {
     },
     publicAssets: [
       {
+        // baseURL: flow.options.app.buildAssetsDir,
         dir: resolve(flow.options.buildDir, "dist/client")
       },
       ...flow.options._layers.map((layer) => join(layer.config.srcDir, layer.config.dir?.public || "public")).filter((dir) => existsSync(dir)).map((dir) => ({ dir }))
@@ -456,23 +462,34 @@ async function initNitro(flow) {
       inline: [
         ...flow.options.dev ? [] : ["eta", "@monkeyplus/", "@vue/", "@nuxt/", flow.options.buildDir],
         "@monkeyplus/flow/dist",
+        // Dev windows
         "C:/Users/gnu/Documents/GitHub/flow/packages/flow/dist/app",
         distDir
       ]
     },
+    // preset: flow.options.dev ? 'nitro-dev' : undefined,
+    // output: {
+    //   dir: resolve(flow.options.buildDir, 'output'),
+    // },
     replace: {
       "process.dev": flow.options.dev
     },
     alias: {
+      // Vue 3 mocks
       "estree-walker": "unenv/runtime/mock/proxy",
       "@babel/parser": "unenv/runtime/mock/proxy",
+      // Paths
       "#paths": resolve(distDir, "core/runtime/nitro/paths"),
+      // Shortcut to server main file
       "#server": "#build/dist/server/server.mjs",
+      // Nuxt aliases
       ...flow.options.alias
     },
     rollupConfig: {
       plugins: []
     },
+    // watchOptions:{}
+    //* Include to refresh server
     devServer: {
       watch: [resolve(flow.options.buildDir, "dist/server/server.mjs")]
     }
@@ -547,6 +564,7 @@ const addModuleTranspiles = (opts = {}) => {
   const flow = useNuxt();
   const modules = [
     ...opts.additionalModules || [],
+    // ...flow.options.buildModules,
     ...flow.options.modules,
     ...flow.options._modules
   ].map((m) => typeof m === "string" ? m : Array.isArray(m) ? m[0] : m.src).filter((m) => typeof m === "string").map((m) => m.split("node_modules/").pop());
@@ -563,7 +581,10 @@ const addModuleTranspiles = (opts = {}) => {
 function createFlow(options) {
   const hooks = createHooks();
   const flow = {
+    //* Include nuxt version
     _version: "3.0.0",
+    //* Include version
+    // @ts-ignore
     version,
     options,
     hooks,
@@ -582,6 +603,7 @@ async function initFlow(flow) {
   flow.hook("close", () => nuxtCtx.unset());
   await flow.callHook("modules:before");
   const modulesToInstall = [
+    // ...flow.options.buildModules,
     ...flow.options.modules,
     ...flow.options._modules
   ];
@@ -725,9 +747,11 @@ const publicPathTemplate = {
 function _resolveId(id) {
   return resolvePath(id, {
     url: [
+      // @ts-ignore
       global.__NUXT_PREPATHS__,
       import.meta.url,
       process.cwd(),
+      // @ts-ignore
       global.__NUXT_PATHS__
     ]
   });
@@ -735,10 +759,10 @@ function _resolveId(id) {
 
 const defaultTemplates = {
   __proto__: null,
-  serverPluginTemplate: serverPluginTemplate,
   pluginsDeclaration: pluginsDeclaration,
+  publicPathTemplate: publicPathTemplate,
   schemaTemplate: schemaTemplate,
-  publicPathTemplate: publicPathTemplate
+  serverPluginTemplate: serverPluginTemplate
 };
 
 function uniqueBy(arr, key) {
@@ -888,6 +912,20 @@ function cacheDirPlugin(rootDir, name) {
 async function buildServer(ctx) {
   const serverConfig = vite.mergeConfig(ctx.config, {
     base: ctx.nuxt.options.dev ? joinURL(ctx.nuxt.options.app.baseURL.replace(/^\.\//, "/") || "/", ctx.nuxt.options.app.buildAssetsDir) : void 0,
+    // experimental: {
+    //   renderBuiltUrl: (filename, { type, hostType }) => {
+    //     if (hostType !== 'js') {
+    //       // In CSS we only use relative paths until we craft a clever runtime CSS hack
+    //       return { relative: true };
+    //     }
+    //     if (type === 'public')
+    //       return { runtime: `globalThis.__publicAssetsURL(${JSON.stringify(filename)})` };
+    //     if (type === 'asset') {
+    //       const relativeFilename = filename.replace(withTrailingSlash(withoutLeadingSlash(ctx.nuxt.options.app.buildAssetsDir)), '');
+    //       return { runtime: `globalThis.__buildAssetsURL(${JSON.stringify(relativeFilename)})` };
+    //     }
+    //   },
+    // },
     define: {
       "process.server": true,
       "process.client": false,
@@ -906,6 +944,7 @@ async function buildServer(ctx) {
       external: ["#internal/nitro", "#internal/nitro/utils"],
       noExternal: [
         ...ctx.nuxt.options.build.transpile,
+        // TODO: Use externality for production (rollup) build
         /\/esm\/.*\.js$/,
         /\.(es|esm|esm-browser|esm-bundler).js$/,
         "/__vue-jsx",
@@ -925,6 +964,7 @@ async function buildServer(ctx) {
         output: {
           entryFileNames: "server.mjs",
           preferConst: true,
+          // TODO: https://github.com/vitejs/vite/pull/8641
           inlineDynamicImports: !ctx.nuxt.options.experimental.viteServerDynamicImports,
           format: "module"
         },
@@ -935,6 +975,7 @@ async function buildServer(ctx) {
       }
     },
     server: {
+      // https://github.com/vitest-dev/vitest/issues/229#issuecomment-1002685027
       preTransformRequests: false,
       hmr: false
     },
@@ -944,6 +985,8 @@ async function buildServer(ctx) {
         ...Object.fromEntries([";", "(", "{", "}", " ", "	", "\n"].map((d) => [`${d}global.`, `${d}globalThis.`])),
         preventAssignment: true
       })
+      // vuePlugin(ctx.config.vue),
+      // viteJsxPlugin(),
     ]
   });
   if (ctx.nuxt.options.typescript.typeCheck === true || ctx.nuxt.options.typescript.typeCheck === "build" && !ctx.nuxt.options.dev) {
@@ -984,9 +1027,12 @@ async function bundle$1(nuxt) {
           alias: {
             ...nuxt.options.alias,
             "#app": nuxt.options.appDir,
+            // We need this resolution to be present before the following entry, but it
+            // will be filled in client/server configs
             "#build/plugins": "",
             "#build": nuxt.options.buildDir,
             "web-streams-polyfill/ponyfill/es2018": "unenv/runtime/mock/empty",
+            // Cannot destructure property 'AbortController' of ..
             "abort-controller": "unenv/runtime/mock/empty"
           }
         },
@@ -994,6 +1040,7 @@ async function bundle$1(nuxt) {
           entries: [entry],
           include: []
         },
+        // css: resolveCSSOptions(nuxt),
         build: {
           rollupOptions: {
             output: { sanitizeFileName: sanitizeFilePath },
@@ -1004,6 +1051,7 @@ async function bundle$1(nuxt) {
           }
         },
         plugins: [
+          // composableKeysPlugin.vite({ sourcemap: nuxt.options.sourcemap, rootDir: nuxt.options.rootDir }),
           replace({
             ...Object.fromEntries([";", "(", "{", "}", " ", "	", "\n"].map((d) => [`${d}global.`, `${d}globalThis.`])),
             preventAssignment: true

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

@@ -27,6 +27,7 @@ const buildPages = (page) => (location, language, _locales) => {
         name: page.name,
         noPublish: page.noPublish
       }
+      // locale: _locale,
     };
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.138",
+  "version": "5.0.0-rc.139",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,9 +25,9 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.138",
-    "@monkeyplus/flow-kit": "5.0.0-rc.138",
-    "@monkeyplus/flow-schema": "5.0.0-rc.138",
+    "@monkeyplus/flow-cli": "5.0.0-rc.139",
+    "@monkeyplus/flow-kit": "5.0.0-rc.139",
+    "@monkeyplus/flow-schema": "5.0.0-rc.139",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^1.0.16",
     "c12": "^1.0.1",