@weapp-core/init 3.0.1 → 3.0.3

package/dist/index.cjs

@@ -42,8 +42,8 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.19_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js
-var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
+// ../../node_modules/.pnpm/tsup@8.5.1_@swc+core@1.15.1_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js
+var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.tagName.toUpperCase() === "SCRIPT" ? document.currentScript.src : new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
 // src/index.ts
@@ -477,6 +477,7 @@ function createContext() {
     packageJson: createDocument(),
     viteConfig: createDocument(),
     tsconfig: createDocument(),
+    tsconfigApp: createDocument(),
     tsconfigNode: createDocument(),
     dts: createDocument()
   };
@@ -497,28 +498,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,
@@ -527,41 +559,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
   };
 }
 
@@ -573,23 +624,39 @@ function getDefaultTsDts() {
 
 // src/utils/fs.ts
 var import_fs_extra = __toESM(require("fs-extra"), 1);
+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 import_fs_extra.default.pathExists(filepath)) {
-      return null;
-    }
     return await import_fs_extra.default.readJSON(filepath);
   } catch (error) {
+    if (error?.code === "ENOENT") {
+      return null;
+    }
     throw new FsReadError(filepath, error);
   }
 }
 async function readFileIfExists(filepath) {
   try {
-    if (!await import_fs_extra.default.pathExists(filepath)) {
-      return null;
-    }
     return await import_fs_extra.default.readFile(filepath, "utf8");
   } catch (error) {
+    if (error?.code === "ENOENT") {
+      return null;
+    }
     throw new FsReadError(filepath, error);
   }
 }
@@ -609,22 +676,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) {
@@ -678,22 +729,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);
-    import_logger.default.log(`\u2728 \u5199\u5165 ${posix.relative(root, tsconfigOutputPath)} \u4E0E ${posix.relative(root, tsconfigNodeOutputPath)} \u6210\u529F!`);
+    import_logger.default.log(
+      `\u2728 \u5199\u5165 ${[
+        posix.relative(root, tsconfigOutputPath),
+        posix.relative(root, tsconfigAppOutputPath),
+        posix.relative(root, tsconfigNodeOutputPath)
+      ].join(", ")} \u6210\u529F!`
+    );
   }
   return {
     tsconfig,
+    tsconfigApp,
     tsconfigNode
   };
 }
@@ -704,7 +768,7 @@ var import_logger3 = __toESM(require("@weapp-core/logger"), 1);
 var import_fs_extra2 = __toESM(require("fs-extra"), 1);
 
 // ../../packages/weapp-vite/package.json
-var version = "5.2.1";
+var version = "5.9.3";
 
 // src/enums.ts
 var TemplateName = /* @__PURE__ */ ((TemplateName2) => {
@@ -792,6 +856,7 @@ yarn-error.log*
 
 dist
 dist-plugin
+dist-web
 vite.config.ts.timestamp-*.mjs`;
 function mergeGitignore(existing) {
   const normalizedExisting = normalizeLineEndings(existing ?? "");

package/dist/index.d.cts

@@ -39,6 +39,7 @@ interface Context {
     packageJson: ContextDocument<PackageJson>;
     viteConfig: ContextDocument<string>;
     tsconfig: ContextDocument<TSConfig>;
+    tsconfigApp: ContextDocument<TSConfig>;
     tsconfigNode: ContextDocument<TSConfig>;
     dts: ContextDocument<string>;
 }
@@ -47,42 +48,63 @@ declare function initViteConfigFile(options: SharedUpdateOptions): Promise<strin
 declare function initTsDtsFile(options: SharedUpdateOptions): Promise<string>;
 declare function initTsJsonFiles(options: SharedUpdateOptions): Promise<{
     tsconfig: {
+        references: {
+            path: string;
+        }[];
+        files: never[];
+    };
+    tsconfigApp: {
         compilerOptions: {
+            tsBuildInfoFile: string;
             target: string;
-            jsx: string;
             lib: string[];
-            useDefineForClassFields: boolean;
-            baseUrl: string;
+            jsx: string;
             module: string;
             moduleResolution: string;
+            moduleDetection: string;
+            baseUrl: string;
             paths: {
                 '@/*': string[];
+                'take:@/*': string[];
             };
             resolveJsonModule: boolean;
             types: string[];
             allowImportingTsExtensions: boolean;
             allowJs: boolean;
+            allowSyntheticDefaultImports: boolean;
+            esModuleInterop: boolean;
+            isolatedModules: boolean;
             strict: boolean;
             noFallthroughCasesInSwitch: boolean;
             noUnusedLocals: boolean;
             noUnusedParameters: boolean;
             noEmit: boolean;
-            isolatedModules: boolean;
+            verbatimModuleSyntax: boolean;
+            noUncheckedSideEffectImports: boolean;
+            erasableSyntaxOnly: boolean;
             skipLibCheck: boolean;
         };
-        references: {
-            path: string;
-        }[];
         include: string[];
-        exclude: string[];
     };
     tsconfigNode: {
         compilerOptions: {
-            composite: boolean;
+            tsBuildInfoFile: string;
+            target: string;
+            lib: string[];
             module: string;
             moduleResolution: string;
+            moduleDetection: string;
+            types: string[];
+            allowImportingTsExtensions: boolean;
+            resolveJsonModule: boolean;
+            verbatimModuleSyntax: boolean;
             strict: boolean;
-            allowSyntheticDefaultImports: boolean;
+            noFallthroughCasesInSwitch: boolean;
+            noUnusedLocals: boolean;
+            noUnusedParameters: boolean;
+            noEmit: boolean;
+            noUncheckedSideEffectImports: boolean;
+            erasableSyntaxOnly: boolean;
             skipLibCheck: boolean;
         };
         include: string[];

package/dist/index.d.ts

@@ -39,6 +39,7 @@ interface Context {
     packageJson: ContextDocument<PackageJson>;
     viteConfig: ContextDocument<string>;
     tsconfig: ContextDocument<TSConfig>;
+    tsconfigApp: ContextDocument<TSConfig>;
     tsconfigNode: ContextDocument<TSConfig>;
     dts: ContextDocument<string>;
 }
@@ -47,42 +48,63 @@ declare function initViteConfigFile(options: SharedUpdateOptions): Promise<strin
 declare function initTsDtsFile(options: SharedUpdateOptions): Promise<string>;
 declare function initTsJsonFiles(options: SharedUpdateOptions): Promise<{
     tsconfig: {
+        references: {
+            path: string;
+        }[];
+        files: never[];
+    };
+    tsconfigApp: {
         compilerOptions: {
+            tsBuildInfoFile: string;
             target: string;
-            jsx: string;
             lib: string[];
-            useDefineForClassFields: boolean;
-            baseUrl: string;
+            jsx: string;
             module: string;
             moduleResolution: string;
+            moduleDetection: string;
+            baseUrl: string;
             paths: {
                 '@/*': string[];
+                'take:@/*': string[];
             };
             resolveJsonModule: boolean;
             types: string[];
             allowImportingTsExtensions: boolean;
             allowJs: boolean;
+            allowSyntheticDefaultImports: boolean;
+            esModuleInterop: boolean;
+            isolatedModules: boolean;
             strict: boolean;
             noFallthroughCasesInSwitch: boolean;
             noUnusedLocals: boolean;
             noUnusedParameters: boolean;
             noEmit: boolean;
-            isolatedModules: boolean;
+            verbatimModuleSyntax: boolean;
+            noUncheckedSideEffectImports: boolean;
+            erasableSyntaxOnly: boolean;
             skipLibCheck: boolean;
         };
-        references: {
-            path: string;
-        }[];
         include: string[];
-        exclude: string[];
     };
     tsconfigNode: {
         compilerOptions: {
-            composite: boolean;
+            tsBuildInfoFile: string;
+            target: string;
+            lib: string[];
             module: string;
             moduleResolution: string;
+            moduleDetection: string;
+            types: string[];
+            allowImportingTsExtensions: boolean;
+            resolveJsonModule: boolean;
+            verbatimModuleSyntax: boolean;
             strict: boolean;
-            allowSyntheticDefaultImports: boolean;
+            noFallthroughCasesInSwitch: boolean;
+            noUnusedLocals: boolean;
+            noUnusedParameters: boolean;
+            noEmit: boolean;
+            noUncheckedSideEffectImports: boolean;
+            erasableSyntaxOnly: boolean;
             skipLibCheck: boolean;
         };
         include: string[];