From 49f3a455d52e93ea683cbc614ab620abfedb78c7 Mon Sep 17 00:00:00 2001 From: adrians5j Date: Fri, 18 Oct 2024 14:19:27 +0200 Subject: [PATCH] wip --- .../src/extensions/PbElementExtension.ts | 38 ++----------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts b/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts index 8079a4e66f..40e9e4e517 100644 --- a/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts +++ b/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts @@ -5,8 +5,6 @@ import chalk from "chalk"; import { JsxFragment, Node, Project } from "ts-morph"; import { formatCode } from "@webiny/cli-plugin-scaffold/utils"; import { updateDependencies, updateWorkspaces } from "~/utils"; -import readJson from "load-json-file"; -import writeJson from "write-json-file"; export class PbElementExtension extends AbstractExtension { async link() { @@ -23,9 +21,6 @@ export class PbElementExtension extends AbstractExtension { [this.params.packageName]: "1.0.0" }); - await this.updateTsConfigPaths("admin"); - await this.updateTsConfigPaths("website"); - await updateWorkspaces(this.params.location); } @@ -59,7 +54,7 @@ export class PbElementExtension extends AbstractExtension { const componentName = ucFirstExtName + "Extension"; const importName = "{ Extension as " + componentName + " }"; - const importPath = packageName; + const importPath = packageName + "/src/" + app; const project = new Project(); project.addSourceFileAtPath(extensionsFilePath); @@ -81,7 +76,7 @@ export class PbElementExtension extends AbstractExtension { source.insertImportDeclaration(index, { defaultImport: importName, - moduleSpecifier: importPath + "/" + app + moduleSpecifier: importPath }); const extensionsIdentifier = source.getFirstDescendant(node => { @@ -125,31 +120,4 @@ export class PbElementExtension extends AbstractExtension { await formatCode(extensionsFilePath, {}); } - - private async updateTsConfigPaths(app: "admin" | "website") { - const { name: extensionName, packageName } = this.params; - - const tsConfigJsonPath = path.join("apps", app, "tsconfig.json"); - - const tsConfigJson = await readJson>(tsConfigJsonPath); - - if (!tsConfigJson) { - throw new Error(`Could not read "${tsConfigJsonPath}" file.`); - } - - if (!tsConfigJson.compilerOptions) { - tsConfigJson.compilerOptions = {}; - } - - if (!tsConfigJson.compilerOptions.paths) { - tsConfigJson.compilerOptions.paths = {}; - } - - tsConfigJson.compilerOptions.paths[packageName] = [`./extensions/${extensionName}/src`]; - tsConfigJson.compilerOptions.paths[`${packageName}/*`] = [ - `./extensions/${extensionName}/src/*` - ]; - - await writeJson(tsConfigJsonPath, tsConfigJson); - } -} +} \ No newline at end of file