Merge branch 'tech/bundling-router' into tech/bundling-ui

# Conflicts:
#	tsconfig.json

scripts/bundle-package.ts

@@ -129,20 +129,30 @@ async function build(options: Options) {
 async function dts({ input, externals, cwd, ...options }: Options) {
   if (options.watch) {
     try {
-      const [out] = await generateDtsBundle([
-        {
-          filePath: input,
-          output: { inlineDeclareGlobals: false, sortNodes: true, noBanner: true },
-        },
-      ]);
+      const [out] = await generateDtsBundle(
+        [
+          {
+            filePath: input,
+            output: { inlineDeclareGlobals: false, sortNodes: true, noBanner: true },
+          },
+        ],
+        { followSymlinks: false }
+      );
+
       await fs.outputFile('dist/ts3.9/index.d.ts', out);
     } catch (e) {
       console.log(e.message);
     }
   } else {
-    const [out] = await generateDtsBundle([
-      { filePath: input, output: { inlineDeclareGlobals: false, sortNodes: true, noBanner: true } },
-    ]);
+    const [out] = await generateDtsBundle(
+      [
+        {
+          filePath: input,
+          output: { inlineDeclareGlobals: false, sortNodes: true, noBanner: true },
+        },
+      ],
+      { followSymlinks: false }
+    );
 
     const bundledDTSfile = path.join(cwd, 'dist/ts-tmp/index.d.ts');
     const localizedDTSout = path.join(cwd, 'dist/ts3.9');
@@ -160,11 +170,19 @@ async function dts({ input, externals, cwd, ...options }: Options) {
   }
 }
 
+async function removeDist() {
+  await fs.remove('dist');
+}
+
 export async function run({ cwd, flags }: { cwd: string; flags: string[] }) {
   const { packageJson: pkg } = await readPkgUp({ cwd });
   const message = gray(`Built: ${bold(`${pkg.name}@${pkg.version}`)}`);
   console.time(message);
 
+  if (flags.includes('--reset')) {
+    await removeDist();
+  }
+
   const input = path.join(cwd, pkg.bundlerEntrypoint);
   const externals = Object.keys({ ...pkg.dependencies, ...pkg.peerDependencies });
 

scripts/dts-localize.ts

@@ -278,6 +278,10 @@ export const run = async (entrySourceFiles: string[], outputPath: string, option
         if (!x) {
           return;
         }
+        if (replaceRemapping.has(v.resolvedFileName)) {
+          return;
+        }
+
         actOnSourceFile(sourceFiles.find((f) => f.fileName === v.resolvedFileName));
       });
     }

tsconfig.json

@@ -7,7 +7,7 @@
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "jsx": "react",
-    "moduleResolution": "node",
+    "moduleResolution": "Node",
     "module": "CommonJS",
     "skipLibCheck": true,
     "allowSyntheticDefaultImports": true,