tinijs · lamnhan · Apr 26, 2024 · Apr 26, 2024 · Apr 26, 2024 · Apr 26, 2024
diff --git a/apps/tinijs.dev/content/framework-posts/103 - dev-build/index.md b/apps/tinijs.dev/content/framework-posts/103 - dev-build/index.md
@@ -76,20 +76,7 @@ Homepage: <https://webpack.js.org/>
 ### Option 2: Or, manually
 
 1. Install: `npm i -D webpack webpack-cli webpack-dev-server html-bundler-webpack-plugin ts-loader`
-2. Add _webpack.config.cjs_, please see [example](https://github.com/tinijs/tinijs/blob/main/packages/webpack-builder/webpack.config.cjs).
+2. Add _webpack.config.js_, please see [example](https://github.com/tinijs/tinijs/blob/main/packages/webpack-builder/webpack.config.js).
 3. Add scripts:
   - **dev**: `webpack serve --history-api-fallback --mode development`
   - **build**: `webpack build --mode production`
-
-### Additional setup
-
-Either using Tini CLI or setup manually, you need to do these additional setup.
-
-- Modify _tsconfig.json_
-```json
-{
-  "compilerOptions": {
-    "declaration": false
-  }
-}
-```
diff --git a/apps/tinijs.dev/tini.config.ts b/apps/tinijs.dev/tini.config.ts
@@ -1,6 +1,12 @@
 import {defineTiniConfig} from '@tinijs/project';
 
 export default defineTiniConfig({
+  build: {
+    options: {
+      configPath: '../../packages/vite-builder/vite.config.js',
+    },
+  },
+
   modules: ['@tinijs/content'],
 
   cli: {

diff --git a/apps/tinijs.dev/tsconfig.json b/apps/tinijs.dev/tsconfig.json
@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["**/*"]
+  "include": [
+    ".app/**/*",
+    "**/*"
+  ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/cli/utils/build.ts b/packages/cli/cli/utils/build.ts
@@ -32,13 +32,18 @@ export async function loadBuilder(tiniProject: TiniProject) {
 }
 
 export function exposeEnvs(tiniConfig: TiniConfig, targetEnv: string) {
-  const {srcDir, outDir, compileDir, entryDir, dirs} =
-    getProjectDirs(tiniConfig);
+  const projectDirs = getProjectDirs(tiniConfig);
   process.env.NODE_ENV = targetEnv;
   process.env.TARGET_ENV = targetEnv;
-  process.env.TINI_SRC_DIR = srcDir;
-  process.env.TINI_COMPILE_DIR = compileDir;
-  process.env.TINI_OUT_DIR = outDir;
-  process.env.TINI_ENTRY_DIR = entryDir;
-  process.env.TINI_DIRS_PUBLIC = dirs.public;
+  process.env.TINI_PROJECT_DIRS = JSON.stringify(projectDirs);
+  process.env.TINI_COMPILE_OPTIONS = JSON.stringify(
+    (tiniConfig.compile === false || tiniConfig.compile instanceof Function
+      ? undefined
+      : tiniConfig.compile?.options) || {}
+  );
+  process.env.TINI_BUILD_OPTIONS = JSON.stringify(
+    (tiniConfig.build instanceof Function
+      ? undefined
+      : tiniConfig.build?.options) || {}
+  );
 }
diff --git a/packages/cli/cli/utils/project.ts b/packages/cli/cli/utils/project.ts
@@ -7,10 +7,6 @@ import cliPackageJSON = require('../../package.json');
 
 export const TINIJS_INSTALL_DIR_PATH = resolve('node_modules', '@tinijs');
 
-export function getTargetEnv() {
-  return process.env.TARGET_ENV || 'development';
-}
-
 export async function loadCLIPackageJSON() {
   return cliPackageJSON as PackageJson;
 }

diff --git a/packages/parcel-builder/lib/index.ts b/packages/parcel-builder/lib/index.ts
@@ -5,7 +5,9 @@ import {
   type CommonBuildOptions,
 } from '@tinijs/project';
 
-export type BuildOptions = CommonBuildOptions;
+export interface BuildOptions extends CommonBuildOptions {
+  sourcemap?: boolean;
+}
 
 export default function (options: BuildOptions, tiniProject: TiniProject) {
   return new ParcelBuilder(options, tiniProject);
@@ -21,22 +23,22 @@ export class ParcelBuilder implements Builder {
     private tiniProject: TiniProject
   ) {}
 
-  get build() {
+  get dev() {
     return {
-      command: this.commands.buildCommand,
+      command: this.commands.devCommand,
+      onServerStart: this.options.onDevServerStart,
     };
   }
 
-  get dev() {
+  get build() {
     return {
-      command: this.commands.devCommand,
-      onServerStart: this.options.onDevServerStart,
+      command: this.commands.buildCommand,
     };
   }
 
   private get commands() {
     const {srcDir, compileDir, outDir, compile} = this.tiniProject.config;
-    const {configPath, buildCommand, devCommand, devHost, devPort} =
+    const {configPath, devCommand, devHost, devPort, buildCommand, sourcemap} =
       this.options;
     const indexFilePath =
       compile === false ? `${srcDir}/index.html` : `${compileDir}/index.html`;
@@ -49,12 +51,8 @@ export class ParcelBuilder implements Builder {
     const outDirArgs = ['--dist-dir', outDir];
     const hostArgs = !devHost ? [] : ['--host', devHost];
     const portArgs = ['--port', `${devPort || '3000'}`];
+    const sourcemapArgs = sourcemap !== false ? [] : ['--no-source-maps'];
     return {
-      buildCommand:
-        buildCommand ||
-        ['parcel', 'build', indexFilePath, ...configArgs, ...outDirArgs].filter(
-          Boolean
-        ),
       devCommand:
         devCommand ||
         [
@@ -65,6 +63,16 @@ export class ParcelBuilder implements Builder {
           ...hostArgs,
           ...portArgs,
         ].filter(Boolean),
+      buildCommand:
+        buildCommand ||
+        [
+          'parcel',
+          'build',
+          indexFilePath,
+          ...configArgs,
+          ...outDirArgs,
+          ...sourcemapArgs,
+        ].filter(Boolean),
     };
   }
 

diff --git a/packages/project/lib/types/build.ts b/packages/project/lib/types/build.ts
@@ -4,11 +4,13 @
6CE4
@ import type {TiniProject} from '../classes/project.js';
 
 export interface CommonBuildOptions {
   configPath?: string;
-  buildCommand?: string | string[];
+  // dev
   devCommand?: string | string[];
   devPort?: number;
   devHost?: string;
   onDevServerStart?: () => void;
+  // build
+  buildCommand?: string | string[];
 }
 
 export interface Builder {