@moneko/core 3.0.0-beta.32 → 3.0.0-beta.34

package/lib/common.js

@@ -98,6 +98,25 @@ const defaultConfig = {
         jsxImportSource: jsxImportSource,
         remarkPlugins: [],
         rehypePlugins: []
+    },
+    jsxDomExpressions: {
+        moduleName: 'solid-js/web',
+        builtIns: [
+            'For',
+            'Show',
+            'Switch',
+            'Match',
+            'Suspense',
+            'SuspenseList',
+            'Portal',
+            'Index',
+            'Dynamic',
+            'ErrorBoundary'
+        ],
+        contextToCustomElements: true,
+        wrapConditionals: true,
+        generate: 'dom',
+        hydratable: false
     }
 };
 export const log = (msg)=>{

package/lib/routes.d.ts

@@ -1 +1 @@
-export declare const frameworkCacheDir: "~/node_modules/@moneko/react/.cache/" | "~/node_modules/@moneko/solid-js/.cache/";
+export declare const frameworkCacheDir: ".git/";

package/lib/routes.js

@@ -1,9 +1,9 @@
-import { readdirSync, statSync, writeFile, readFileSync, existsSync, mkdirSync } from 'fs';
+import { readdirSync, statSync, writeFile, readFileSync, existsSync, mkdirSync, unlinkSync } from 'fs';
 import { join, relative } from 'path';
 import { watch } from 'chokidar';
 import { load } from 'js-yaml';
 import { PROGRAMPATH, APPTYPE, FRAMEWORK, DEV } from './process-env.js';
-import { resolveNodeModulesPath } from './utils.js';
+import { resolveProgramPath } from './utils.js';
 const frontmatterRegex = /^---\n([\s\S]+?)\n---\n/;
 function extractFrontmatter(md) {
     const matches = md.match(frontmatterRegex);
@@ -85,7 +85,7 @@ function getTree(directory, option) {
     }, []);
 }
 const compPath = join(PROGRAMPATH, './components');
-export const frameworkCacheDir = resolveNodeModulesPath(`@moneko/${FRAMEWORK}/.cache/`);
+export const frameworkCacheDir = resolveProgramPath(`.git/`);
 let genLibRouteTimer;
 function fallback(err) {
     if (err) {
@@ -113,7 +113,7 @@ function generatorLibraryRouter() {
         if (!existsSync(frameworkCacheDir)) {
             mkdirSync(frameworkCacheDir);
         }
-        writeFile(join(frameworkCacheDir, 'router.js'), `${prefixStr}export default ${tree}`, 'utf-8', fallback);
+        writeFile(join(frameworkCacheDir, 'route.js'), `${prefixStr}export default ${tree}`, 'utf-8', fallback);
     }, 100);
 }
 let genLibDemoTimer;
@@ -136,7 +136,7 @@ function generatorLibraryDemo() {
         if (!existsSync(frameworkCacheDir)) {
             mkdirSync(frameworkCacheDir);
         }
-        writeFile(join(frameworkCacheDir, 'examples.js'), `export default ${JSON.stringify(tree)}`, 'utf-8', fallback);
+        writeFile(join(frameworkCacheDir, 'example.js'), `export default ${JSON.stringify(tree)}`, 'utf-8', fallback);
     }, 100);
 }
 function watchFiles(root, ignored, call) {
@@ -169,3 +169,12 @@ if (APPTYPE === 'library') {
         generatorLibraryDemo();
     }
 }
+process.on('SIGINT', function() {
+    try {
+        unlinkSync(join(frameworkCacheDir, 'example.js'));
+    } catch (error) {}
+    try {
+        unlinkSync(join(frameworkCacheDir, 'route.js'));
+    } catch (error) {}
+    process.exit();
+});

package/lib/swcrc.js

@@ -92,6 +92,10 @@ export default ((isDev = false)=>{
                     [
                         'swc-plugin-another-transform-imports',
                         transformConfigs(CONFIG.importOnDemand || {})
+                    ],
+                    [
+                        '@moneko/jsx-dom-expressions',
+                        CONFIG.jsxDomExpressions || {}
                     ]
                 ]
             }

package/lib/utils.d.ts

@@ -2,7 +2,7 @@ export declare function tfc(filepath: string): string;
 export declare function readConf(src: string, name: string): Promise<any>;
 export declare function toUpperCaseString(string: string): string;
 export declare function getIPAdress(): string | undefined | void;
-type ProgramPath<T extends string> = `~/${T extends string ? T : string}`;
+type ProgramPath<T extends string> = `${T extends string ? T : string}`;
 type NodeModulesPath<T> = ProgramPath<`node_modules/${T extends string ? T : string}`>;
 /** 位于项目根目录下的位置
  * @param {string} src 路径
@@ -13,7 +13,7 @@ export declare function resolveProgramPath<T extends string>(src: T): ProgramPat
  * @param {string} src 路径
  * @returns {string} 位于项目根目录node_modules下的位置
  */
-export declare const resolveNodeModulesPath: <T extends string>(src: T) => `~/${`node_modules/${T extends string ? T : string}` extends infer T_1 ? T_1 extends `node_modules/${T extends string ? T : string}` ? T_1 extends string ? T_1 : string : never : never}`;
+export declare const resolveNodeModulesPath: <T extends string>(src: T) => `${`node_modules/${T extends string ? T : string}` extends infer T_1 ? T_1 extends `node_modules/${T extends string ? T : string}` ? T_1 extends string ? T_1 : string : never : never}`;
 /** 获取模块真实入口位置
  * @param {string} url 路径
  * @returns {string} 模块真实入口路径

package/lib/webpack.common.d.ts

@@ -1,4 +1,3 @@
-import './routes.js';
 import type { WebpackConfiguration } from 'webpack-dev-server';
 export declare const outputConfig: WebpackConfiguration['output'];
 declare const config: WebpackConfiguration;

package/lib/webpack.common.js

@@ -11,7 +11,7 @@ import htmlPluginOption from './html-plugin-option.js';
 import { moduleFederation } from './module-federation.js';
 import moduleConfig from './module.config.js';
 import { APPTYPE, DEV, hasEslintConfig, hasStylelintConfig, PACKAGENAME, PROGRAMPATH, FRAMEWORK } from './process-env.js';
-import './routes.js';
+import { frameworkCacheDir } from './routes.js';
 import { seo } from './seo.js';
 import { resolveNodeModulesPath, resolveProgramPath } from './utils.js';
 const eslintrc = [
@@ -48,7 +48,8 @@ if (!hasStylelint) {
 const StylelintPlugin = hasStylelint ? (await import('stylelint-webpack-plugin')).default : null;
 const ESLintPlugin = hasEslint ? (await import('eslint-webpack-plugin')).default : null;
 const alias = {
-    '@': resolveProgramPath('src')
+    '@': resolveProgramPath('src'),
+    '@framework-cache-dir': frameworkCacheDir
 };
 Object.assign(alias, CONFIG.alias);
 if (APPTYPE === 'library') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneko/core",
-  "version": "3.0.0-beta.32",
+  "version": "3.0.0-beta.34",
   "description": "core",
   "main": "lib/index.js",
   "type": "module",
@@ -13,48 +13,49 @@
   "license": "MIT",
   "dependencies": {
     "@mdx-js/loader": "2.3.0",
+    "@moneko/jsx-dom-expressions": "0.1.0",
     "@soda/friendly-errors-webpack-plugin": "1.8.1",
-    "@swc/core": "1.3.56",
+    "@swc/core": "1.3.62",
     "@swc/css": "0.0.20",
     "@swc/helpers": "0.5.1",
     "add-asset-html-webpack-plugin": "6.0.0",
-    "core-js": "3.30.2",
+    "core-js": "3.31.0",
     "cross-env": "7.0.3",
-    "css-loader": "6.7.3",
-    "css-minimizer-webpack-plugin": "5.0.0",
+    "css-loader": "6.8.1",
+    "css-minimizer-webpack-plugin": "5.0.1",
     "css-unicode-loader": "1.0.3",
     "external-remotes-plugin": "1.0.0",
-    "html-webpack-plugin": "5.5.1",
+    "html-webpack-plugin": "5.5.3",
     "less": "4.1.3",
-    "less-loader": "11.1.0",
-    "mini-css-extract-plugin": "2.7.5",
+    "less-loader": "11.1.3",
+    "mini-css-extract-plugin": "2.7.6",
     "mini-svg-data-uri": "1.4.4",
     "path-to-regexp": "6.2.1",
     "portfinder": "1.0.32",
-    "style-loader": "3.3.2",
+    "style-loader": "3.3.3",
     "style-resources-loader": "1.5.0",
     "swc-loader": "0.2.3",
-    "swc-plugin-another-transform-imports": "0.2.3",
+    "swc-plugin-another-transform-imports": "0.2.4",
     "ts-import-plugin": "3.0.0",
-    "ts-loader": "9.4.2",
-    "typescript": "5.0.4",
+    "ts-loader": "9.4.3",
+    "typescript": "5.1.3",
     "webpack": "5.76.1",
-    "webpack-bundle-analyzer": "4.8.0",
+    "webpack-bundle-analyzer": "4.9.0",
     "webpack-cli": "5.1.1",
     "webpack-dev-server": "4.15.0",
-    "webpack-merge": "5.8.0",
+    "webpack-merge": "5.9.0",
     "webpackbar": "5.0.2",
-    "xml2js": "0.5.0"
+    "xml2js": "0.6.0"
   },
   "devDependencies": {
-    "@moneko/mock": "^1.0.9",
+    "@moneko/mock": "^1.0.10",
     "@moneko/postcss": "^1.0.30",
     "@swc/cli": "0.1.62",
     "@types/js-yaml": "^4.0.5",
     "@types/mini-css-extract-plugin": "^2.5.1",
     "@types/shelljs": "^0.8.12",
     "@types/webpack-bundle-analyzer": "^4.6.0",
-    "@types/webpack-env": "^1.18.0",
+    "@types/webpack-env": "^1.18.1",
     "eslint-config-neko": "^1.0.23",
     "shelljs": "^0.8.5",
     "stylelint-config-moneko": "^1.0.15"

package/typings/global.d.ts

@@ -264,6 +264,14 @@ export declare type ConfigType<T extends 'tsc' | 'swc' = 'swc'> = {
   /** 📦 打包完成 */
   done?: () => void;
   mdx?: MDXOptions;
+  jsxDomExpressions?: {
+    moduleName?: string;
+    builtIns?: string[];
+    contextToCustomElements?: boolean;
+    wrapConditionals?: boolean;
+    generate?: 'ssr' | 'dom';
+    hydratable?: boolean;
+  };
 };
 export declare interface ModuleFederationOption {
   /** 模块名称，唯一性，不能重名 */