@tinacms/scripts 1.2.0 → 1.2.2

package/dist/index.js

@@ -57,6 +57,21 @@ var import_chokidar = __toESM(require("chokidar"));
 var import_node_child_process = require("child_process");
 var import_chalk = __toESM(require("chalk"));
 var commander = __toESM(require("commander"));
+var deepMerge = (target, source) => {
+  for (const key in source) {
+    if (!source.hasOwnProperty(key) || key === "__proto__" || key === "constructor") continue;
+    if (source[key] instanceof Object && !Array.isArray(source[key]) && target.hasOwnProperty(key)) {
+      target[key] = deepMerge(target[key], source[key]);
+    } else if (Array.isArray(source[key]) && Array.isArray(target[key])) {
+      target[key] = [.../* @__PURE__ */ new Set([...target[key], ...source[key]])];
+    } else if (Array.isArray(source[key])) {
+      target[key] = [...source[key]];
+    } else {
+      target[key] = source[key];
+    }
+  }
+  return target;
+};
 var program = new commander.Command("Tina Build");
 var registerCommands = (commands, noHelp = false) => {
   commands.forEach((command, i) => {
@@ -312,6 +327,12 @@ var buildIt = async (entryPoint, packageJSON) => {
       sourcemap: false,
       // true | 'inline' (note: inline will go straight into your bundle size)
       rollupOptions: {
+        onwarn(warning, warn) {
+          if (warning.code === "MODULE_LEVEL_DIRECTIVE") {
+            return;
+          }
+          warn(warning);
+        },
         // /**
         //  * FIXME: rollup-plugin-node-polyfills is only needed for node targets
         //  */
@@ -337,7 +358,7 @@ var buildIt = async (entryPoint, packageJSON) => {
       }
     }
   };
-  const buildConfig = packageJSON.buildConfig ? __spreadValues(__spreadValues({}, defaultBuildConfig), packageJSON.buildConfig) : defaultBuildConfig;
+  const buildConfig = packageJSON.buildConfig ? deepMerge(defaultBuildConfig, packageJSON.buildConfig) : defaultBuildConfig;
   await (0, import_vite.build)(__spreadValues({}, buildConfig));
   await import_fs_extra.default.outputFileSync(
     import_node_path.default.join(outInfo.outdir, `${outInfo.outfile}.d.ts`),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/scripts",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
     "esbuild": "^0.15.5",
     "fs-extra": "^9.0.1",
     "tsup": "^8.1.2",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "vite": "^4.3.9"
   },
   "scripts": {