@nrwl/js 14.8.8 → 14.9.0-beta.1

package/src/utils/inline.js

@@ -0,0 +1,210 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRootTsConfigPath = exports.postProcessInlinedDependencies = exports.handleInliningBuild = exports.isInlineGraphEmpty = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const fs_1 = require("fs");
+function isInlineGraphEmpty(inlineGraph) {
+    return Object.keys(inlineGraph.nodes).length === 0;
+}
+exports.isInlineGraphEmpty = isInlineGraphEmpty;
+function handleInliningBuild(context, options, tsConfigPath) {
+    const tsConfigJson = (0, devkit_1.readJsonFile)(tsConfigPath);
+    const pathAliases = tsConfigJson['compilerOptions']['paths'] || readBasePathAliases(context);
+    const inlineGraph = createInlineGraph(context, options, pathAliases);
+    if (isInlineGraphEmpty(inlineGraph)) {
+        return inlineGraph;
+    }
+    buildInlineGraphExternals(context, inlineGraph, pathAliases);
+    return inlineGraph;
+}
+exports.handleInliningBuild = handleInliningBuild;
+function postProcessInlinedDependencies(outputPath, parentOutputPath, inlineGraph) {
+    if (isInlineGraphEmpty(inlineGraph)) {
+        return;
+    }
+    const parentDistPath = (0, path_1.join)(outputPath, parentOutputPath);
+    // move parentOutput
+    movePackage(parentDistPath, outputPath);
+    const inlinedDepsDestOutputRecord = {};
+    // move inlined outputs
+    for (const inlineDependenciesNames of Object.values(inlineGraph.dependencies)) {
+        for (const inlineDependenciesName of inlineDependenciesNames) {
+            const inlineDependency = inlineGraph.nodes[inlineDependenciesName];
+            const depOutputPath = inlineDependency.buildOutputPath ||
+                (0, path_1.join)(outputPath, inlineDependency.root);
+            const destDepOutputPath = (0, path_1.join)(outputPath, inlineDependency.name);
+            const isBuildable = !!inlineDependency.buildOutputPath;
+            if (isBuildable) {
+                (0, fs_extra_1.copySync)(depOutputPath, destDepOutputPath, { overwrite: true });
+            }
+            else {
+                movePackage(depOutputPath, destDepOutputPath);
+            }
+            // TODO: hard-coded "src"
+            inlinedDepsDestOutputRecord[inlineDependency.pathAlias] =
+                destDepOutputPath + '/src';
+        }
+    }
+    updateImports(outputPath, inlinedDepsDestOutputRecord);
+}
+exports.postProcessInlinedDependencies = postProcessInlinedDependencies;
+function readBasePathAliases(context) {
+    var _a;
+    return (_a = (0, devkit_1.readJsonFile)(getRootTsConfigPath(context))) === null || _a === void 0 ? void 0 : _a['compilerOptions']['paths'];
+}
+function getRootTsConfigPath(context) {
+    for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
+        const tsConfigPath = (0, path_1.join)(context.root, tsConfigName);
+        if ((0, fs_1.existsSync)(tsConfigPath)) {
+            return tsConfigPath;
+        }
+    }
+    throw new Error('Could not find a root tsconfig.json or tsconfig.base.json file.');
+}
+exports.getRootTsConfigPath = getRootTsConfigPath;
+function emptyInlineGraph() {
+    return { nodes: {}, externals: {}, dependencies: {} };
+}
+function projectNodeToInlineProjectNode(projectNode, pathAlias = '', buildOutputPath = '') {
+    return {
+        name: projectNode.name,
+        root: projectNode.data.root,
+        sourceRoot: projectNode.data.sourceRoot,
+        pathAlias,
+        buildOutputPath,
+    };
+}
+function createInlineGraph(context, options, pathAliases, projectName = context.projectName, inlineGraph = emptyInlineGraph()) {
+    var _a;
+    var _b;
+    if (options.external == null)
+        return inlineGraph;
+    const projectDependencies = context.projectGraph.dependencies[projectName] || [];
+    if (projectDependencies.length === 0)
+        return inlineGraph;
+    if (!inlineGraph.nodes[projectName]) {
+        inlineGraph.nodes[projectName] = projectNodeToInlineProjectNode(context.projectGraph.nodes[projectName]);
+    }
+    const implicitDependencies = context.projectGraph.nodes[projectName].data.implicitDependencies || [];
+    for (const projectDependency of projectDependencies) {
+        // skip npm packages
+        if (projectDependency.target.startsWith('npm')) {
+            continue;
+        }
+        // skip implicitDependencies
+        if (implicitDependencies.includes(projectDependency.target)) {
+            continue;
+        }
+        const pathAlias = getPathAliasForPackage(context.projectGraph.nodes[projectDependency.target], pathAliases);
+        const buildOutputPath = getBuildOutputPath(projectDependency.target, context, options);
+        const shouldInline = 
+        /**
+         * if all buildable libraries are marked as external,
+         * then push the project dependency that doesn't have a build target
+         */
+        (options.external === 'all' && !buildOutputPath) ||
+            /**
+             * if all buildable libraries are marked as internal,
+             * then push every project dependency to be inlined
+             */
+            options.external === 'none' ||
+            /**
+             * if some buildable libraries are marked as external,
+             * then push the project dependency that IS NOT marked as external OR doesn't have a build target
+             */
+            (Array.isArray(options.external) &&
+                options.external.length > 0 &&
+                !options.external.includes(projectDependency.target)) ||
+            !buildOutputPath;
+        if (shouldInline) {
+            (_a = (_b = inlineGraph.dependencies)[projectName]) !== null && _a !== void 0 ? _a : (_b[projectName] = []);
+            inlineGraph.dependencies[projectName].push(projectDependency.target);
+        }
+        inlineGraph.nodes[projectDependency.target] =
+            projectNodeToInlineProjectNode(context.projectGraph.nodes[projectDependency.target], pathAlias, buildOutputPath);
+        if (context.projectGraph.dependencies[projectDependency.target].length > 0) {
+            inlineGraph = createInlineGraph(context, options, pathAliases, projectDependency.target, inlineGraph);
+        }
+    }
+    return inlineGraph;
+}
+function buildInlineGraphExternals(context, inlineProjectGraph, pathAliases) {
+    const allNodes = Object.assign({}, context.projectGraph.nodes);
+    for (const [parent, dependencies] of Object.entries(inlineProjectGraph.dependencies)) {
+        if (allNodes[parent]) {
+            delete allNodes[parent];
+        }
+        for (const dependencyName of dependencies) {
+            const dependencyNode = inlineProjectGraph.nodes[dependencyName];
+            // buildable is still external even if it is a dependency
+            if (dependencyNode.buildOutputPath) {
+                continue;
+            }
+            if (allNodes[dependencyName]) {
+                delete allNodes[dependencyName];
+            }
+        }
+    }
+    for (const [projectName, projectNode] of Object.entries(allNodes)) {
+        if (!inlineProjectGraph.externals[projectName]) {
+            inlineProjectGraph.externals[projectName] =
+                projectNodeToInlineProjectNode(projectNode, getPathAliasForPackage(projectNode, pathAliases));
+        }
+    }
+}
+function movePackage(from, to) {
+    if (from === to)
+        return;
+    (0, fs_extra_1.copySync)(from, to, { overwrite: true });
+    (0, fs_extra_1.removeSync)(from);
+}
+function updateImports(destOutputPath, inlinedDepsDestOutputRecord) {
+    const importRegex = new RegExp(Object.keys(inlinedDepsDestOutputRecord)
+        .map((pathAlias) => `["'](${pathAlias})["']`)
+        .join('|'), 'g');
+    recursiveUpdateImport(destOutputPath, importRegex, inlinedDepsDestOutputRecord);
+}
+function recursiveUpdateImport(dirPath, importRegex, inlinedDepsDestOutputRecord, rootParentDir) {
+    const files = (0, fs_extra_1.readdirSync)(dirPath, { withFileTypes: true });
+    for (const file of files) {
+        // only check .js and .d.ts files
+        if (file.isFile() &&
+            (file.name.endsWith('.js') || file.name.endsWith('.d.ts'))) {
+            const filePath = (0, path_1.join)(dirPath, file.name);
+            const fileContent = (0, fs_extra_1.readFileSync)(filePath, 'utf-8');
+            const updatedContent = fileContent.replace(importRegex, (matched) => {
+                const result = matched.replace(/['"]/g, '');
+                // If a match is the same as the rootParentDir, we're checking its own files so we return the matched as in no changes.
+                if (result === rootParentDir)
+                    return matched;
+                const importPath = `"${(0, path_1.relative)(dirPath, inlinedDepsDestOutputRecord[result])}"`;
+                return (0, devkit_1.normalizePath)(importPath);
+            });
+            (0, fs_extra_1.writeFileSync)(filePath, updatedContent);
+        }
+        else if (file.isDirectory()) {
+            recursiveUpdateImport((0, path_1.join)(dirPath, file.name), importRegex, inlinedDepsDestOutputRecord, rootParentDir || file.name);
+        }
+    }
+}
+function getPathAliasForPackage(packageNode, pathAliases) {
+    if (!packageNode)
+        return '';
+    for (const [alias, paths] of Object.entries(pathAliases)) {
+        if (paths.some((path) => path.includes(packageNode.data.root))) {
+            return alias;
+        }
+    }
+    return '';
+}
+function getBuildOutputPath(projectName, context, options) {
+    var _a, _b;
+    const projectTargets = (_b = (_a = context.projectGraph.nodes[projectName]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.targets;
+    if (!projectTargets)
+        return '';
+    const buildTarget = options.externalBuildTargets.find((buildTarget) => projectTargets[buildTarget]);
+    return buildTarget ? projectTargets[buildTarget].options['outputPath'] : '';
+}
+//# sourceMappingURL=inline.js.map

package/src/utils/inline.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/inline.ts"],"names":[],"mappings":";;;AACA,yCAA2D;AAC3D,uCAMkB;AAClB,+BAAsC;AAEtC,2BAAgC;AAgBhC,SAAgB,kBAAkB,CAAC,WAA+B;IAChE,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACrD,CAAC;AAFD,gDAEC;AAED,SAAgB,mBAAmB,CACjC,OAAwB,EACxB,OAAkC,EAClC,YAAoB;IAEpB,MAAM,YAAY,GAAG,IAAA,qBAAY,EAAC,YAAY,CAAC,CAAC;IAChD,MAAM,WAAW,GACf,YAAY,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC3E,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAErE,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE;QACnC,OAAO,WAAW,CAAC;KACpB;IAED,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAE7D,OAAO,WAAW,CAAC;AACrB,CAAC;AAjBD,kDAiBC;AAED,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,gBAAwB,EACxB,WAA+B;IAE/B,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE;QACnC,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE1D,oBAAoB;IACpB,WAAW,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAExC,MAAM,2BAA2B,GAA2B,EAAE,CAAC;IAC/D,uBAAuB;IAEvB,KAAK,MAAM,uBAAuB,IAAI,MAAM,CAAC,MAAM,CACjD,WAAW,CAAC,YAAY,CACzB,EAAE;QACD,KAAK,MAAM,sBAAsB,IAAI,uBAAuB,EAAE;YAC5D,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACnE,MAAM,aAAa,GACjB,gBAAgB,CAAC,eAAe;gBAChC,IAAA,WAAI,EAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAClE,MAAM,WAAW,GAAG,CAAC,CAAC,gBAAgB,CAAC,eAAe,CAAC;YAEvD,IAAI,WAAW,EAAE;gBACf,IAAA,mBAAQ,EAAC,aAAa,EAAE,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;aACjE;iBAAM;gBACL,WAAW,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;aAC/C;YAED,yBAAyB;YACzB,2BAA2B,CAAC,gBAAgB,CAAC,SAAS,CAAC;gBACrD,iBAAiB,GAAG,MAAM,CAAC;SAC9B;KACF;IAED,aAAa,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;AACzD,CAAC;AAzCD,wEAyCC;AAED,SAAS,mBAAmB,CAAC,OAAwB;;IACnD,OAAO,MAAA,IAAA,qBAAY,EAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,0CAAG,iBAAiB,EACnE,OAAO,CACR,CAAC;AACJ,CAAC;AAED,SAAgB,mBAAmB,CAAC,OAAwB;IAC1D,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACtD,IAAI,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;YAC5B,OAAO,YAAY,CAAC;SACrB;KACF;IAED,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;AACJ,CAAC;AAXD,kDAWC;AAED,SAAS,gBAAgB;IACvB,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,8BAA8B,CACrC,WAAoC,EACpC,SAAS,GAAG,EAAE,EACd,eAAe,GAAG,EAAE;IAEpB,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI;QAC3B,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,UAAU;QACvC,SAAS;QACT,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,OAAwB,EACxB,OAAkC,EAClC,WAAqC,EACrC,cAAsB,OAAO,CAAC,WAAW,EACzC,cAAkC,gBAAgB,EAAE;;;IAEpD,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI;QAAE,OAAO,WAAW,CAAC;IAEjD,MAAM,mBAAmB,GACvB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IACvD,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAEzD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;QACnC,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,8BAA8B,CAC7D,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CACxC,CAAC;KACH;IAED,MAAM,oBAAoB,GACxB,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC;IAE1E,KAAK,MAAM,iBAAiB,IAAI,mBAAmB,EAAE;QACnD,oBAAoB;QACpB,IAAI,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9C,SAAS;SACV;QAED,4BAA4B;QAC5B,IAAI,oBAAoB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE;YAC3D,SAAS;SACV;QAED,MAAM,SAAS,GAAG,sBAAsB,CACtC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,EACpD,WAAW,CACZ,CAAC;QAEF,MAAM,eAAe,GAAG,kBAAkB,CACxC,iBAAiB,CAAC,MAAM,EACxB,OAAO,EACP,OAAO,CACR,CAAC;QAEF,MAAM,YAAY;QAChB;;;WAGG;QACH,CAAC,OAAO,CAAC,QAAQ,KAAK,KAAK,IAAI,CAAC,eAAe,CAAC;YAChD;;;eAGG;YACH,OAAO,CAAC,QAAQ,KAAK,MAAM;YAC3B;;;eAGG;YACH,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;gBAC3B,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACvD,CAAC,eAAe,CAAC;QAEnB,IAAI,YAAY,EAAE;YAChB,YAAA,WAAW,CAAC,YAAY,EAAC,WAAW,wCAAX,WAAW,IAAM,EAAE,EAAC;YAC7C,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;SACtE;QAED,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACzC,8BAA8B,CAC5B,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,EACpD,SAAS,EACT,eAAe,CAChB,CAAC;QAEJ,IACE,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EACtE;YACA,WAAW,GAAG,iBAAiB,CAC7B,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,CAAC,MAAM,EACxB,WAAW,CACZ,CAAC;SACH;KACF;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAwB,EACxB,kBAAsC,EACtC,WAAqC;IAErC,MAAM,QAAQ,qBAAQ,OAAO,CAAC,YAAY,CAAC,KAAK,CAAE,CAAC;IAEnD,KAAK,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CACjD,kBAAkB,CAAC,YAAY,CAChC,EAAE;QACD,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE;YACpB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;SACzB;QAED,KAAK,MAAM,cAAc,IAAI,YAAY,EAAE;YACzC,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAEhE,yDAAyD;YACzD,IAAI,cAAc,CAAC,eAAe,EAAE;gBAClC,SAAS;aACV;YAED,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAC5B,OAAO,QAAQ,CAAC,cAAc,CAAC,CAAC;aACjC;SACF;KACF;IAED,KAAK,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACjE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE;YAC9C,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC;gBACvC,8BAA8B,CAC5B,WAAW,EACX,sBAAsB,CAAC,WAAW,EAAE,WAAW,CAAC,CACjD,CAAC;SACL;KACF;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAY,EAAE,EAAU;IAC3C,IAAI,IAAI,KAAK,EAAE;QAAE,OAAO;IACxB,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,aAAa,CACpB,cAAsB,EACtB,2BAAmD;IAEnD,MAAM,WAAW,GAAG,IAAI,MAAM,CAC5B,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC;SACrC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,SAAS,OAAO,CAAC;SAC5C,IAAI,CAAC,GAAG,CAAC,EACZ,GAAG,CACJ,CAAC;IACF,qBAAqB,CACnB,cAAc,EACd,WAAW,EACX,2BAA2B,CAC5B,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAe,EACf,WAAmB,EACnB,2BAAmD,EACnD,aAAsB;IAEtB,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,iCAAiC;QACjC,IACE,IAAI,CAAC,MAAM,EAAE;YACb,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1D;YACA,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,IAAA,uBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACpD,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE;gBAClE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC5C,uHAAuH;gBACvH,IAAI,MAAM,KAAK,aAAa;oBAAE,OAAO,OAAO,CAAC;gBAC7C,MAAM,UAAU,GAAG,IAAI,IAAA,eAAQ,EAC7B,OAAO,EACP,2BAA2B,CAAC,MAAM,CAAC,CACpC,GAAG,CAAC;gBACL,OAAO,IAAA,sBAAa,EAAC,UAAU,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YACH,IAAA,wBAAa,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;SACzC;aAAM,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;YAC7B,qBAAqB,CACnB,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EACxB,WAAW,EACX,2BAA2B,EAC3B,aAAa,IAAI,IAAI,CAAC,IAAI,CAC3B,CAAC;SACH;KACF;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,WAAoC,EACpC,WAAqC;IAErC,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACxD,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;YAC9D,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CACzB,WAAmB,EACnB,OAAwB,EACxB,OAAkC;;IAElC,MAAM,cAAc,GAAG,MAAA,MAAA,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,0CAAE,IAAI,0CAAE,OAAO,CAAC;IAC9E,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CACnD,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAC7C,CAAC;IAEF,OAAO,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9E,CAAC"}

package/src/utils/package-json/index.d.ts

@@ -1,9 +1,10 @@
 import { ExecutorContext } from '@nrwl/devkit';
-import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '../buildable-libs-utils';
 import type { UpdatePackageJsonOption } from './update-package-json';
 export interface CopyPackageJsonOptions extends Omit<UpdatePackageJsonOption, 'projectRoot'> {
     watch?: boolean;
     extraDependencies?: DependentBuildableProjectNode[];
+    overrideDependencies?: DependentBuildableProjectNode[];
 }
 export interface CopyPackageJsonResult {
     success?: boolean;

package/src/utils/package-json/index.js

@@ -2,23 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyPackageJson = void 0;
 const tslib_1 = require("tslib");
-const path_1 = require("path");
 const watch_for_single_file_changes_1 = require("../watch-for-single-file-changes");
 const update_package_json_1 = require("./update-package-json");
 const check_dependencies_1 = require("../check-dependencies");
 function copyPackageJson(_options, context) {
-    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (!context.target.options.tsConfig) {
             throw new Error(`Could not find tsConfig option for "${context.targetName}" target of "${context.projectName}" project. Check that your project configuration is correct.`);
         }
-        const { target, dependencies, projectRoot } = (0, check_dependencies_1.checkDependencies)(context, context.target.options.tsConfig);
+        let { target, dependencies, projectRoot } = (0, check_dependencies_1.checkDependencies)(context, context.target.options.tsConfig);
         const options = Object.assign(Object.assign({}, _options), { projectRoot });
-        if ((_a = options.extraDependencies) === null || _a === void 0 ? void 0 : _a.length) {
+        if (options.extraDependencies) {
             dependencies.push(...options.extraDependencies);
         }
+        if (options.overrideDependencies) {
+            dependencies = options.overrideDependencies;
+        }
         if (options.watch) {
-            const dispose = yield (0, watch_for_single_file_changes_1.watchForSingleFileChanges)((0, path_1.join)(context.root, projectRoot), 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies));
+            const dispose = yield (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies));
             // Copy it once before changes
             (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
             return { success: true, stop: dispose };

package/src/utils/package-json/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/index.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAI5B,oFAA6E;AAE7E,+DAA0D;AAC1D,8DAA0D;AAc1D,SAAsB,eAAe,CACnC,QAAgC,EAChC,OAAwB;;;QAExB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,UAAU,gBAAgB,OAAO,CAAC,WAAW,8DAA8D,CAC3J,CAAC;SACH;QACD,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAA,sCAAiB,EAC7D,OAAO,EACP,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAChC,CAAC;QACF,MAAM,OAAO,mCAAQ,QAAQ,KAAE,WAAW,GAAE,CAAC;QAC7C,IAAI,MAAA,OAAO,CAAC,iBAAiB,0CAAE,MAAM,EAAE;YACrC,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;SACjD;QACD,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,MAAM,OAAO,GAAG,MAAM,IAAA,yDAAyB,EAC7C,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC/B,cAAc,EACd,GAAG,EAAE,CAAC,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAChE,CAAC;YACF,8BAA8B;YAC9B,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SACzC;aAAM;YACL,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;;CACF;AA9BD,0CA8BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/index.ts"],"names":[],"mappings":";;;;AAGA,oFAA6E;AAE7E,+DAA0D;AAC1D,8DAA0D;AAe1D,SAAsB,eAAe,CACnC,QAAgC,EAChC,OAAwB;;QAExB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,UAAU,gBAAgB,OAAO,CAAC,WAAW,8DAA8D,CAC3J,CAAC;SACH;QACD,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAA,sCAAiB,EAC3D,OAAO,EACP,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAChC,CAAC;QACF,MAAM,OAAO,mCAAQ,QAAQ,KAAE,WAAW,GAAE,CAAC;QAE7C,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;SACjD;QACD,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;SAC7C;QAED,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,MAAM,OAAO,GAAG,MAAM,IAAA,yDAAyB,EAC7C,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,WAAW,EACnB,cAAc,EACd,GAAG,EAAE,CAAC,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAChE,CAAC;YACF,8BAA8B;YAC9B,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SACzC;aAAM;YACL,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;IACH,CAAC;CAAA;AApCD,0CAoCC"}

package/src/utils/package-json/update-package-json.d.ts

@@ -1,7 +1,7 @@
 import { ExecutorContext, ProjectGraphProjectNode } from '@nrwl/devkit';
-import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '../buildable-libs-utils';
 import type { PackageJson } from 'nx/src/utils/package-json';
-export declare type SupportedFormat = 'cjs' | 'esm';
+export type SupportedFormat = 'cjs' | 'esm';
 export interface UpdatePackageJsonOption {
     projectRoot: string;
     main: string;
@@ -11,8 +11,10 @@ export interface UpdatePackageJsonOption {
     outputFileExtensionForCjs?: `.${string}`;
     skipTypings?: boolean;
     generateExportsField?: boolean;
+    excludeLibsInPackageJson?: boolean;
     updateBuildableProjectDepsInPackageJson?: boolean;
     buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
+    generateLockfile?: boolean;
 }
 export declare function updatePackageJson(options: UpdatePackageJsonOption, context: ExecutorContext, target: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[]): void;
 export declare function getUpdatedPackageJsonContent(packageJson: PackageJson, options: UpdatePackageJsonOption): PackageJson;

package/src/utils/package-json/update-package-json.js

@@ -1,36 +1,102 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUpdatedPackageJsonContent = exports.updatePackageJson = void 0;
+const lock_file_1 = require("nx/src/lock-file/lock-file");
+const create_package_json_1 = require("nx/src/utils/create-package-json");
 const devkit_1 = require("@nrwl/devkit");
-const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
 const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+const operators_1 = require("nx/src/project-graph/operators");
 const fileutils_1 = require("nx/src/utils/fileutils");
+const fs_1 = require("fs");
 function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
     const mainFileDir = (0, path_1.dirname)(main);
     const relativeDir = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
     return relativeDir === '' ? `./` : `./${relativeDir}/`;
 }
 function updatePackageJson(options, context, target, dependencies) {
-    const pathToPackageJson = (0, path_1.join)(context.root, options.projectRoot, 'package.json');
-    const packageJson = (0, fileutils_1.fileExists)(pathToPackageJson)
-        ? (0, devkit_1.readJsonFile)(pathToPackageJson)
-        : { name: context.projectName };
-    (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, getUpdatedPackageJsonContent(packageJson, options));
-    if (dependencies.length > 0 &&
-        options.updateBuildableProjectDepsInPackageJson) {
-        (0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
+    let packageJson;
+    if (options.updateBuildableProjectDepsInPackageJson) {
+        packageJson = (0, create_package_json_1.createPackageJson)(context.projectName, context.projectGraph, {
+            target: context.targetName,
+            root: context.root,
+            // By default we remove devDependencies since this is a production build.
+            isProduction: true,
+        });
+        if (options.excludeLibsInPackageJson) {
+            dependencies = dependencies.filter((dep) => dep.node.type !== 'lib');
+        }
+        addMissingDependencies(packageJson, context, dependencies, options.buildableProjectDepsInPackageJsonType);
+    }
+    else {
+        const pathToPackageJson = (0, path_1.join)(context.root, options.projectRoot, 'package.json');
+        packageJson = (0, fileutils_1.fileExists)(pathToPackageJson)
+            ? (0, devkit_1.readJsonFile)(pathToPackageJson)
+            : { name: context.projectName, version: '0.0.1' };
+    }
+    // update package specific settings
+    packageJson = getUpdatedPackageJsonContent(packageJson, options);
+    // save files
+    (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
+    if (options.generateLockfile) {
+        const lockFile = (0, lock_file_1.createLockFile)(packageJson);
+        (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, lock_file_1.getLockFileName)()}`, lockFile, {
+            encoding: 'utf-8',
+        });
     }
 }
 exports.updatePackageJson = updatePackageJson;
+function addMissingDependencies(packageJson, { projectName, targetName, configurationName, root }, dependencies, propType = 'dependencies') {
+    const workspacePackageJson = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json'));
+    dependencies.forEach((entry) => {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if ((0, operators_1.isNpmProject)(entry.node)) {
+            const { packageName, version } = entry.node.data;
+            if (((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[packageName]) ||
+                ((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[packageName]) ||
+                ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c[packageName])) {
+                return;
+            }
+            if ((_d = workspacePackageJson.devDependencies) === null || _d === void 0 ? void 0 : _d[packageName]) {
+                return;
+            }
+            (_e = packageJson[propType]) !== null && _e !== void 0 ? _e : (packageJson[propType] = {});
+            packageJson[propType][packageName] = version;
+        }
+        else {
+            const packageName = entry.name;
+            if (!((_f = packageJson.dependencies) === null || _f === void 0 ? void 0 : _f[packageName]) &&
+                !((_g = packageJson.peerDependencies) === null || _g === void 0 ? void 0 : _g[packageName])) {
+                const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
+                    overrides: {},
+                    target: {
+                        project: projectName,
+                        target: targetName,
+                        configuration: configurationName,
+                    },
+                }, entry.node);
+                const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
+                if ((0, fs_1.existsSync)(depPackageJsonPath)) {
+                    const version = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
+                    (_h = packageJson[propType]) !== null && _h !== void 0 ? _h : (packageJson[propType] = {});
+                    packageJson[propType][packageName] = version;
+                }
+            }
+        }
+    });
+}
 function getUpdatedPackageJsonContent(packageJson, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _o, _p;
     // Default is CJS unless esm is explicitly passed.
     const hasCjsFormat = !options.format || ((_a = options.format) === null || _a === void 0 ? void 0 : _a.includes('cjs'));
     const hasEsmFormat = (_b = options.format) === null || _b === void 0 ? void 0 : _b.includes('esm');
     const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
     const relativeMainFileDir = getMainFileDirRelativeToProjectRoot(options.main, options.projectRoot);
     const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
-    const exports = Object.assign({ '.': {} }, packageJson.exports);
+    const exports = typeof packageJson.exports === 'string'
+        ? packageJson.exports
+        : Object.assign({ '.': {} }, packageJson.exports);
     const mainJsFile = (_c = options.outputFileName) !== null && _c !== void 0 ? _c : `${relativeMainFileDir}${mainFile}.js`;
     if (hasEsmFormat) {
         // Unofficial field for backwards compat.
@@ -39,22 +105,36 @@ function getUpdatedPackageJsonContent(packageJson, options) {
             packageJson.type = 'module';
             (_e = packageJson.main) !== null && _e !== void 0 ? _e : (packageJson.main = mainJsFile);
         }
-        exports['.']['import'] = mainJsFile;
+        if (typeof exports !== 'string') {
+            if (typeof exports['.'] !== 'string') {
+                (_f = (_o = exports['.'])['import']) !== null && _f !== void 0 ? _f : (_o['import'] = mainJsFile);
+            }
+            else if (!hasCjsFormat) {
+                (_g = exports['.']) !== null && _g !== void 0 ? _g : (exports['.'] = mainJsFile);
+            }
+        }
     }
     // CJS output may have .cjs or .js file extensions.
     // Bundlers like rollup and esbuild supports .cjs for CJS and .js for ESM.
     // Bundlers/Compilers like webpack, tsc, swc do not have different file extensions.
     if (hasCjsFormat) {
         const { dir, name } = (0, path_1.parse)(mainJsFile);
-        const cjsMain = `${dir}/${name}${(_f = options.outputFileExtensionForCjs) !== null && _f !== void 0 ? _f : '.js'}`;
-        (_g = packageJson.main) !== null && _g !== void 0 ? _g : (packageJson.main = cjsMain);
-        exports['.']['require'] = cjsMain;
+        const cjsMain = `${dir ? dir : '.'}/${name}${(_h = options.outputFileExtensionForCjs) !== null && _h !== void 0 ? _h : '.js'}`;
+        (_j = packageJson.main) !== null && _j !== void 0 ? _j : (packageJson.main = cjsMain);
+        if (typeof exports !== 'string') {
+            if (typeof exports['.'] !== 'string') {
+                (_k = (_p = exports['.'])['require']) !== null && _k !== void 0 ? _k : (_p['require'] = cjsMain);
+            }
+            else if (!hasEsmFormat) {
+                (_l = exports['.']) !== null && _l !== void 0 ? _l : (exports['.'] = cjsMain);
+            }
+        }
     }
     if (options.generateExportsField) {
         packageJson.exports = exports;
     }
     if (!options.skipTypings) {
-        packageJson.types = (_h = packageJson.types) !== null && _h !== void 0 ? _h : typingsFile;
+        packageJson.types = (_m = packageJson.types) !== null && _m !== void 0 ? _m : typingsFile;
     }
     return packageJson;
 }

package/src/utils/package-json/update-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":"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"}

package/src/utils/prettier.d.ts

@@ -0,0 +1,6 @@
+import type { Options } from 'prettier';
+export interface ExistingPrettierConfig {
+    sourceFilepath: string;
+    config: Options;
+}
+export declare function resolveUserExistingPrettierConfig(): Promise<ExistingPrettierConfig | null>;

package/src/utils/prettier.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveUserExistingPrettierConfig = void 0;
+const tslib_1 = require("tslib");
+let prettier;
+try {
+    prettier = require('prettier');
+}
+catch (_a) { }
+function resolveUserExistingPrettierConfig() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (!prettier) {
+            return null;
+        }
+        try {
+            const filepath = yield prettier.resolveConfigFile();
+            if (!filepath) {
+                return null;
+            }
+            const config = yield prettier.resolveConfig(process.cwd(), {
+                useCache: false,
+                config: filepath,
+            });
+            if (!config) {
+                return null;
+            }
+            return {
+                sourceFilepath: filepath,
+                config: config,
+            };
+        }
+        catch (_a) {
+            return null;
+        }
+    });
+}
+exports.resolveUserExistingPrettierConfig = resolveUserExistingPrettierConfig;
+//# sourceMappingURL=prettier.js.map

package/src/utils/prettier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prettier.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/prettier.ts"],"names":[],"mappings":";;;;AAEA,IAAI,QAAmC,CAAC;AACxC,IAAI;IACF,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAChC;AAAC,WAAM,GAAE;AAOV,SAAsB,iCAAiC;;QACrD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QACD,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YACpD,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,IAAI,CAAC;aACb;YAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE;gBACzD,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,QAAQ;aACjB,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,IAAI,CAAC;aACb;YAED,OAAO;gBACL,cAAc,EAAE,QAAQ;gBACxB,MAAM,EAAE,MAAM;aACf,CAAC;SACH;QAAC,WAAM;YACN,OAAO,IAAI,CAAC;SACb;IACH,CAAC;CAAA;AAzBD,8EAyBC"}

package/src/utils/schema.d.ts

@@ -1,5 +1,5 @@
 // nx-ignore-next-line
-const { Linter } = require('@nrwl/linter');
+const { Linter } = require('@nrwl/linter'); // use require to import to avoid circular dependency
 import type {
   AssetGlob,
   FileInputOutput,
@@ -7,7 +7,7 @@ import type {
 import { TransformerEntry } from './typescript/types';
 
 export type Compiler = 'tsc' | 'swc';
-export type Bundler = 'none' | 'rollup' | 'esbuild' | 'webpack';
+export type Bundler = 'swc' | 'tsc' | 'rollup' | 'vite' | 'esbuild' | 'none';
 
 export interface LibraryGeneratorSchema {
   name: string;
@@ -17,7 +17,7 @@ export interface LibraryGeneratorSchema {
   simpleModuleName?: boolean;
   skipTsConfig?: boolean;
   includeBabelRc?: boolean;
-  unitTestRunner?: 'jest' | 'none';
+  unitTestRunner?: 'jest' | 'vitest' | 'none';
   linter?: Linter;
   testEnvironment?: 'jsdom' | 'node';
   importPath?: string;
@@ -31,6 +31,7 @@ export interface LibraryGeneratorSchema {
   compiler?: Compiler;
   bundler?: Bundler;
   skipTypeCheck?: boolean;
+  minimal?: boolean;
 }
 
 export interface ExecutorOptions {
@@ -45,6 +46,9 @@ export interface ExecutorOptions {
   transformers: TransformerEntry[];
   updateBuildableProjectDepsInPackageJson?: boolean;
   buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
+  external?: 'all' | 'none' | string[];
+  externalBuildTargets?: string[];
+  generateLockfile?: boolean;
 }
 
 export interface NormalizedExecutorOptions extends ExecutorOptions {
@@ -72,6 +76,7 @@ export interface SwcCliOptions {
 
 export interface NormalizedSwcExecutorOptions
   extends NormalizedExecutorOptions {
+  originalProjectRoot: string;
   swcExclude: string[];
   skipTypeCheck: boolean;
   swcCliOptions: SwcCliOptions;

package/src/utils/swc/add-swc-config.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nrwl/devkit';
 export declare const defaultExclude: string[];
-export declare function addSwcConfig(tree: Tree, projectDir: string): void;
+export declare function addSwcConfig(tree: Tree, projectDir: string, type?: 'commonjs' | 'es6'): void;

package/src/utils/swc/add-swc-config.js

@@ -4,13 +4,13 @@ exports.addSwcConfig = exports.defaultExclude = void 0;
 const path_1 = require("path");
 exports.defaultExclude = [
     'jest.config.ts',
-    '.*.spec.tsx?$',
-    '.*.test.tsx?$',
+    '.*\\.spec.tsx?$',
+    '.*\\.test.tsx?$',
     './src/jest-setup.ts$',
     './**/jest-setup.ts$',
     '.*.js$',
 ];
-const swcOptionsString = () => `{
+const swcOptionsString = (type = 'commonjs') => `{
   "jsc": {
     "target": "es2017",
     "parser": {
@@ -27,18 +27,18 @@ const swcOptionsString = () => `{
     "loose": true
   },
   "module": {
-    "type": "commonjs",
+    "type": "${type}",
     "strict": true,
     "noInterop": true
   },
   "sourceMaps": true,
   "exclude": ${JSON.stringify(exports.defaultExclude)}
 }`;
-function addSwcConfig(tree, projectDir) {
-    const swcrcPath = (0, path_1.join)(projectDir, '.lib.swcrc');
+function addSwcConfig(tree, projectDir, type = 'commonjs') {
+    const swcrcPath = (0, path_1.join)(projectDir, '.swcrc');
     if (tree.exists(swcrcPath))
         return;
-    tree.write(swcrcPath, swcOptionsString());
+    tree.write(swcrcPath, swcOptionsString(type));
 }
 exports.addSwcConfig = addSwcConfig;
 //# sourceMappingURL=add-swc-config.js.map

package/src/utils/swc/add-swc-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-swc-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-swc-config.ts"],"names":[],"mappings":";;;AAGA,+BAA4B;AAEf,QAAA,cAAc,GAAG;IAC5B,gBAAgB;IAChB,eAAe;IACf,eAAe;IACf,sBAAsB;IACtB,qBAAqB;IACrB,QAAQ;CACT,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;eAsBhB,IAAI,CAAC,SAAS,CAAC,sBAAc,CAAC;EAC3C,CAAC;AAEH,SAAgB,YAAY,CAAC,IAAU,EAAE,UAAkB;IACzD,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACjD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAAE,OAAO;IACnC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAC5C,CAAC;AAJD,oCAIC"}
+{"version":3,"file":"add-swc-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-swc-config.ts"],"names":[],"mappings":";;;AAGA,+BAA4B;AAEf,QAAA,cAAc,GAAG;IAC5B,gBAAgB;IAChB,iBAAiB;IACjB,iBAAiB;IACjB,sBAAsB;IACtB,qBAAqB;IACrB,QAAQ;CACT,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,OAA2B,UAAU,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;eAiBrD,IAAI;;;;;eAKJ,IAAI,CAAC,SAAS,CAAC,sBAAc,CAAC;EAC3C,CAAC;AAEH,SAAgB,YAAY,CAC1B,IAAU,EACV,UAAkB,EAClB,OAA2B,UAAU;IAErC,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAAE,OAAO;IACnC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAChD,CAAC;AARD,oCAQC"}