amxxpack 1.4.0 → 1.4.1

package/lib/builder/builder.js

@@ -405,6 +405,9 @@ var AmxxBuilder = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (!this.projectConfig.output.assets) {
+                            return [2 /*return*/];
+                        }
                         srcFile = path_1.default.relative(assetInput.dir, filePath);
                         if (assetInput.filter && !this.execPathFilter(srcFile, assetInput.filter)) {
                             return [2 /*return*/];
@@ -466,6 +469,9 @@ var AmxxBuilder = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        if (!this.projectConfig.output.plugins) {
+                            return [2 /*return*/];
+                        }
                         srcPath = path_1.default.join(srcDir, srcFile);
                         _a = path_1.default.parse(srcFile), scriptName = _a.name, srcNestedDir = _a.dir;
                         destDir = path_1.default.join(this.projectConfig.output.plugins, this.projectConfig.rules.flatCompilation ? '.' : srcNestedDir);

package/lib/project-config/resolve.js

@@ -17,13 +17,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var lodash_1 = require("lodash");
 var path_1 = __importDefault(require("path"));
 var defaults_1 = __importDefault(require("./defaults"));
-var mergeConfigFn = function (val1, val2) { return ((0, lodash_1.isNil)(val2) ? val1 : undefined); };
 function resolve(overrides, projectDir) {
     if (overrides === void 0) { overrides = {}; }
     if (projectDir === void 0) { projectDir = ''; }
-    var resolvePath = function (p) { return (!(0, lodash_1.isNil)(p) ? path_1.default.resolve(projectDir || '', p) : null); };
-    var config = (0, lodash_1.mergeWith)({}, defaults_1.default, overrides, mergeConfigFn);
-    var outputBaseDir = resolvePath(config.output.base);
+    var config = (0, lodash_1.merge)({}, defaults_1.default, overrides);
+    var resolvePath = function (p) { return path_1.default.resolve(projectDir, p); };
+    var resolveOutputPath = function (p) { return ((0, lodash_1.isNull)(p) ? null : path_1.default.resolve(projectDir, config.output.base || '', p)); };
     // resolve paths
     var resolvedConfig = (0, lodash_1.merge)(config, {
         input: {
@@ -33,10 +32,10 @@ function resolve(overrides, projectDir) {
                 ? __assign(__assign({}, input), { dir: resolvePath(input.dir) }) : { dir: resolvePath(input) }); })
         },
         output: {
-            scripts: path_1.default.resolve(outputBaseDir, config.output.scripts),
-            plugins: path_1.default.resolve(outputBaseDir, config.output.plugins),
-            include: path_1.default.resolve(outputBaseDir, config.output.include),
-            assets: path_1.default.resolve(outputBaseDir, config.output.assets)
+            scripts: resolveOutputPath(config.output.scripts),
+            plugins: resolveOutputPath(config.output.plugins),
+            include: resolveOutputPath(config.output.include),
+            assets: resolveOutputPath(config.output.assets)
         },
         include: (0, lodash_1.map)(config.include, resolvePath),
         compiler: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "amxxpack",
   "description": "AMXXPack",
   "author": "Hedgehog Fog",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "license": "MIT",
   "main": "lib/builder/index.js",
   "types": "lib/builder/index.d.ts",