diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..a6a075aa
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,20 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "pwa-node",
+      "request": "launch",
+      "name": "Components dist",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "program": "${workspaceFolder}/scripts/build-dist.js",
+      "env": {
+        "SOURCEMAP_COMMAND": "npx @stackbit/identity-mapper sourcemap"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/scripts/build-dist.js b/scripts/build-dist.js
index f12a8bfe..c0b39cbe 100755
--- a/scripts/build-dist.js
+++ b/scripts/build-dist.js
@@ -6,14 +6,14 @@ const args = process.argv.slice(2);
 const packageJSON = require('../package.json');
 const componentsManifest = require('../src/components-manifest.json');
 
+// This script is also run as a child process from other repos such as `stackbit-theme-utils`
+
 console.log('Building components library');
 
-function runBabel() {
+function runBabel(inputDir, outputDir) {
     console.log('running babel...');
     const babelBin = path.join(__dirname, '../node_modules/.bin/babel');
     const babelConfig = path.join(__dirname, '../babel.dist.config.json');
-    const inputDir = path.join(__dirname, '../src');
-    const outputDir = path.join(__dirname, '../dist');
     const babelResult = childProcess.spawnSync(babelBin, ['--config-file', babelConfig, '--out-dir', outputDir, inputDir]);
     if (babelResult.status === 0) {
         console.log(String(babelResult.stdout));
@@ -28,28 +28,26 @@ if (args.includes('--clean')) {
     fse.rmdirSync('dist', { recursive: true });
 }
 
-runBabel();
+runBabel(path.join(__dirname, '../src'), path.join(__dirname, '../dist'));
 
 if (process.env.SOURCEMAP_COMMAND) {
     console.log('running sourcemap generation...');
     const cmdParts = process.env.SOURCEMAP_COMMAND.split(' ');
-    const tempSrcDir = path.resolve('src');
-    const sourcemapResult = childProcess.spawnSync(
-        cmdParts[0],
-        [cmdParts.slice(1).join(' ') + ` ${tempSrcDir} ${tempSrcDir} node_modules/@stackbit/components`],
-        {
-            shell: true
-        }
-    );
+    const srcDir = path.join(__dirname, '../src');
+    const distDir = path.resolve(__dirname, '../dist');
+    const tempDistDir = path.resolve(__dirname, '../temp-dist');
+    const sourcemapResult = childProcess.spawnSync(cmdParts[0], [cmdParts.slice(1).join(' ') + ` ${srcDir} ${srcDir} node_modules/@stackbit/components`], {
+        shell: true
+    });
     console.log(String(sourcemapResult.stdout));
     console.log(String(sourcemapResult.stderr));
-    runBabel('src', 'temp-dist');
+    runBabel(srcDir, tempDistDir);
     // apply using: patch -p1 -i sourcemap.patch
-    childProcess.spawnSync('diff', ['-rc', 'dist temp-dist > dist/sourcemap.patch'], {
+    childProcess.spawnSync('diff', ['-rc', `${distDir} ${tempDistDir} > ${distDir}/sourcemap.patch`], {
         shell: true
     });
-    childProcess.spawnSync('git', ['checkout', '--', 'src']);
-    fse.rmdirSync('temp-dist', { recursive: true });
+    childProcess.spawnSync('git', ['checkout', '--', srcDir]);
+    fse.rmdirSync(tempDistDir, { recursive: true });
 }
 
 console.log('copy package.json and remove peerDependencies marked as devDependencies...');
@@ -83,6 +81,7 @@ fse.writeJsonSync(path.join(__dirname, '../dist/components-map.json'), component
 console.log('generated dist/components-map.json');
 
 console.log('copying files and folders...');
+
 const folders = ['src', 'models', 'styles'];
 folders.forEach((folder) => {
     const folderPath = path.join(__dirname, '../', folder);