@angular/build 19.0.0-next.6 → 19.0.0-next.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +11 -11
- package/src/builders/application/execute-build.js +19 -2
- package/src/builders/application/execute-post-bundle.d.ts +2 -2
- package/src/builders/application/execute-post-bundle.js +30 -11
- package/src/builders/application/i18n.d.ts +2 -2
- package/src/builders/application/i18n.js +4 -5
- package/src/builders/application/index.js +8 -5
- package/src/builders/application/options.d.ts +18 -1
- package/src/builders/application/options.js +30 -2
- package/src/builders/application/schema.d.ts +15 -0
- package/src/builders/application/schema.js +11 -1
- package/src/builders/application/schema.json +5 -0
- package/src/builders/application/setup-bundling.js +6 -3
- package/src/builders/dev-server/vite-server.d.ts +2 -1
- package/src/builders/dev-server/vite-server.js +64 -47
- package/src/builders/extract-i18n/application-extraction.js +3 -3
- package/src/tools/angular/angular-host.d.ts +2 -1
- package/src/tools/angular/angular-host.js +20 -1
- package/src/tools/angular/compilation/angular-compilation.d.ts +1 -0
- package/src/tools/angular/compilation/aot-compilation.d.ts +1 -0
- package/src/tools/angular/compilation/aot-compilation.js +9 -1
- package/src/tools/angular/compilation/parallel-compilation.d.ts +1 -0
- package/src/tools/angular/compilation/parallel-compilation.js +2 -10
- package/src/tools/angular/compilation/parallel-worker.d.ts +1 -0
- package/src/tools/angular/compilation/parallel-worker.js +2 -1
- package/src/tools/esbuild/angular/compiler-plugin.d.ts +1 -0
- package/src/tools/esbuild/angular/compiler-plugin.js +42 -3
- package/src/tools/esbuild/angular/component-stylesheets.d.ts +8 -3
- package/src/tools/esbuild/angular/component-stylesheets.js +46 -11
- package/src/tools/esbuild/application-code-bundle.d.ts +1 -0
- package/src/tools/esbuild/application-code-bundle.js +109 -2
- package/src/tools/esbuild/budget-stats.js +1 -1
- package/src/tools/esbuild/bundler-context.d.ts +4 -3
- package/src/tools/esbuild/bundler-context.js +8 -4
- package/src/tools/esbuild/bundler-execution-result.d.ts +5 -2
- package/src/tools/esbuild/bundler-execution-result.js +7 -3
- package/src/tools/esbuild/cache.d.ts +5 -0
- package/src/tools/esbuild/cache.js +7 -0
- package/src/tools/esbuild/compiler-plugin-options.js +2 -1
- package/src/tools/esbuild/i18n-inliner.js +4 -4
- package/src/tools/esbuild/javascript-transformer.js +2 -9
- package/src/tools/esbuild/utils.js +7 -3
- package/src/tools/sass/sass-service.js +2 -9
- package/src/tools/vite/middlewares/assets-middleware.js +8 -8
- package/src/tools/vite/middlewares/headers-middleware.d.ts +19 -0
- package/src/tools/vite/middlewares/headers-middleware.js +34 -0
- package/src/tools/vite/middlewares/html-fallback-middleware.d.ts +1 -1
- package/src/tools/vite/middlewares/html-fallback-middleware.js +23 -7
- package/src/tools/vite/middlewares/index-html-middleware.js +1 -2
- package/src/tools/vite/middlewares/index.d.ts +2 -1
- package/src/tools/vite/middlewares/index.js +5 -2
- package/src/tools/vite/middlewares/ssr-middleware.d.ts +2 -1
- package/src/tools/vite/middlewares/ssr-middleware.js +61 -17
- package/src/tools/vite/plugins/angular-memory-plugin.d.ts +16 -0
- package/src/tools/vite/{angular-memory-plugin.js → plugins/angular-memory-plugin.js} +19 -40
- package/src/tools/vite/{i18n-locale-plugin.d.ts → plugins/i18n-locale-plugin.d.ts} +0 -4
- package/src/tools/vite/{i18n-locale-plugin.js → plugins/i18n-locale-plugin.js} +2 -3
- package/src/tools/vite/plugins/index.d.ts +12 -0
- package/src/tools/vite/plugins/index.js +21 -0
- package/src/tools/vite/plugins/setup-middlewares-plugin.d.ts +41 -0
- package/src/tools/vite/plugins/setup-middlewares-plugin.js +62 -0
- package/src/tools/vite/plugins/ssr-transform-plugin.d.ts +9 -0
- package/src/tools/vite/plugins/ssr-transform-plugin.js +38 -0
- package/src/tools/vite/utils.d.ts +0 -3
- package/src/tools/vite/utils.js +0 -12
- package/src/typings.d.ts +7 -0
- package/src/utils/environment-options.d.ts +2 -0
- package/src/utils/environment-options.js +5 -1
- package/src/utils/index-file/valid-self-closing-tags.js +1 -0
- package/src/utils/normalize-cache.js +1 -1
- package/src/utils/server-rendering/manifest.d.ts +8 -2
- package/src/utils/server-rendering/manifest.js +61 -12
- package/src/utils/server-rendering/models.d.ts +27 -0
- package/src/utils/server-rendering/models.js +22 -0
- package/src/utils/server-rendering/prerender.d.ts +6 -10
- package/src/utils/server-rendering/prerender.js +103 -71
- package/src/utils/server-rendering/routes-extractor-worker.d.ts +5 -6
- package/src/utils/server-rendering/routes-extractor-worker.js +7 -5
- package/src/utils/worker-pool.d.ts +12 -0
- package/src/utils/worker-pool.js +43 -0
- package/src/tools/vite/angular-memory-plugin.d.ts +0 -22
- /package/src/tools/vite/{id-prefix-plugin.d.ts → plugins/id-prefix-plugin.d.ts} +0 -0
- /package/src/tools/vite/{id-prefix-plugin.js → plugins/id-prefix-plugin.js} +0 -0
|
@@ -7,4 +7,4 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import type { ServerResponse } from 'node:http';
|
|
9
9
|
import type { Connect } from 'vite';
|
|
10
|
-
export declare function angularHtmlFallbackMiddleware(req: Connect.IncomingMessage,
|
|
10
|
+
export declare function angularHtmlFallbackMiddleware(req: Connect.IncomingMessage, _res: ServerResponse, next: Connect.NextFunction): void;
|
|
@@ -9,15 +9,31 @@
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.angularHtmlFallbackMiddleware = angularHtmlFallbackMiddleware;
|
|
11
11
|
const utils_1 = require("../utils");
|
|
12
|
-
|
|
12
|
+
const ALLOWED_FALLBACK_METHODS = Object.freeze(['GET', 'HEAD']);
|
|
13
|
+
function angularHtmlFallbackMiddleware(req, _res, next) {
|
|
13
14
|
// Similar to how it is handled in vite
|
|
14
15
|
// https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L15C19-L15C45
|
|
15
|
-
if (
|
|
16
|
-
|
|
17
|
-
(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
if (!req.method || !ALLOWED_FALLBACK_METHODS.includes(req.method)) {
|
|
17
|
+
// No fallback for unsupported request methods
|
|
18
|
+
next();
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
if (req.url) {
|
|
22
|
+
const mimeType = (0, utils_1.lookupMimeTypeFromRequest)(req.url);
|
|
23
|
+
if (mimeType === 'text/html' || mimeType === 'application/xhtml+xml') {
|
|
24
|
+
// eslint-disable-next-line no-console
|
|
25
|
+
console.warn(`Request for HTML file "${req.url}" was received but no asset found. Asset may be missing from build.`);
|
|
26
|
+
}
|
|
27
|
+
else if (mimeType) {
|
|
28
|
+
// No fallback for request of asset-like files
|
|
29
|
+
next();
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (!req.headers.accept ||
|
|
34
|
+
req.headers.accept.includes('text/html') ||
|
|
35
|
+
req.headers.accept.includes('text/*') ||
|
|
36
|
+
req.headers.accept.includes('*/*')) {
|
|
21
37
|
req.url = '/index.html';
|
|
22
38
|
}
|
|
23
39
|
next();
|
|
@@ -11,7 +11,7 @@ exports.createAngularIndexHtmlMiddleware = createAngularIndexHtmlMiddleware;
|
|
|
11
11
|
const node_path_1 = require("node:path");
|
|
12
12
|
const utils_1 = require("../utils");
|
|
13
13
|
function createAngularIndexHtmlMiddleware(server, outputFiles, indexHtmlTransformer) {
|
|
14
|
-
return function (req, res, next) {
|
|
14
|
+
return function angularIndexHtmlMiddleware(req, res, next) {
|
|
15
15
|
if (!req.url) {
|
|
16
16
|
next();
|
|
17
17
|
return;
|
|
@@ -37,7 +37,6 @@ function createAngularIndexHtmlMiddleware(server, outputFiles, indexHtmlTransfor
|
|
|
37
37
|
}
|
|
38
38
|
res.setHeader('Content-Type', 'text/html');
|
|
39
39
|
res.setHeader('Cache-Control', 'no-cache');
|
|
40
|
-
(0, utils_1.appendServerConfiguredHeaders)(server, res);
|
|
41
40
|
res.end(processedHtml);
|
|
42
41
|
})
|
|
43
42
|
.catch((error) => next(error));
|
|
@@ -8,4 +8,5 @@
|
|
|
8
8
|
export { createAngularAssetsMiddleware } from './assets-middleware';
|
|
9
9
|
export { angularHtmlFallbackMiddleware } from './html-fallback-middleware';
|
|
10
10
|
export { createAngularIndexHtmlMiddleware } from './index-html-middleware';
|
|
11
|
-
export {
|
|
11
|
+
export { createAngularSsrExternalMiddleware, createAngularSsrInternalMiddleware, } from './ssr-middleware';
|
|
12
|
+
export { createAngularHeadersMiddleware } from './headers-middleware';
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.
|
|
10
|
+
exports.createAngularHeadersMiddleware = exports.createAngularSsrInternalMiddleware = exports.createAngularSsrExternalMiddleware = exports.createAngularIndexHtmlMiddleware = exports.angularHtmlFallbackMiddleware = exports.createAngularAssetsMiddleware = void 0;
|
|
11
11
|
var assets_middleware_1 = require("./assets-middleware");
|
|
12
12
|
Object.defineProperty(exports, "createAngularAssetsMiddleware", { enumerable: true, get: function () { return assets_middleware_1.createAngularAssetsMiddleware; } });
|
|
13
13
|
var html_fallback_middleware_1 = require("./html-fallback-middleware");
|
|
@@ -15,4 +15,7 @@ Object.defineProperty(exports, "angularHtmlFallbackMiddleware", { enumerable: tr
|
|
|
15
15
|
var index_html_middleware_1 = require("./index-html-middleware");
|
|
16
16
|
Object.defineProperty(exports, "createAngularIndexHtmlMiddleware", { enumerable: true, get: function () { return index_html_middleware_1.createAngularIndexHtmlMiddleware; } });
|
|
17
17
|
var ssr_middleware_1 = require("./ssr-middleware");
|
|
18
|
-
Object.defineProperty(exports, "
|
|
18
|
+
Object.defineProperty(exports, "createAngularSsrExternalMiddleware", { enumerable: true, get: function () { return ssr_middleware_1.createAngularSsrExternalMiddleware; } });
|
|
19
|
+
Object.defineProperty(exports, "createAngularSsrInternalMiddleware", { enumerable: true, get: function () { return ssr_middleware_1.createAngularSsrInternalMiddleware; } });
|
|
20
|
+
var headers_middleware_1 = require("./headers-middleware");
|
|
21
|
+
Object.defineProperty(exports, "createAngularHeadersMiddleware", { enumerable: true, get: function () { return headers_middleware_1.createAngularHeadersMiddleware; } });
|
|
@@ -6,4 +6,5 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
8
|
import type { Connect, ViteDevServer } from 'vite';
|
|
9
|
-
export declare function
|
|
9
|
+
export declare function createAngularSsrInternalMiddleware(server: ViteDevServer, indexHtmlTransformer?: (content: string) => Promise<string>): Connect.NextHandleFunction;
|
|
10
|
+
export declare function createAngularSsrExternalMiddleware(server: ViteDevServer, indexHtmlTransformer?: (content: string) => Promise<string>): Promise<Connect.NextHandleFunction>;
|
|
@@ -7,38 +7,82 @@
|
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
exports.createAngularSsrInternalMiddleware = createAngularSsrInternalMiddleware;
|
|
11
|
+
exports.createAngularSsrExternalMiddleware = createAngularSsrExternalMiddleware;
|
|
12
|
+
const load_esm_1 = require("../../../utils/load-esm");
|
|
13
|
+
function createAngularSsrInternalMiddleware(server, indexHtmlTransformer) {
|
|
13
14
|
let cachedAngularServerApp;
|
|
14
|
-
return function (req, res, next) {
|
|
15
|
+
return function angularSsrMiddleware(req, res, next) {
|
|
15
16
|
if (req.url === undefined) {
|
|
16
17
|
return next();
|
|
17
18
|
}
|
|
18
|
-
const resolvedUrls = server.resolvedUrls;
|
|
19
|
-
const baseUrl = resolvedUrls?.local[0] ?? resolvedUrls?.network[0];
|
|
20
|
-
const url = new URL(req.url, baseUrl);
|
|
21
19
|
(async () => {
|
|
20
|
+
const { writeResponseToNodeResponse, createWebRequestFromNodeRequest } = await (0, load_esm_1.loadEsmModule)('@angular/ssr/node');
|
|
22
21
|
const { ɵgetOrCreateAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs'));
|
|
23
22
|
const angularServerApp = ɵgetOrCreateAngularServerApp();
|
|
24
23
|
// Only Add the transform hook only if it's a different instance.
|
|
25
24
|
if (cachedAngularServerApp !== angularServerApp) {
|
|
26
|
-
angularServerApp.hooks.on('html:transform:pre', async ({ html }) => {
|
|
25
|
+
angularServerApp.hooks.on('html:transform:pre', async ({ html, url }) => {
|
|
27
26
|
const processedHtml = await server.transformIndexHtml(url.pathname, html);
|
|
28
27
|
return indexHtmlTransformer?.(processedHtml) ?? processedHtml;
|
|
29
28
|
});
|
|
30
29
|
cachedAngularServerApp = angularServerApp;
|
|
31
30
|
}
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
.
|
|
36
|
-
if (
|
|
31
|
+
const webReq = new Request(createWebRequestFromNodeRequest(req), {
|
|
32
|
+
signal: AbortSignal.timeout(30_000),
|
|
33
|
+
});
|
|
34
|
+
const webRes = await angularServerApp.render(webReq);
|
|
35
|
+
if (!webRes) {
|
|
37
36
|
return next();
|
|
38
37
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
})
|
|
42
|
-
.catch((error) => next(error));
|
|
38
|
+
return writeResponseToNodeResponse(webRes, res);
|
|
39
|
+
})().catch(next);
|
|
43
40
|
};
|
|
44
41
|
}
|
|
42
|
+
async function createAngularSsrExternalMiddleware(server, indexHtmlTransformer) {
|
|
43
|
+
let fallbackWarningShown = false;
|
|
44
|
+
let cachedAngularAppEngine;
|
|
45
|
+
let angularSsrInternalMiddleware;
|
|
46
|
+
const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } = await (0, load_esm_1.loadEsmModule)('@angular/ssr/node');
|
|
47
|
+
return function angularSsrExternalMiddleware(req, res, next) {
|
|
48
|
+
(async () => {
|
|
49
|
+
const { default: handler, AngularAppEngine } = (await server.ssrLoadModule('./server.mjs'));
|
|
50
|
+
if (!isSsrNodeRequestHandler(handler) && !isSsrRequestHandler(handler)) {
|
|
51
|
+
if (!fallbackWarningShown) {
|
|
52
|
+
// eslint-disable-next-line no-console
|
|
53
|
+
console.warn(`The default export in 'server.ts' does not provide a Node.js request handler. ` +
|
|
54
|
+
'Using the internal SSR middleware instead.');
|
|
55
|
+
fallbackWarningShown = true;
|
|
56
|
+
}
|
|
57
|
+
angularSsrInternalMiddleware ??= createAngularSsrInternalMiddleware(server, indexHtmlTransformer);
|
|
58
|
+
angularSsrInternalMiddleware(req, res, next);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
if (cachedAngularAppEngine !== AngularAppEngine) {
|
|
62
|
+
AngularAppEngine.ɵhooks.on('html:transform:pre', async ({ html, url }) => {
|
|
63
|
+
const processedHtml = await server.transformIndexHtml(url.pathname, html);
|
|
64
|
+
return indexHtmlTransformer?.(processedHtml) ?? processedHtml;
|
|
65
|
+
});
|
|
66
|
+
cachedAngularAppEngine = AngularAppEngine;
|
|
67
|
+
}
|
|
68
|
+
// Forward the request to the middleware in server.ts
|
|
69
|
+
if (isSsrNodeRequestHandler(handler)) {
|
|
70
|
+
await handler(req, res, next);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
const webRes = await handler(createWebRequestFromNodeRequest(req));
|
|
74
|
+
if (!webRes) {
|
|
75
|
+
next();
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
await writeResponseToNodeResponse(webRes, res);
|
|
79
|
+
}
|
|
80
|
+
})().catch(next);
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
function isSsrNodeRequestHandler(value) {
|
|
84
|
+
return typeof value === 'function' && '__ng_node_request_handler__' in value;
|
|
85
|
+
}
|
|
86
|
+
function isSsrRequestHandler(value) {
|
|
87
|
+
return typeof value === 'function' && '__ng_request_handler__' in value;
|
|
88
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
7
|
+
*/
|
|
8
|
+
import type { Plugin } from 'vite';
|
|
9
|
+
import { AngularMemoryOutputFiles } from '../utils';
|
|
10
|
+
interface AngularMemoryPluginOptions {
|
|
11
|
+
virtualProjectRoot: string;
|
|
12
|
+
outputFiles: AngularMemoryOutputFiles;
|
|
13
|
+
external?: string[];
|
|
14
|
+
}
|
|
15
|
+
export declare function createAngularMemoryPlugin(options: AngularMemoryPluginOptions): Promise<Plugin>;
|
|
16
|
+
export {};
|
|
@@ -11,13 +11,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.createAngularMemoryPlugin = createAngularMemoryPlugin;
|
|
14
|
-
const remapping_1 = __importDefault(require("@ampproject/remapping"));
|
|
15
14
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
16
15
|
const promises_1 = require("node:fs/promises");
|
|
17
16
|
const node_path_1 = require("node:path");
|
|
18
|
-
const
|
|
19
|
-
function createAngularMemoryPlugin(options) {
|
|
20
|
-
const {
|
|
17
|
+
const load_esm_1 = require("../../../utils/load-esm");
|
|
18
|
+
async function createAngularMemoryPlugin(options) {
|
|
19
|
+
const { virtualProjectRoot, outputFiles, external } = options;
|
|
20
|
+
const { normalizePath } = await (0, load_esm_1.loadEsmModule)('vite');
|
|
21
|
+
// See: https://github.com/vitejs/vite/blob/a34a73a3ad8feeacc98632c0f4c643b6820bbfda/packages/vite/src/node/server/pluginContainer.ts#L331-L334
|
|
22
|
+
const defaultImporter = (0, node_path_1.join)(virtualProjectRoot, 'index.html');
|
|
21
23
|
return {
|
|
22
24
|
name: 'vite:angular-memory',
|
|
23
25
|
// Ensures plugin hooks run before built-in Vite hooks
|
|
@@ -29,11 +31,19 @@ function createAngularMemoryPlugin(options) {
|
|
|
29
31
|
// `/@id/${source}` but is currently closer to a raw external than a resolved file path.
|
|
30
32
|
return source;
|
|
31
33
|
}
|
|
32
|
-
if (importer
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
if (importer) {
|
|
35
|
+
let normalizedSource;
|
|
36
|
+
if (source[0] === '.' && normalizePath(importer).startsWith(virtualProjectRoot)) {
|
|
37
|
+
// Remove query if present
|
|
38
|
+
const [importerFile] = importer.split('?', 1);
|
|
39
|
+
normalizedSource = (0, node_path_1.join)((0, node_path_1.dirname)((0, node_path_1.relative)(virtualProjectRoot, importerFile)), source);
|
|
40
|
+
}
|
|
41
|
+
else if (source[0] === '/' && importer === defaultImporter) {
|
|
42
|
+
normalizedSource = (0, node_path_1.basename)(source);
|
|
43
|
+
}
|
|
44
|
+
if (normalizedSource) {
|
|
45
|
+
source = '/' + normalizePath(normalizedSource);
|
|
46
|
+
}
|
|
37
47
|
}
|
|
38
48
|
const [file] = source.split('?', 1);
|
|
39
49
|
if (outputFiles.has(file)) {
|
|
@@ -58,37 +68,6 @@ function createAngularMemoryPlugin(options) {
|
|
|
58
68
|
map: mapContents && Buffer.from(mapContents).toString('utf-8'),
|
|
59
69
|
};
|
|
60
70
|
},
|
|
61
|
-
// eslint-disable-next-line max-lines-per-function
|
|
62
|
-
configureServer(server) {
|
|
63
|
-
const originalssrTransform = server.ssrTransform;
|
|
64
|
-
server.ssrTransform = async (code, map, url, originalCode) => {
|
|
65
|
-
const result = await originalssrTransform(code, null, url, originalCode);
|
|
66
|
-
if (!result || !result.map || !map) {
|
|
67
|
-
return result;
|
|
68
|
-
}
|
|
69
|
-
const remappedMap = (0, remapping_1.default)([result.map, map], () => null);
|
|
70
|
-
// Set the sourcemap root to the workspace root. This is needed since we set a virtual path as root.
|
|
71
|
-
remappedMap.sourceRoot = normalizePath(workspaceRoot) + '/';
|
|
72
|
-
return {
|
|
73
|
-
...result,
|
|
74
|
-
map: remappedMap,
|
|
75
|
-
};
|
|
76
|
-
};
|
|
77
|
-
// Assets and resources get handled first
|
|
78
|
-
server.middlewares.use((0, middlewares_1.createAngularAssetsMiddleware)(server, assets, outputFiles, usedComponentStyles));
|
|
79
|
-
if (extensionMiddleware?.length) {
|
|
80
|
-
extensionMiddleware.forEach((middleware) => server.middlewares.use(middleware));
|
|
81
|
-
}
|
|
82
|
-
// Returning a function, installs middleware after the main transform middleware but
|
|
83
|
-
// before the built-in HTML middleware
|
|
84
|
-
return () => {
|
|
85
|
-
if (ssr) {
|
|
86
|
-
server.middlewares.use((0, middlewares_1.createAngularSSRMiddleware)(server, indexHtmlTransformer));
|
|
87
|
-
}
|
|
88
|
-
server.middlewares.use(middlewares_1.angularHtmlFallbackMiddleware);
|
|
89
|
-
server.middlewares.use((0, middlewares_1.createAngularIndexHtmlMiddleware)(server, outputFiles, indexHtmlTransformer));
|
|
90
|
-
};
|
|
91
|
-
},
|
|
92
71
|
};
|
|
93
72
|
}
|
|
94
73
|
/**
|
|
@@ -6,10 +6,6 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
8
|
import type { Plugin } from 'vite';
|
|
9
|
-
/**
|
|
10
|
-
* The base module location used to search for locale specific data.
|
|
11
|
-
*/
|
|
12
|
-
export declare const LOCALE_DATA_BASE_MODULE = "@angular/common/locales/global";
|
|
13
9
|
/**
|
|
14
10
|
* Creates a Vite plugin that resolves Angular locale data files from `@angular/common`.
|
|
15
11
|
*
|
|
@@ -7,12 +7,11 @@
|
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.LOCALE_DATA_BASE_MODULE = void 0;
|
|
11
10
|
exports.createAngularLocaleDataPlugin = createAngularLocaleDataPlugin;
|
|
12
11
|
/**
|
|
13
12
|
* The base module location used to search for locale specific data.
|
|
14
13
|
*/
|
|
15
|
-
|
|
14
|
+
const LOCALE_DATA_BASE_MODULE = '@angular/common/locales/global';
|
|
16
15
|
/**
|
|
17
16
|
* Creates a Vite plugin that resolves Angular locale data files from `@angular/common`.
|
|
18
17
|
*
|
|
@@ -32,7 +31,7 @@ function createAngularLocaleDataPlugin() {
|
|
|
32
31
|
let partialLocale = originalLocale.replace(/-x(-[a-zA-Z0-9]{1,8})+$/, '');
|
|
33
32
|
let exact = true;
|
|
34
33
|
while (partialLocale) {
|
|
35
|
-
const potentialPath = `${
|
|
34
|
+
const potentialPath = `${LOCALE_DATA_BASE_MODULE}/${partialLocale}`;
|
|
36
35
|
const result = await this.resolve(potentialPath);
|
|
37
36
|
if (result) {
|
|
38
37
|
if (!exact) {
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
7
|
+
*/
|
|
8
|
+
export { createAngularMemoryPlugin } from './angular-memory-plugin';
|
|
9
|
+
export { createAngularLocaleDataPlugin } from './i18n-locale-plugin';
|
|
10
|
+
export { createRemoveIdPrefixPlugin } from './id-prefix-plugin';
|
|
11
|
+
export { createAngularSetupMiddlewaresPlugin, ServerSsrMode } from './setup-middlewares-plugin';
|
|
12
|
+
export { createAngularSsrTransformPlugin } from './ssr-transform-plugin';
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.createAngularSsrTransformPlugin = exports.ServerSsrMode = exports.createAngularSetupMiddlewaresPlugin = exports.createRemoveIdPrefixPlugin = exports.createAngularLocaleDataPlugin = exports.createAngularMemoryPlugin = void 0;
|
|
11
|
+
var angular_memory_plugin_1 = require("./angular-memory-plugin");
|
|
12
|
+
Object.defineProperty(exports, "createAngularMemoryPlugin", { enumerable: true, get: function () { return angular_memory_plugin_1.createAngularMemoryPlugin; } });
|
|
13
|
+
var i18n_locale_plugin_1 = require("./i18n-locale-plugin");
|
|
14
|
+
Object.defineProperty(exports, "createAngularLocaleDataPlugin", { enumerable: true, get: function () { return i18n_locale_plugin_1.createAngularLocaleDataPlugin; } });
|
|
15
|
+
var id_prefix_plugin_1 = require("./id-prefix-plugin");
|
|
16
|
+
Object.defineProperty(exports, "createRemoveIdPrefixPlugin", { enumerable: true, get: function () { return id_prefix_plugin_1.createRemoveIdPrefixPlugin; } });
|
|
17
|
+
var setup_middlewares_plugin_1 = require("./setup-middlewares-plugin");
|
|
18
|
+
Object.defineProperty(exports, "createAngularSetupMiddlewaresPlugin", { enumerable: true, get: function () { return setup_middlewares_plugin_1.createAngularSetupMiddlewaresPlugin; } });
|
|
19
|
+
Object.defineProperty(exports, "ServerSsrMode", { enumerable: true, get: function () { return setup_middlewares_plugin_1.ServerSsrMode; } });
|
|
20
|
+
var ssr_transform_plugin_1 = require("./ssr-transform-plugin");
|
|
21
|
+
Object.defineProperty(exports, "createAngularSsrTransformPlugin", { enumerable: true, get: function () { return ssr_transform_plugin_1.createAngularSsrTransformPlugin; } });
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
7
|
+
*/
|
|
8
|
+
import type { Connect, Plugin } from 'vite';
|
|
9
|
+
import { AngularMemoryOutputFiles } from '../utils';
|
|
10
|
+
export declare enum ServerSsrMode {
|
|
11
|
+
/**
|
|
12
|
+
* No SSR
|
|
13
|
+
*/
|
|
14
|
+
NoSsr = 0,
|
|
15
|
+
/**
|
|
16
|
+
* Internal server-side rendering (SSR) is handled through the built-in middleware.
|
|
17
|
+
*
|
|
18
|
+
* In this mode, the SSR process is managed internally by the dev-server's middleware.
|
|
19
|
+
* The server automatically renders pages on the server without requiring external
|
|
20
|
+
* middleware or additional configuration from the developer.
|
|
21
|
+
*/
|
|
22
|
+
InternalSsrMiddleware = 1,
|
|
23
|
+
/**
|
|
24
|
+
* External server-side rendering (SSR) is handled by a custom middleware defined in server.ts.
|
|
25
|
+
*
|
|
26
|
+
* This mode allows developers to define custom SSR behavior by providing a middleware in the
|
|
27
|
+
* `server.ts` file. It gives more flexibility for handling SSR, such as integrating with other
|
|
28
|
+
* frameworks or customizing the rendering pipeline.
|
|
29
|
+
*/
|
|
30
|
+
ExternalSsrMiddleware = 2
|
|
31
|
+
}
|
|
32
|
+
interface AngularSetupMiddlewaresPluginOptions {
|
|
33
|
+
outputFiles: AngularMemoryOutputFiles;
|
|
34
|
+
assets: Map<string, string>;
|
|
35
|
+
extensionMiddleware?: Connect.NextHandleFunction[];
|
|
36
|
+
indexHtmlTransformer?: (content: string) => Promise<string>;
|
|
37
|
+
usedComponentStyles: Map<string, string[]>;
|
|
38
|
+
ssrMode: ServerSsrMode;
|
|
39
|
+
}
|
|
40
|
+
export declare function createAngularSetupMiddlewaresPlugin(options: AngularSetupMiddlewaresPluginOptions): Plugin;
|
|
41
|
+
export {};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.ServerSsrMode = void 0;
|
|
11
|
+
exports.createAngularSetupMiddlewaresPlugin = createAngularSetupMiddlewaresPlugin;
|
|
12
|
+
const middlewares_1 = require("../middlewares");
|
|
13
|
+
var ServerSsrMode;
|
|
14
|
+
(function (ServerSsrMode) {
|
|
15
|
+
/**
|
|
16
|
+
* No SSR
|
|
17
|
+
*/
|
|
18
|
+
ServerSsrMode[ServerSsrMode["NoSsr"] = 0] = "NoSsr";
|
|
19
|
+
/**
|
|
20
|
+
* Internal server-side rendering (SSR) is handled through the built-in middleware.
|
|
21
|
+
*
|
|
22
|
+
* In this mode, the SSR process is managed internally by the dev-server's middleware.
|
|
23
|
+
* The server automatically renders pages on the server without requiring external
|
|
24
|
+
* middleware or additional configuration from the developer.
|
|
25
|
+
*/
|
|
26
|
+
ServerSsrMode[ServerSsrMode["InternalSsrMiddleware"] = 1] = "InternalSsrMiddleware";
|
|
27
|
+
/**
|
|
28
|
+
* External server-side rendering (SSR) is handled by a custom middleware defined in server.ts.
|
|
29
|
+
*
|
|
30
|
+
* This mode allows developers to define custom SSR behavior by providing a middleware in the
|
|
31
|
+
* `server.ts` file. It gives more flexibility for handling SSR, such as integrating with other
|
|
32
|
+
* frameworks or customizing the rendering pipeline.
|
|
33
|
+
*/
|
|
34
|
+
ServerSsrMode[ServerSsrMode["ExternalSsrMiddleware"] = 2] = "ExternalSsrMiddleware";
|
|
35
|
+
})(ServerSsrMode || (exports.ServerSsrMode = ServerSsrMode = {}));
|
|
36
|
+
function createAngularSetupMiddlewaresPlugin(options) {
|
|
37
|
+
return {
|
|
38
|
+
name: 'vite:angular-setup-middlewares',
|
|
39
|
+
enforce: 'pre',
|
|
40
|
+
configureServer(server) {
|
|
41
|
+
const { indexHtmlTransformer, outputFiles, extensionMiddleware, assets, usedComponentStyles, ssrMode, } = options;
|
|
42
|
+
// Headers, assets and resources get handled first
|
|
43
|
+
server.middlewares.use((0, middlewares_1.createAngularHeadersMiddleware)(server));
|
|
44
|
+
server.middlewares.use((0, middlewares_1.createAngularAssetsMiddleware)(server, assets, outputFiles, usedComponentStyles));
|
|
45
|
+
extensionMiddleware?.forEach((middleware) => server.middlewares.use(middleware));
|
|
46
|
+
// Returning a function, installs middleware after the main transform middleware but
|
|
47
|
+
// before the built-in HTML middleware
|
|
48
|
+
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
49
|
+
return async () => {
|
|
50
|
+
if (ssrMode === ServerSsrMode.ExternalSsrMiddleware) {
|
|
51
|
+
server.middlewares.use(await (0, middlewares_1.createAngularSsrExternalMiddleware)(server, indexHtmlTransformer));
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
if (ssrMode === ServerSsrMode.InternalSsrMiddleware) {
|
|
55
|
+
server.middlewares.use((0, middlewares_1.createAngularSsrInternalMiddleware)(server, indexHtmlTransformer));
|
|
56
|
+
}
|
|
57
|
+
server.middlewares.use(middlewares_1.angularHtmlFallbackMiddleware);
|
|
58
|
+
server.middlewares.use((0, middlewares_1.createAngularIndexHtmlMiddleware)(server, outputFiles, indexHtmlTransformer));
|
|
59
|
+
};
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
7
|
+
*/
|
|
8
|
+
import type { Plugin } from 'vite';
|
|
9
|
+
export declare function createAngularSsrTransformPlugin(workspaceRoot: string): Promise<Plugin>;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
8
|
+
*/
|
|
9
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.createAngularSsrTransformPlugin = createAngularSsrTransformPlugin;
|
|
14
|
+
const remapping_1 = __importDefault(require("@ampproject/remapping"));
|
|
15
|
+
const load_esm_1 = require("../../../utils/load-esm");
|
|
16
|
+
async function createAngularSsrTransformPlugin(workspaceRoot) {
|
|
17
|
+
const { normalizePath } = await (0, load_esm_1.loadEsmModule)('vite');
|
|
18
|
+
return {
|
|
19
|
+
name: 'vite:angular-ssr-transform',
|
|
20
|
+
enforce: 'pre',
|
|
21
|
+
async configureServer(server) {
|
|
22
|
+
const originalssrTransform = server.ssrTransform;
|
|
23
|
+
server.ssrTransform = async (code, map, url, originalCode) => {
|
|
24
|
+
const result = await originalssrTransform(code, null, url, originalCode);
|
|
25
|
+
if (!result || !result.map || !map) {
|
|
26
|
+
return result;
|
|
27
|
+
}
|
|
28
|
+
const remappedMap = (0, remapping_1.default)([result.map, map], () => null);
|
|
29
|
+
// Set the sourcemap root to the workspace root. This is needed since we set a virtual path as root.
|
|
30
|
+
remappedMap.sourceRoot = normalizePath(workspaceRoot) + '/';
|
|
31
|
+
return {
|
|
32
|
+
...result,
|
|
33
|
+
map: remappedMap,
|
|
34
|
+
};
|
|
35
|
+
};
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
}
|
|
@@ -5,12 +5,9 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
|
-
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
9
|
-
import type { ViteDevServer } from 'vite';
|
|
10
8
|
export type AngularMemoryOutputFiles = Map<string, {
|
|
11
9
|
contents: Uint8Array;
|
|
12
10
|
servable: boolean;
|
|
13
11
|
}>;
|
|
14
12
|
export declare function pathnameWithoutBasePath(url: string, basePath: string): string;
|
|
15
13
|
export declare function lookupMimeTypeFromRequest(url: string): string | undefined;
|
|
16
|
-
export declare function appendServerConfiguredHeaders(server: ViteDevServer, res: ServerResponse<IncomingMessage>): void;
|
package/src/tools/vite/utils.js
CHANGED
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.pathnameWithoutBasePath = pathnameWithoutBasePath;
|
|
11
11
|
exports.lookupMimeTypeFromRequest = lookupMimeTypeFromRequest;
|
|
12
|
-
exports.appendServerConfiguredHeaders = appendServerConfiguredHeaders;
|
|
13
12
|
const mrmime_1 = require("mrmime");
|
|
14
13
|
const node_path_1 = require("node:path");
|
|
15
14
|
function pathnameWithoutBasePath(url, basePath) {
|
|
@@ -27,14 +26,3 @@ function lookupMimeTypeFromRequest(url) {
|
|
|
27
26
|
}
|
|
28
27
|
return extension && (0, mrmime_1.lookup)(extension);
|
|
29
28
|
}
|
|
30
|
-
function appendServerConfiguredHeaders(server, res) {
|
|
31
|
-
const headers = server.config.server.headers;
|
|
32
|
-
if (!headers) {
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
for (const [name, value] of Object.entries(headers)) {
|
|
36
|
-
if (value !== undefined) {
|
|
37
|
-
res.setHeader(name, value);
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}
|
package/src/typings.d.ts
CHANGED
|
@@ -17,3 +17,10 @@
|
|
|
17
17
|
declare module 'esbuild' {
|
|
18
18
|
export * from 'esbuild-wasm';
|
|
19
19
|
}
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Augment the Node.js module builtin types to support the v22.8+ compile cache functions
|
|
23
|
+
*/
|
|
24
|
+
declare module 'node:module' {
|
|
25
|
+
function getCompileCacheDir(): string | undefined;
|
|
26
|
+
}
|
|
@@ -15,3 +15,5 @@ export declare const shouldWatchRoot: boolean;
|
|
|
15
15
|
export declare const useTypeChecking: boolean;
|
|
16
16
|
export declare const useJSONBuildLogs: boolean;
|
|
17
17
|
export declare const shouldOptimizeChunks: boolean;
|
|
18
|
+
export declare const useComponentStyleHmr: boolean;
|
|
19
|
+
export declare const usePartialSsrBuild: boolean;
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.shouldOptimizeChunks = exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
|
|
10
|
+
exports.usePartialSsrBuild = exports.useComponentStyleHmr = exports.shouldOptimizeChunks = exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
|
|
11
11
|
const node_os_1 = require("node:os");
|
|
12
12
|
function isDisabled(variable) {
|
|
13
13
|
return variable === '0' || variable.toLowerCase() === 'false';
|
|
@@ -82,3 +82,7 @@ const buildLogsJsonVariable = process.env['NG_BUILD_LOGS_JSON'];
|
|
|
82
82
|
exports.useJSONBuildLogs = isPresent(buildLogsJsonVariable) && isEnabled(buildLogsJsonVariable);
|
|
83
83
|
const optimizeChunksVariable = process.env['NG_BUILD_OPTIMIZE_CHUNKS'];
|
|
84
84
|
exports.shouldOptimizeChunks = isPresent(optimizeChunksVariable) && isEnabled(optimizeChunksVariable);
|
|
85
|
+
const hmrComponentStylesVariable = process.env['NG_HMR_CSTYLES'];
|
|
86
|
+
exports.useComponentStyleHmr = isPresent(hmrComponentStylesVariable) && isEnabled(hmrComponentStylesVariable);
|
|
87
|
+
const partialSsrBuildVariable = process.env['NG_BUILD_PARTIAL_SSR'];
|
|
88
|
+
exports.usePartialSsrBuild = isPresent(partialSsrBuildVariable) && isEnabled(partialSsrBuildVariable);
|
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.normalizeCacheOptions = normalizeCacheOptions;
|
|
11
11
|
const node_path_1 = require("node:path");
|
|
12
12
|
/** Version placeholder is replaced during the build process with actual package version */
|
|
13
|
-
const VERSION = '19.0.0-next.
|
|
13
|
+
const VERSION = '19.0.0-next.8';
|
|
14
14
|
function hasCacheMetadata(value) {
|
|
15
15
|
return (!!value &&
|
|
16
16
|
typeof value === 'object' &&
|