@weapp-core/init 3.0.1 → 3.0.3

package/dist/index.js

@@ -429,6 +429,7 @@ function createContext() {
     packageJson: createDocument(),
     viteConfig: createDocument(),
     tsconfig: createDocument(),
+    tsconfigApp: createDocument(),
     tsconfigNode: createDocument(),
     dts: createDocument()
   };
@@ -449,28 +450,59 @@ function resetContext() {
   Object.assign(ctx.packageJson, next.packageJson);
   Object.assign(ctx.viteConfig, next.viteConfig);
   Object.assign(ctx.tsconfig, next.tsconfig);
+  Object.assign(ctx.tsconfigApp, next.tsconfigApp);
   Object.assign(ctx.tsconfigNode, next.tsconfigNode);
   Object.assign(ctx.dts, next.dts);
 }
 
 // src/tsconfigJson.ts
+var srcIncludeGlobs = [
+  "src/**/*.ts",
+  "src/**/*.tsx",
+  "src/**/*.js",
+  "src/**/*.jsx",
+  "src/**/*.mts",
+  "src/**/*.cts",
+  "src/**/*.vue",
+  "src/**/*.json",
+  "src/**/*.d.ts",
+  "types/**/*.d.ts",
+  "env.d.ts"
+];
 function getDefaultTsconfigJson() {
+  return {
+    references: [
+      {
+        path: "./tsconfig.app.json"
+      },
+      {
+        path: "./tsconfig.node.json"
+      }
+    ],
+    files: []
+  };
+}
+function getDefaultTsconfigAppJson() {
   return {
     compilerOptions: {
-      target: "ES2020",
-      jsx: "preserve",
+      tsBuildInfoFile: "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+      target: "ES2023",
       lib: [
-        "ES2020",
+        "ES2023",
         "DOM",
         "DOM.Iterable"
       ],
-      useDefineForClassFields: false,
-      baseUrl: ".",
+      jsx: "preserve",
       module: "ESNext",
       moduleResolution: "bundler",
+      moduleDetection: "force",
+      baseUrl: ".",
       paths: {
         "@/*": [
-          "./*"
+          "./src/*"
+        ],
+        "take:@/*": [
+          "./src/*"
         ]
       },
       resolveJsonModule: true,
@@ -479,41 +511,60 @@ function getDefaultTsconfigJson() {
       ],
       allowImportingTsExtensions: true,
       allowJs: true,
+      allowSyntheticDefaultImports: true,
+      esModuleInterop: true,
+      isolatedModules: true,
       strict: true,
       noFallthroughCasesInSwitch: true,
       noUnusedLocals: true,
       noUnusedParameters: true,
       noEmit: true,
-      isolatedModules: true,
+      verbatimModuleSyntax: true,
+      noUncheckedSideEffectImports: true,
+      erasableSyntaxOnly: true,
       skipLibCheck: true
     },
-    references: [
-      {
-        path: "./tsconfig.node.json"
-      }
-    ],
-    include: [
-      "**/*.ts",
-      "**/*.js",
-      "vite-env.d.ts"
-    ],
-    exclude: [
-      "node_modules",
-      "dist"
-    ]
+    include: srcIncludeGlobs
   };
 }
 function getDefaultTsconfigNodeJson(include = []) {
+  const baseInclude = [
+    "vite.config.ts",
+    "vite.config.*.ts",
+    "*.config.ts",
+    "config/**/*.ts",
+    "scripts/**/*.ts"
+  ];
+  const mergedInclude = Array.from(/* @__PURE__ */ new Set([
+    ...baseInclude,
+    ...include
+  ]));
   return {
     compilerOptions: {
-      composite: true,
+      tsBuildInfoFile: "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+      target: "ES2023",
+      lib: [
+        "ES2023"
+      ],
       module: "ESNext",
       moduleResolution: "bundler",
+      moduleDetection: "force",
+      types: [
+        "node"
+      ],
+      allowImportingTsExtensions: true,
+      resolveJsonModule: true,
+      verbatimModuleSyntax: true,
       strict: true,
-      allowSyntheticDefaultImports: true,
+      noFallthroughCasesInSwitch: true,
+      noUnusedLocals: true,
+      noUnusedParameters: true,
+      noEmit: true,
+      noUncheckedSideEffectImports: true,
+      erasableSyntaxOnly: true,
       skipLibCheck: true
     },
-    include
+    include: mergedInclude
   };
 }
 
@@ -525,23 +576,39 @@ function getDefaultTsDts() {
 
 // src/utils/fs.ts
 import fs from "fs-extra";
+var FsReadError = class extends Error {
+  constructor(filepath, cause) {
+    super(`Failed to read ${filepath}`);
+    this.filepath = filepath;
+    this.cause = cause;
+    this.name = "FsReadError";
+  }
+};
+var FsWriteError = class extends Error {
+  constructor(filepath, cause) {
+    super(`Failed to write ${filepath}`);
+    this.filepath = filepath;
+    this.cause = cause;
+    this.name = "FsWriteError";
+  }
+};
 async function readJsonIfExists(filepath) {
   try {
-    if (!await fs.pathExists(filepath)) {
-      return null;
-    }
     return await fs.readJSON(filepath);
   } catch (error) {
+    if (error?.code === "ENOENT") {
+      return null;
+    }
     throw new FsReadError(filepath, error);
   }
 }
 async function readFileIfExists(filepath) {
   try {
-    if (!await fs.pathExists(filepath)) {
-      return null;
-    }
     return await fs.readFile(filepath, "utf8");
   } catch (error) {
+    if (error?.code === "ENOENT") {
+      return null;
+    }
     throw new FsReadError(filepath, error);
   }
 }
@@ -561,22 +628,6 @@ async function writeFile(filepath, contents) {
     throw new FsWriteError(filepath, error);
   }
 }
-var FsReadError = class extends Error {
-  constructor(filepath, cause) {
-    super(`Failed to read ${filepath}`);
-    this.filepath = filepath;
-    this.cause = cause;
-    this.name = "FsReadError";
-  }
-};
-var FsWriteError = class extends Error {
-  constructor(filepath, cause) {
-    super(`Failed to write ${filepath}`);
-    this.filepath = filepath;
-    this.cause = cause;
-    this.name = "FsWriteError";
-  }
-};
 
 // src/utils/path.ts
 function resolveOutputPath(root, dest, fallback) {
@@ -630,22 +681,35 @@ async function initTsJsonFiles(options) {
   const { root, dest, write = true } = options;
   const tsJsonFilename = ctx.tsconfig.name = "tsconfig.json";
   const tsJsonFilePath = ctx.tsconfig.path = posix.resolve(root, tsJsonFilename);
+  const tsAppJsonFilename = ctx.tsconfigApp.name = "tsconfig.app.json";
+  const tsAppJsonFilePath = ctx.tsconfigApp.path = posix.resolve(root, tsAppJsonFilename);
   const tsNodeJsonFilename = ctx.tsconfigNode.name = "tsconfig.node.json";
   const tsNodeJsonFilePath = ctx.tsconfigNode.path = posix.resolve(root, tsNodeJsonFilename);
   const tsconfig = getDefaultTsconfigJson();
+  const tsconfigApp = getDefaultTsconfigAppJson();
   const includeFiles = ctx.viteConfig.name ? [ctx.viteConfig.name] : [];
   const tsconfigNode = getDefaultTsconfigNodeJson(includeFiles);
   ctx.tsconfig.value = tsconfig;
+  ctx.tsconfigApp.value = tsconfigApp;
   ctx.tsconfigNode.value = tsconfigNode;
   if (write) {
     const tsconfigOutputPath = resolveOutputPath(root, dest, tsJsonFilePath);
-    const tsconfigNodeOutputPath = tsNodeJsonFilePath;
+    const tsconfigAppOutputPath = resolveOutputPath(root, dest, tsAppJsonFilePath);
+    const tsconfigNodeOutputPath = resolveOutputPath(root, dest, tsNodeJsonFilePath);
     await writeJsonFile(tsconfigOutputPath, tsconfig);
+    await writeJsonFile(tsconfigAppOutputPath, tsconfigApp);
     await writeJsonFile(tsconfigNodeOutputPath, tsconfigNode);
-    logger.log(`\u2728 \u5199\u5165 ${posix.relative(root, tsconfigOutputPath)} \u4E0E ${posix.relative(root, tsconfigNodeOutputPath)} \u6210\u529F!`);
+    logger.log(
+      `\u2728 \u5199\u5165 ${[
+        posix.relative(root, tsconfigOutputPath),
+        posix.relative(root, tsconfigAppOutputPath),
+        posix.relative(root, tsconfigNodeOutputPath)
+      ].join(", ")} \u6210\u529F!`
+    );
   }
   return {
     tsconfig,
+    tsconfigApp,
     tsconfigNode
   };
 }
@@ -656,7 +720,7 @@ import logger3 from "@weapp-core/logger";
 import fs2 from "fs-extra";
 
 // ../../packages/weapp-vite/package.json
-var version = "5.2.1";
+var version = "5.9.3";
 
 // src/enums.ts
 var TemplateName = /* @__PURE__ */ ((TemplateName2) => {
@@ -744,6 +808,7 @@ yarn-error.log*
 
 dist
 dist-plugin
+dist-web
 vite.config.ts.timestamp-*.mjs`;
 function mergeGitignore(existing) {
   const normalizedExisting = normalizeLineEndings(existing ?? "");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-core/init",
   "type": "module",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "@weapp-core/init",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",

package/templates/default/auto-import-components.json

@@ -0,0 +1,3 @@
+{
+  "HelloWorld": "/components/HelloWorld/HelloWorld"
+}

package/templates/default/gitignore

@@ -31,4 +31,5 @@ yarn-error.log*
 .turbo
 
 dist
-vite.config.ts.timestamp-*.mjs
+vite.config.ts.timestamp-*.mjs
+dist-web

package/templates/default/package.json

@@ -9,7 +9,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/weapp-vite/weapp-vite.git",
-    "directory": "apps/weapp-vite-template"
+    "directory": "templates/weapp-vite-template"
   },
   "bugs": {
     "url": "https://github.com/weapp-vite/weapp-vite/issues"
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "miniprogram-api-typings": "^4.1.0",
-    "sass": "^1.93.2",
+    "sass": "^1.94.0",
     "typescript": "^5.9.3",
     "weapp-vite": "workspace:*"
   }

package/templates/default/project.private.config.json

@@ -5,4 +5,4 @@
     "compileHotReLoad": true
   },
   "libVersion": "3.9.0"
-}
+}

package/templates/default/src/components/HelloWorld/HelloWorld.json

@@ -3,4 +3,4 @@
   "component": true,
   "styleIsolation": "apply-shared",
   "usingComponents": {}
-}
+}

package/templates/default/src/components/HelloWorld/HelloWorld.ts

@@ -53,6 +53,7 @@ Component({
         })
       }
       catch (error) {
+        // eslint-disable-next-line no-console
         console.error('复制链接失败', error)
       }
     },

package/templates/default/src/pages/index/index.ts

@@ -18,6 +18,7 @@ Page({
     },
   },
   onClick() {
+    // eslint-disable-next-line no-console
     console.log('on click')
   },
 })

package/templates/default/tsconfig.app.json

@@ -0,0 +1,55 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2023",
+    "jsx": "preserve",
+    "lib": [
+      "ES2023",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "moduleDetection": "force",
+    "baseUrl": ".",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ],
+      "take:@/*": [
+        "./src/*"
+      ]
+    },
+    "resolveJsonModule": true,
+    "types": [
+      "miniprogram-api-typings"
+    ],
+    "allowImportingTsExtensions": true,
+    "allowJs": true,
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUncheckedSideEffectImports": true,
+    "erasableSyntaxOnly": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.mts",
+    "src/**/*.cts",
+    "src/**/*.vue",
+    "src/**/*.json",
+    "src/**/*.d.ts",
+    "types/**/*.d.ts",
+    "env.d.ts"
+  ]
+}

package/templates/default/tsconfig.json

@@ -1,48 +1,11 @@
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "jsx": "preserve",
-    "lib": [
-      "ES2020",
-      "DOM",
-      "DOM.Iterable"
-    ],
-    "useDefineForClassFields": false,
-    "baseUrl": ".",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "paths": {
-      "@/*": [
-        "./src/*"
-      ]
-    },
-    "resolveJsonModule": true,
-    "types": [
-      "miniprogram-api-typings"
-    ],
-    "allowImportingTsExtensions": true,
-    "allowJs": true,
-    "strict": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noEmit": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "isolatedModules": true,
-    "skipLibCheck": true
-  },
   "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
     {
       "path": "./tsconfig.node.json"
     }
   ],
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.js"
-  ],
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
+  "files": []
 }

package/templates/default/tsconfig.node.json

@@ -1,13 +1,33 @@
 {
   "compilerOptions": {
-    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "target": "ES2023",
+    "lib": [
+      "ES2023"
+    ],
+    "moduleDetection": "force",
     "module": "ESNext",
     "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "types": [
+      "node"
+    ],
+    "allowImportingTsExtensions": true,
     "strict": true,
-    "allowSyntheticDefaultImports": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "verbatimModuleSyntax": true,
+    "noUncheckedSideEffectImports": true,
+    "erasableSyntaxOnly": true,
     "skipLibCheck": true
   },
   "include": [
-    "vite.config.ts"
+    "vite.config.ts",
+    "vite.config.*.ts",
+    "*.config.ts",
+    "config/**/*.ts",
+    "scripts/**/*.ts"
   ]
 }

package/templates/tailwindcss/auto-import-components.json

@@ -0,0 +1,3 @@
+{
+  "HelloWorld": "/components/HelloWorld/HelloWorld"
+}

package/templates/tailwindcss/gitignore

@@ -31,4 +31,5 @@ yarn-error.log*
 .turbo
 
 dist
-vite.config.ts.timestamp-*.mjs
+vite.config.ts.timestamp-*.mjs
+dist-web

package/templates/tailwindcss/package.json

@@ -9,7 +9,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/weapp-vite/weapp-vite.git",
-    "directory": "apps/weapp-vite-tailwindcss-template"
+    "directory": "templates/weapp-vite-tailwindcss-template"
   },
   "bugs": {
     "url": "https://github.com/weapp-vite/weapp-vite/issues"
@@ -26,13 +26,13 @@
   "devDependencies": {
     "@egoist/tailwindcss-icons": "^1.9.0",
     "@iconify-json/mdi": "^1.2.3",
-    "autoprefixer": "^10.4.21",
+    "autoprefixer": "^10.4.22",
     "miniprogram-api-typings": "^4.1.0",
     "postcss": "^8.5.6",
-    "sass": "^1.93.2",
-    "tailwindcss": "^3.4.17",
+    "sass": "^1.94.0",
+    "tailwindcss": "^3.4.18",
     "typescript": "^5.9.3",
-    "weapp-tailwindcss": "^4.3.3",
+    "weapp-tailwindcss": "^4.7.7",
     "weapp-vite": "workspace:*"
   }
 }

package/templates/tailwindcss/project.config.json

@@ -39,4 +39,4 @@
     "include": []
   },
   "appid": "wx6ffee4673b257014"
-}
+}

package/templates/tailwindcss/project.private.config.json

@@ -5,4 +5,4 @@
     "compileHotReLoad": true
   },
   "libVersion": "development"
-}
+}

package/templates/tailwindcss/src/components/HelloWorld/HelloWorld.ts

@@ -53,6 +53,7 @@ Component({
         })
       }
       catch (error) {
+        // eslint-disable-next-line no-console
         console.error('复制链接失败', error)
       }
     },

package/templates/tailwindcss/src/pages/index/index.ts

@@ -37,10 +37,12 @@ Page({
       await wx.setClipboardData({
         data: e.mark.url,
       })
+      // eslint-disable-next-line no-console
       console.log(`复制成功: ${e.mark.url}`)
     }
   },
   onLoad() {
+    // eslint-disable-next-line no-console
     console.log(hello())
   },
 })

package/templates/tailwindcss/src/pages/profile/index.ts

@@ -13,6 +13,7 @@ Page({
     },
   },
   onClick() {
+    // eslint-disable-next-line no-console
     console.log('on click')
   },
 })

package/templates/tailwindcss/tsconfig.app.json

@@ -0,0 +1,55 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2023",
+    "jsx": "preserve",
+    "lib": [
+      "ES2023",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "moduleDetection": "force",
+    "baseUrl": ".",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ],
+      "take:@/*": [
+        "./src/*"
+      ]
+    },
+    "resolveJsonModule": true,
+    "types": [
+      "miniprogram-api-typings"
+    ],
+    "allowImportingTsExtensions": true,
+    "allowJs": true,
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noEmit": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUncheckedSideEffectImports": true,
+    "erasableSyntaxOnly": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.mts",
+    "src/**/*.cts",
+    "src/**/*.vue",
+    "src/**/*.json",
+    "src/**/*.d.ts",
+    "types/**/*.d.ts",
+    "env.d.ts"
+  ]
+}