Skip to content
This repository was archived by the owner on Sep 6, 2025. It is now read-only.

Commit 2870822

Browse files
committed
fix(angular-rspack): remove failing node importer
1 parent 12d221f commit 2870822

File tree

7 files changed

+445
-691
lines changed

7 files changed

+445
-691
lines changed

apps/docs/tsconfig.app.tsbuildinfo

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"check-format": "pnpx nx format:check",
99
"check-commit": "pnpm exec commitlint --from HEAD~1 --to HEAD",
1010
"release": "tsx tools/scripts/release.ts",
11-
"dbg": "NX_TUI=false pnpm nx run rspack-ssg-css:build"
11+
"dbg": "NX_TUI=false pnpm nx run rspack-csr-scss:build --skip-nx-cache"
1212
},
1313
"private": true,
1414
"devDependencies": {
15-
"@analogjs/vite-plugin-angular": "1.17.0",
16-
"@analogjs/vitest-angular": "1.17.0",
15+
"@analogjs/vite-plugin-angular": "1.17.1",
16+
"@analogjs/vitest-angular": "1.17.1",
1717
"@angular-devkit/architect": "0.2001.0",
1818
"@angular-devkit/build-angular": "20.1.0",
1919
"@angular-devkit/core": "20.1.0",
@@ -28,17 +28,17 @@
2828
"@eslint/js": "^9.8.0",
2929
"@module-federation/enhanced": "0.8.5",
3030
"@module-federation/sdk": "0.8.5",
31-
"@nx/angular": "21.2.0-beta.1",
32-
"@nx/eslint": "21.2.0-beta.1",
33-
"@nx/eslint-plugin": "21.2.0-beta.1",
34-
"@nx/js": "21.2.0-beta.1",
35-
"@nx/playwright": "21.2.0-beta.1",
36-
"@nx/plugin": "21.2.0-beta.1",
37-
"@nx/rsbuild": "21.2.0-beta.1",
38-
"@nx/rspack": "21.2.0-beta.1",
39-
"@nx/vite": "21.2.0-beta.1",
40-
"@nx/web": "21.2.0-beta.1",
41-
"@nx/workspace": "21.2.0-beta.1",
31+
"@nx/angular": "21.2.3",
32+
"@nx/eslint": "21.2.3",
33+
"@nx/eslint-plugin": "21.2.3",
34+
"@nx/js": "21.2.3",
35+
"@nx/playwright": "21.2.3",
36+
"@nx/plugin": "21.2.3",
37+
"@nx/rsbuild": "21.2.3",
38+
"@nx/rspack": "21.2.3",
39+
"@nx/vite": "21.2.3",
40+
"@nx/web": "21.2.3",
41+
"@nx/workspace": "21.2.3",
4242
"@playwright/test": "^1.36.0",
4343
"@rsbuild/core": "^1.1.12",
4444
"@rsbuild/plugin-less": "^1.1.1",
@@ -59,7 +59,7 @@
5959
"@typescript-eslint/utils": "^8.29.0",
6060
"@vitest/coverage-v8": "^1.0.4",
6161
"@vitest/ui": "^1.3.1",
62-
"angular-eslint": "^20.0.0-alpha.1",
62+
"angular-eslint": "20.1.1",
6363
"autoprefixer": "10.4.21",
6464
"commitlint-plugin-tense": "1.0.4",
6565
"css-loader": "^7.1.2",
@@ -74,7 +74,7 @@
7474
"jsonc-eslint-parser": "^2.4.0",
7575
"kill-port": "^2.0.1",
7676
"less-loader": "^12.2.0",
77-
"nx": "21.2.0-beta.1",
77+
"nx": "21.2.3",
7878
"loader-utils": "^3.3.1",
7979
"parse5-html-rewriting-stream": "7.0.0",
8080
"postcss": "8.5.3",
@@ -126,7 +126,7 @@
126126
"@code-pushup/utils": "^0.63.0",
127127
"@commitlint/config-nx-scopes": "^19.5.0",
128128
"@netlify/functions": "^3.0.0",
129-
"@nx/devkit": "21.2.0-beta.1",
129+
"@nx/devkit": "21.2.3",
130130
"@types/minimatch": "^5.1.2",
131131
"ansis": "^3.9.0",
132132
"deepmerge": "^4.3.1",

packages/angular-rspack-compiler/patch/patch-angular-build.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ function main() {
77
const fileContentsJson = JSON.parse(
88
readFileSync(angularBuildPackageJson, 'utf8')
99
);
10-
fileContentsJson.exports['./src/tools/esbuild/javascript-transformer'] =
11-
'./src/tools/esbuild/javascript-transformer.js';
1210
fileContentsJson.exports[
1311
'./src/tools/angular/compilation/parallel-compilation'
1412
] = './src/tools/angular/compilation/parallel-compilation.js';

packages/angular-rspack-compiler/src/compilation/build-and-analyze.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { JavaScriptTransformer } from '@angular/build/src/tools/esbuild/javascript-transformer';
1+
import { JavaScriptTransformer } from '@angular/build/private';
22
import { normalize } from 'path';
33
import { AngularCompilation } from '../models';
44

packages/angular-rspack-compiler/src/models/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { JavaScriptTransformer } from '@angular/build/src/tools/esbuild/javascript-transformer';
1+
import { JavaScriptTransformer } from '@angular/build/private';
22
import { ParallelCompilation } from '@angular/build/src/tools/angular/compilation/parallel-compilation';
33
import { AotCompilation } from '@angular/build/src/tools/angular/compilation/aot-compilation';
44
import { JitCompilation } from '@angular/build/src/tools/angular/compilation/jit-compilation';

packages/angular-rspack/src/lib/config/config-utils/style-config-utils.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
import { createRequire } from 'node:module';
1111
import { basename, dirname, relative, resolve } from 'node:path';
1212
import { fileURLToPath, pathToFileURL } from 'node:url';
13-
import { NodePackageImporter } from 'sass';
1413
import type { FileImporter } from 'sass';
1514
import type {
1615
HashFormat,
@@ -333,7 +332,6 @@ function getSassLoaderOptions(
333332
webpackImporter: false,
334333
sassOptions: (loaderContext: LoaderContext<unknown>) => ({
335334
importers: [
336-
new NodePackageImporter(),
337335
getSassResolutionImporter(loaderContext, root, preserveSymlinks),
338336
],
339337
loadPaths: includePaths,

0 commit comments

Comments
 (0)