feat(core): extract js related code from affected and hasher #16244

meeroslav · 2023-04-12T08:01:59Z

Extract JS related code from affected graph
Extract JS related code from hasher
Add deep imports to barrel export

Current Behavior

Expected Behavior

Related Issue(s)

Fixes #

vercel · 2023-04-12T08:02:03Z

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

Name	Status	Preview	Comments	Updated (UTC)
nx-dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 18, 2023 7:55am

nx-cloud · 2023-04-12T08:06:15Z

☁️ Nx Cloud Report

CI is running/has finished running commands for commit c74e78b. 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.

mandarini

Storybook, Vite and React changes look good to me!

packages/nx/src/plugins/js/index.ts

packages/devkit/src/generators/to-js.ts

packages/js/src/index.ts

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

packages/js/src/utils/typescript/ast-utils.ts

packages/linter/src/utils/versions.ts

FrozenPandaz · 2023-04-14T15:56:20Z

packages/linter/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts

@@ -1,5 +1,5 @@
 import { addDependenciesToPackageJson, formatFiles, Tree } from '@nrwl/devkit';
-import { swcCoreVersion, swcNodeVersion } from 'nx/src/utils/versions';
+import { swcCoreVersion, swcNodeVersion } from '../../utils/versions';
 import { WORKSPACE_PLUGIN_DIR } from '../../generators/workspace-rules-project/workspace-rules-project';

 export default async function addSwcNodeIfNeeded(tree: Tree) {


Expose a function from @nrwl/js which adds @swc/node as a dependency.

This was not addressed.

This got lost on rebase; I'll push those changes again.

FrozenPandaz · 2023-04-14T15:56:57Z

packages/nx-plugin/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts

@@ -4,7 +4,7 @@ import {
  installPackagesTask,
  Tree,
 } from '@nrwl/devkit';
-import { swcCoreVersion, swcNodeVersion } from 'nx/src/utils/versions';
+import { swcCoreVersion, swcNodeVersion } from '../../utils/versions';

 export default async function addSwcNodeIfNeeded(tree: Tree) {
  addDependenciesToPackageJson(


Same as above, use the util from @nrwl/js

This got lost on rebase; I'll push those changes again.

packages/nx-plugin/src/utils/versions.ts

FrozenPandaz · 2023-04-17T17:13:52Z

e2e/jest/src/jest.test.ts

@@ -48,7 +48,7 @@ describe('Jest', () => {
    updateFile(
      `libs/${mylib}/setup.ts`,
      stripIndents`
-      const { registerTsProject } = require('nx/src/utils/register');
+      const { registerTsProject } = require('nx/src/plugins/js/utils/register');


followup: This should use @nrwl/js/src/internals

That is currently impossible since there is no src/internals in the @nrwl/js. Deep imports must be done using @nx/* packages.

Additionally, using @nx/... would not work in pnpm since none of the @nx/* packages are hoisted.

Something to discuss tomorrow...

FrozenPandaz · 2023-04-17T17:16:07Z

packages/linter/src/generators/init/init.ts

  typescriptESLintVersion,
 } from '../../utils/versions';
+import { nxVersion } from '@nx/js/src/utils/versions';


Why did this change?

I thought it made sense to have nx as a central source of truth regarding nxVersion.

I'll revert that.

FrozenPandaz · 2023-04-17T17:16:40Z

packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts

-import { swcCoreVersion, swcNodeVersion } from 'nx/src/utils/versions';
-import { nxVersion } from '../../utils/versions';
+import {
+  nxVersion,


What's wrong with using the one from this package?

I thought it made sense to have nx as a central source of truth regarding nxVersion.

I'll revert that.

FrozenPandaz · 2023-04-17T17:17:39Z

packages/linter/src/generators/workspace-rules-project/workspace-rules-project.ts

+  swcCoreVersion,
+  swcNodeVersion,


I don't think we should import the versions from @nx/js, I think we should import a function like { addSwcDependencies } from '@nx/js/src/utils/add-swc';

This got lost on rebase; I'll push those changes again.

FrozenPandaz · 2023-04-17T17:18:21Z

packages/linter/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts

@@ -1,5 +1,5 @@
 import { addDependenciesToPackageJson, formatFiles, Tree } from '@nrwl/devkit';
-import { swcCoreVersion, swcNodeVersion } from 'nx/src/utils/versions';
+import { swcCoreVersion, swcNodeVersion } from '../../utils/versions';
 import { WORKSPACE_PLUGIN_DIR } from '../../generators/workspace-rules-project/workspace-rules-project';

 export default async function addSwcNodeIfNeeded(tree: Tree) {


This was not addressed.

FrozenPandaz · 2023-04-17T17:18:38Z

packages/linter/src/utils/versions.ts

@@ -1,7 +1,4 @@
-export const nxVersion = require('../../package.json').version;


Why remove this?

I thought it makes sense to have nx as a central source of truth when it comes to nxVersion.

I'll revert that.

)

github-actions · 2023-04-24T00:07:31Z

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.

meeroslav self-assigned this Apr 12, 2023

vercel bot deployed to Preview April 12, 2023 08:05 View deployment

meeroslav force-pushed the extract-affected-js branch 3 times, most recently from 4fa6a96 to 5ad4b1f Compare April 12, 2023 08:32

vercel bot deployed to Preview April 12, 2023 08:41 View deployment

vercel bot deployed to Preview April 12, 2023 09:40 View deployment

meeroslav force-pushed the extract-affected-js branch from deea028 to ee88d28 Compare April 12, 2023 09:43

vercel bot deployed to Preview April 12, 2023 09:46 View deployment

vercel bot deployed to Preview April 12, 2023 10:41 View deployment

meeroslav marked this pull request as ready for review April 12, 2023 11:33

meeroslav requested review from FrozenPandaz, AgentEnder, vsavkin, jaysoo, Coly010, mandarini, JamesHenry, ndcunningham, nartc, xiongemi and leosvelperez as code owners April 12, 2023 11:33

mandarini approved these changes Apr 12, 2023

View reviewed changes

Coly010 approved these changes Apr 12, 2023

View reviewed changes

meeroslav mentioned this pull request Apr 12, 2023

feat(linter): add internal rule to prevent deep import from plugins/js #16253

Closed

nartc approved these changes Apr 12, 2023

View reviewed changes

jaysoo approved these changes Apr 12, 2023

View reviewed changes

FrozenPandaz requested changes Apr 12, 2023

View reviewed changes

packages/nx/src/plugins/js/index.ts Outdated Show resolved Hide resolved

packages/nx/src/plugins/js/index.ts Outdated Show resolved Hide resolved

packages/nx/src/plugins/js/index.ts Outdated Show resolved Hide resolved

vercel bot deployed to Preview April 14, 2023 09:17 View deployment

meeroslav force-pushed the extract-affected-js branch from 3677795 to 2900b39 Compare April 14, 2023 09:58

vercel bot deployed to Preview April 14, 2023 10:01 View deployment

FrozenPandaz requested changes Apr 14, 2023

View reviewed changes

meeroslav added 6 commits April 17, 2023 12:56

feat(core): extract js related affected graph

58cd651

feat(core): use barell import

f129ab6

feat(core): extract js related hasher logic

ec9933c

fix(core): remove internal logic from barrel imports

dcefc80

feat(core): move register to plugins/js

5fc5d87

feat(core): move barrel files to js

e880f11

meeroslav force-pushed the extract-affected-js branch from 2900b39 to e880f11 Compare April 17, 2023 12:04

vercel bot deployed to Preview April 17, 2023 12:17 View deployment

vercel bot deployed to Preview April 17, 2023 14:09 View deployment

meeroslav force-pushed the extract-affected-js branch from e2f991b to 6044b00 Compare April 17, 2023 15:09

vercel bot deployed to Preview April 17, 2023 15:13 View deployment

fix(repo): fix test

3d85ac0

meeroslav force-pushed the extract-affected-js branch from 6044b00 to 3d85ac0 Compare April 17, 2023 15:32

meeroslav requested a review from FrozenPandaz April 17, 2023 15:32

vercel bot deployed to Preview April 17, 2023 15:42 View deployment

FrozenPandaz requested changes Apr 17, 2023

View reviewed changes

chore(repo): revert changes lost on rebase

a3f0677

meeroslav requested a review from FrozenPandaz April 17, 2023 21:06

Merge branch 'master' into extract-affected-js

c74e78b

vercel bot deployed to Preview April 18, 2023 07:55 View deployment

FrozenPandaz approved these changes Apr 18, 2023

View reviewed changes

FrozenPandaz merged commit 2dd59c3 into nrwl:master Apr 18, 2023

peppoasap pushed a commit to peppoasap/nx that referenced this pull request Apr 18, 2023

feat(core): extract js related code from affected and hasher (nrwl#16244

2d0b579

)

github-actions bot locked as resolved and limited conversation to collaborators Apr 24, 2023

meeroslav deleted the extract-affected-js branch April 27, 2023 09:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(core): extract js related code from affected and hasher #16244

feat(core): extract js related code from affected and hasher #16244

meeroslav commented Apr 12, 2023 •

edited

Loading

vercel bot commented Apr 12, 2023 •

edited

Loading

nx-cloud bot commented Apr 12, 2023 •

edited

Loading

mandarini left a comment

FrozenPandaz Apr 14, 2023

FrozenPandaz Apr 17, 2023

meeroslav Apr 17, 2023

FrozenPandaz Apr 14, 2023

meeroslav Apr 17, 2023

FrozenPandaz Apr 17, 2023

meeroslav Apr 17, 2023

meeroslav Apr 17, 2023

FrozenPandaz Apr 17, 2023

meeroslav Apr 17, 2023

FrozenPandaz Apr 17, 2023

meeroslav Apr 17, 2023

FrozenPandaz Apr 17, 2023

meeroslav Apr 17, 2023

FrozenPandaz Apr 17, 2023

FrozenPandaz Apr 17, 2023

meeroslav Apr 17, 2023

github-actions bot commented Apr 24, 2023

		@@ -1,7 +1,4 @@
		export const nxVersion = require('../../package.json').version;

feat(core): extract js related code from affected and hasher #16244

feat(core): extract js related code from affected and hasher #16244

Conversation

meeroslav commented Apr 12, 2023 • edited Loading

Current Behavior

Expected Behavior

Related Issue(s)

vercel bot commented Apr 12, 2023 • edited Loading

nx-cloud bot commented Apr 12, 2023 • edited Loading

☁️ Nx Cloud Report

mandarini left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Apr 24, 2023

meeroslav commented Apr 12, 2023 •

edited

Loading

vercel bot commented Apr 12, 2023 •

edited

Loading

nx-cloud bot commented Apr 12, 2023 •

edited

Loading