feat(core): move tsconfig.base.json to @nrwl/js:init #14467

xiongemi · 2023-01-18T17:18:46Z

move tsconfig.base.json generation to @nrwl/js:init
also add typescript installation to @nrwl/js:init
call @nrwl/js:init in other plugin's init
since @nrwl/js:init has schema flags skipPackageJson and skipTsConfig, so add these 2 flags to all the consuming plugins' schema
add e2e tests in e2e/workspace-create/src/create-nx-workspace-npm.test.ts
remove packages/workspace/src/generators/new/files-root-app since it is the same as files-integrated-repo
there are a few imports like import * as ts from 'typescript'; in the code; however for package based repo, typescript is not installed initially; so i move utils functions from packages/workspace/src/utilities/typescript.ts to packages/workspace/src/utilities/ts-config.ts

Current Behavior

Expected Behavior

Related Issue(s)

Fixes #

vercel · 2023-01-18T17:18:49Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated
nx-dev	✅ Ready (Inspect)	Visit Preview	💬 Add your feedback	Feb 16, 2023 at 3:17PM (UTC)

nx-cloud · 2023-01-18T17:21:10Z

☁️ Nx Cloud Report

CI is running/has finished running commands for commit f9504bf. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this branch

✅ Successfully ran 8 targets

Sent with 💌 from NxCloud.

packages/angular/src/generators/application/angular-v14/lib/update-config-files.ts

packages/js/src/generators/init/schema.json

packages/js/package.json

packages/js/src/index.ts

e2e/workspace-create/src/create-nx-workspace.test.ts

packages/linter/generators.ts

packages/next/src/generators/application/schema.d.ts

packages/workspace/src/generators/library/library.ts

packages/workspace/src/generators/new/generate-workspace-files.ts

packages/workspace/src/utilities/ts-config.ts

mandarini · 2023-02-10T10:24:46Z

packages/storybook/src/generators/configuration/configuration.ts

@@ -132,7 +132,8 @@ export async function configurationGenerator(
    }
  }

-  const initTask = initGenerator(tree, {
+  const initTask = await initGenerator(tree, {
+    js: schema.js,


This should not be here

this js passed to initGenerator is just to determine whether the typescript package needs to be installed or not. it does not create any files.

I understand, but I think it would be cleaner for it not to be here... If you think it's better to be there rather than configuration generator, then ok...

FrozenPandaz

Looking good 😄

packages/angular/src/generators/application/angular-v14/lib/add-unit-test-runner.ts

FrozenPandaz · 2023-02-14T18:51:06Z

packages/js/src/generators/library/library.ts

@@ -19,12 +19,13 @@ import {
  writeJson,
 } from '@nrwl/devkit';
 import { getImportPath } from 'nx/src/utils/path';
-import { Linter, lintProjectGenerator } from '@nrwl/linter';
+// nx-ignore-next-line
+const { Linter } = require('@nrwl/linter'); // use require to import to avoid circular dependency


Is this a type? Or should it be lower down after the ensurePackage('@nrwl/linter') is called?

not a type. moved it down.

packages/angular/src/generators/init/init.ts

mandarini

I am approving, but leaving my comments, too! :D

mandarini · 2023-02-15T11:16:08Z

packages/storybook/src/generators/configuration/configuration.ts

@@ -132,7 +132,8 @@ export async function configurationGenerator(
    }
  }

-  const initTask = initGenerator(tree, {
+  const initTask = await initGenerator(tree, {
+    js: schema.js,


I understand, but I think it would be cleaner for it not to be here... If you think it's better to be there rather than configuration generator, then ok...

mandarini · 2023-02-15T11:17:05Z

packages/storybook/src/generators/init/init.ts

@@ -210,7 +212,11 @@ function editRootTsConfig(tree: Tree) {
  }
 }

-export function initGenerator(tree: Tree, schema: Schema) {
+export async function initGenerator(tree: Tree, schema: Schema) {
+  await jsInitGenerator(tree, {


Ah I see. But someone may call the init generator and not call the configuration generator at all, so they would not need the js... But again, if you think it makes sense here, then ok!

feat(core): move tsconfig.base.json to @nrwl/js:init

github-actions · 2023-03-03T15:02:28Z

This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request.

vercel bot deployed to Preview January 18, 2023 17:21 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 4c75e53 to cfef715 Compare January 18, 2023 18:41

vercel bot deployed to Preview January 18, 2023 18:44 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from cfef715 to 8593277 Compare January 18, 2023 20:21

vercel bot deployed to Preview January 18, 2023 20:24 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 8593277 to 7edb2ac Compare January 18, 2023 23:39

vercel bot deployed to Preview January 18, 2023 23:43 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch 2 times, most recently from 4039515 to b37dac2 Compare January 19, 2023 18:05

vercel bot deployed to Preview January 19, 2023 18:14 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from b37dac2 to 87190a9 Compare January 19, 2023 20:52

vercel bot deployed to Preview January 19, 2023 20:55 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 87190a9 to b0fac00 Compare January 19, 2023 21:50

vercel bot deployed to Preview January 19, 2023 21:54 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from b0fac00 to a604fb6 Compare January 19, 2023 22:37

vercel bot deployed to Preview January 19, 2023 22:40 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from a604fb6 to 491c32d Compare January 19, 2023 23:48

vercel bot deployed to Preview January 19, 2023 23:51 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 491c32d to 329981c Compare January 20, 2023 06:06

vercel bot deployed to Preview January 20, 2023 06:09 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 329981c to e5bed8c Compare January 20, 2023 06:35

vercel bot deployed to Preview January 20, 2023 06:39 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from e5bed8c to 99f982f Compare January 20, 2023 07:04

vercel bot deployed to Preview January 20, 2023 07:07 View deployment

xiongemi requested a review from FrozenPandaz January 20, 2023 15:15

FrozenPandaz requested changes Jan 20, 2023

View reviewed changes

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 99f982f to 54d64a6 Compare January 26, 2023 21:40

vercel bot deployed to Preview January 26, 2023 21:50 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 3bf41ba to a403201 Compare February 12, 2023 03:35

vercel bot deployed to Preview February 12, 2023 03:43 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from a403201 to b7339b3 Compare February 13, 2023 06:12

vercel bot deployed to Preview February 13, 2023 06:14 View deployment

mandarini reviewed Feb 13, 2023

View reviewed changes

xiongemi requested review from FrozenPandaz and leosvelperez February 13, 2023 15:00

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from b7339b3 to 68579e8 Compare February 14, 2023 16:30

xiongemi requested a review from mandarini February 14, 2023 16:35

vercel bot deployed to Preview February 14, 2023 16:37 View deployment

FrozenPandaz approved these changes Feb 14, 2023

View reviewed changes

leosvelperez reviewed Feb 15, 2023

View reviewed changes

packages/angular/src/generators/init/init.ts Outdated Show resolved Hide resolved

mandarini approved these changes Feb 15, 2023

View reviewed changes

AgentEnder approved these changes Feb 15, 2023

View reviewed changes

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 68579e8 to f9992a4 Compare February 15, 2023 20:37

vercel bot deployed to Preview February 15, 2023 20:41 View deployment

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from f9992a4 to 0fb0ef5 Compare February 15, 2023 21:26

vercel bot deployed to Preview February 15, 2023 21:30 View deployment

xiongemi requested a review from leosvelperez February 15, 2023 22:32

leosvelperez approved these changes Feb 16, 2023

View reviewed changes

xiongemi added 2 commits February 16, 2023 10:13

feat(core): move tsconfig.base.json to @nrwl/js:init

f3212af

feat(core): move tsconfig.base.json to @nrwl/js:init

feat(core): move @nrwl/linter to inside the func

f9504bf

xiongemi force-pushed the feat/move-tsconfig-base-from-workspace-to-js branch from 0fb0ef5 to f9504bf Compare February 16, 2023 15:13

vercel bot deployed to Preview February 16, 2023 15:17 View deployment

xiongemi requested a review from nartc February 16, 2023 16:10

jaysoo approved these changes Feb 16, 2023

View reviewed changes

xiongemi merged commit a97212b into master Feb 16, 2023

jaysoo deleted the feat/move-tsconfig-base-from-workspace-to-js branch February 16, 2023 16:30

github-actions bot locked as resolved and limited conversation to collaborators Mar 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(core): move tsconfig.base.json to @nrwl/js:init #14467

feat(core): move tsconfig.base.json to @nrwl/js:init #14467

xiongemi commented Jan 18, 2023 •

edited

Loading

vercel bot commented Jan 18, 2023 •

edited

Loading

nx-cloud bot commented Jan 18, 2023 •

edited

Loading

mandarini Feb 10, 2023

xiongemi Feb 14, 2023

mandarini Feb 15, 2023

FrozenPandaz left a comment

FrozenPandaz Feb 14, 2023

xiongemi Feb 15, 2023

mandarini left a comment

mandarini Feb 15, 2023

mandarini Feb 15, 2023

github-actions bot commented Mar 3, 2023

feat(core): move tsconfig.base.json to @nrwl/js:init #14467

feat(core): move tsconfig.base.json to @nrwl/js:init #14467

Conversation

xiongemi commented Jan 18, 2023 • edited Loading

Current Behavior

Expected Behavior

Related Issue(s)

vercel bot commented Jan 18, 2023 • edited Loading

nx-cloud bot commented Jan 18, 2023 • edited Loading

☁️ Nx Cloud Report

mandarini Feb 10, 2023

Choose a reason for hiding this comment

xiongemi Feb 14, 2023

Choose a reason for hiding this comment

mandarini Feb 15, 2023

Choose a reason for hiding this comment

FrozenPandaz left a comment

Choose a reason for hiding this comment

FrozenPandaz Feb 14, 2023

Choose a reason for hiding this comment

xiongemi Feb 15, 2023

Choose a reason for hiding this comment

mandarini left a comment

Choose a reason for hiding this comment

mandarini Feb 15, 2023

Choose a reason for hiding this comment

mandarini Feb 15, 2023

Choose a reason for hiding this comment

github-actions bot commented Mar 3, 2023

xiongemi commented Jan 18, 2023 •

edited

Loading

vercel bot commented Jan 18, 2023 •

edited

Loading

nx-cloud bot commented Jan 18, 2023 •

edited

Loading