fix(@angular-devkit/build-angular): avoid undefined module path for S… · angular/angular-cli@f31bf30 · GitHub

angular / angular-cli Public

• Notifications You must be signed in to change notification settings
• Fork 11.8k
• Star 27k

• Code
• Issues 241
• Pull requests 19
• Actions
• Security and quality 5
• Insights

Additional navigation options

Commit f31bf30

Browse filesBrowse the repository at this point in the historyBrowse files

clydin

authored and

dgp1130

committed

fix(@angular-devkit/build-angular): avoid undefined module path for Sass imports in esbuild

When using Sass with the experimental esbuild-based browser application builder, bare imports without a path segment that were available via included paths but also happen to be a node module could cause an exception. An example of such an import would be `@import "globals";`. The deep import node module logic would previously attempt to join an undefined path segment to the resolved path for the `globals` package which would raise a argument type exception. This case has now been fixed by only joining if there is actually a path segment present such as `@import "globals/x"`. With this fix in place, the node module case can then continue and if no stylesheet is found, the include paths will then be searched. (cherry picked from commit d19f260)

1 parent de15ec5 commit f31bf30
Copy full SHA for f31bf30

1 file changed

+5-1Lines changed: 5 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• packages/angular_devkit/build_angular/src/builders/browser-esbuild
  • sass-plugin.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎packages/angular_devkit/build_angular/src/builders/browser-esbuild/sass-plugin.ts‎

Copy file name to clipboardExpand all lines: packages/angular_devkit/build_angular/src/builders/browser-esbuild/sass-plugin.ts

+5-1Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -124,7 +124,11 @@ async function compileString(
124	124
125	125	if (packageResult.path) {
126	126	return pathToFileURL(
127		- join(dirname(packageResult.path), !hasScope ? nameOrFirstPath : '', ...pathPart),
	127	+ join(
	128	+ dirname(packageResult.path),
	129	+ !hasScope && nameOrFirstPath ? nameOrFirstPath : '',
	130	+ ...pathPart,
	131	+ ),
128	132	);
129	133	}
130	134	}

0 commit comments

Comments

0 (0)