@nx/angular 21.2.0-beta.1 → 21.2.0-beta.2
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/README.md +1 -1
- package/fesm2022/nx-angular-mf.mjs +10 -3
- package/fesm2022/nx-angular-mf.mjs.map +1 -1
- package/package.json +9 -9
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/entry-point.js +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.transform.js +22 -9
- package/src/generators/application/files/base/tsconfig.json__tpl__ +2 -2
- package/src/generators/application/lib/update-tsconfig-files.js +19 -2
- package/src/generators/convert-to-rspack/convert-to-rspack.d.ts +1 -1
- package/src/generators/convert-to-rspack/convert-to-rspack.js +171 -22
- package/src/generators/library/lib/update-tsconfig-files.js +15 -2
- package/src/generators/library/library.js +1 -1
package/README.md
CHANGED
@@ -22,7 +22,7 @@
|
|
22
22
|
|
23
23
|
# Nx: Smart Repos · Fast Builds
|
24
24
|
|
25
|
-
|
25
|
+
An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
|
26
26
|
|
27
27
|
This package is an [Angular plugin for Nx](https://nx.dev/nx-api/angular).
|
28
28
|
|
@@ -1,3 +1,5 @@
|
|
1
|
+
import { extname } from 'node:path';
|
2
|
+
|
1
3
|
let resolveRemoteUrl;
|
2
4
|
/**
|
3
5
|
* @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.
|
@@ -104,10 +106,15 @@ async function loadRemoteContainer(remoteName) {
|
|
104
106
|
const remoteUrl = remoteUrlDefinitions
|
105
107
|
? remoteUrlDefinitions[remoteName]
|
106
108
|
: await resolveRemoteUrl(remoteName);
|
107
|
-
|
108
|
-
|
109
|
-
|
109
|
+
const url = new URL(remoteUrl);
|
110
|
+
const ext = extname(url.pathname);
|
111
|
+
const needsRemoteEntry = !['.js', '.mjs', '.json'].includes(ext);
|
112
|
+
if (needsRemoteEntry) {
|
113
|
+
url.pathname = url.pathname.endsWith('/')
|
114
|
+
? `${url.pathname}remoteEntry.mjs`
|
115
|
+
: `${url.pathname}/remoteEntry.mjs`;
|
110
116
|
}
|
117
|
+
const containerUrl = url.href;
|
111
118
|
const container = await loadModule(containerUrl);
|
112
119
|
await container.init(__webpack_share_scopes__.default);
|
113
120
|
remoteContainerMap.set(remoteName, container);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"nx-angular-mf.mjs","sources":["../tmp-esm2022/mf/mf.js","../tmp-esm2022/mf/nx-angular-mf.js"],"sourcesContent":["let resolveRemoteUrl;\n/**\n * @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n */\nexport function setRemoteUrlResolver(_resolveRemoteUrl) {\n resolveRemoteUrl = _resolveRemoteUrl;\n}\nlet remoteUrlDefinitions;\n/**\n * @deprecated Use init() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you have a remote app called `my-remote-app` and you want to use the `http://localhost:4201/mf-manifest.json` as the remote url, you should change it from:\n * ```ts\n * import { setRemoteDefinitions } from '@nx/angular/mf';\n *\n * setRemoteDefinitions({\n * 'my-remote-app': 'http://localhost:4201/mf-manifest.json'\n * });\n * ```\n * to use init():\n * ```ts\n * import { init } from '@module-federation/enhanced/runtime';\n *\n * init({\n * name: 'host',\n * remotes: [{\n * name: 'my-remote-app',\n * entry: 'http://localhost:4201/mf-manifest.json'\n * }]\n * });\n * ```\n */\nexport function setRemoteDefinitions(definitions) {\n remoteUrlDefinitions = definitions;\n}\n/**\n * @deprecated Use registerRemotes() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a remote app with `setRemoteDefinition` such as:\n * ```ts\n * import { setRemoteDefinition } from '@nx/angular/mf';\n *\n * setRemoteDefinition(\n * 'my-remote-app',\n * 'http://localhost:4201/mf-manifest.json'\n * );\n * ```\n * change it to use registerRemotes():\n * ```ts\n * import { registerRemotes } from '@module-federation/enhanced/runtime';\n *\n * registerRemotes([\n * {\n * name: 'my-remote-app',\n * entry: 'http://localhost:4201/mf-manifest.json'\n * }\n * ]);\n * ```\n */\nexport function setRemoteDefinition(remoteName, remoteUrl) {\n remoteUrlDefinitions ??= {};\n remoteUrlDefinitions[remoteName] = remoteUrl;\n}\nlet remoteModuleMap = new Map();\nlet remoteContainerMap = new Map();\n/**\n * @deprecated Use loadRemote() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a load a remote with `loadRemoteModule` such as:\n * ```ts\n * import { loadRemoteModule } from '@nx/angular/mf';\n *\n * loadRemoteModule('my-remote-app', './Module').then(m => m.RemoteEntryModule);\n * ```\n * change it to use loadRemote():\n * ```ts\n * import { loadRemote } from '@module-federation/enhanced/runtime';\n *\n * loadRemote<typeof import('my-remote-app/Module')>('my-remote-app/Module').then(m => m.RemoteEntryModule);\n * ```\n */\nexport async function loadRemoteModule(remoteName, moduleName) {\n const remoteModuleKey = `${remoteName}:${moduleName}`;\n if (remoteModuleMap.has(remoteModuleKey)) {\n return remoteModuleMap.get(remoteModuleKey);\n }\n const container = remoteContainerMap.has(remoteName)\n ? remoteContainerMap.get(remoteName)\n : await loadRemoteContainer(remoteName);\n const factory = await container.get(moduleName);\n const Module = factory();\n remoteModuleMap.set(remoteModuleKey, Module);\n return Module;\n}\nfunction loadModule(url) {\n return import(/* webpackIgnore:true */ url);\n}\nlet initialSharingScopeCreated = false;\nasync function loadRemoteContainer(remoteName) {\n if (!resolveRemoteUrl && !remoteUrlDefinitions) {\n throw new Error('Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.');\n }\n if (!initialSharingScopeCreated) {\n initialSharingScopeCreated = true;\n await __webpack_init_sharing__('default');\n }\n const remoteUrl = remoteUrlDefinitions\n ? remoteUrlDefinitions[remoteName]\n : await resolveRemoteUrl(remoteName);\n let containerUrl = remoteUrl;\n if (!remoteUrl.endsWith('.mjs') && !remoteUrl.endsWith('.js')) {\n containerUrl = `${remoteUrl}${remoteUrl.endsWith('/') ? '' : '/'}remoteEntry.mjs`;\n }\n const container = await loadModule(containerUrl);\n await container.init(__webpack_share_scopes__.default);\n remoteContainerMap.set(remoteName, container);\n return container;\n}\n//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mf.js","sourceRoot":"","sources":["../../../../../packages/angular/mf/mf.ts"],"names":[],"mappings":"AAOA,IAAI,gBAA0C,CAAC;AAE/C;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,iBAA2C;IAE3C,gBAAgB,GAAG,iBAAiB,CAAC;AACvC,CAAC;AAED,IAAI,oBAA4C,CAAC;AAEjD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,oBAAoB,CAAC,WAAmC;IACtE,oBAAoB,GAAG,WAAW,CAAC;AACrC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,mBAAmB,CAAC,UAAkB,EAAE,SAAiB;IACvE,oBAAoB,KAAK,EAAE,CAAC;IAC5B,oBAAoB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;AAC/C,CAAC;AAED,IAAI,eAAe,GAAG,IAAI,GAAG,EAAmB,CAAC;AACjD,IAAI,kBAAkB,GAAG,IAAI,GAAG,EAAmB,CAAC;AAEpD;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,UAAkB,EAAE,UAAkB;IAC3E,MAAM,eAAe,GAAG,GAAG,UAAU,IAAI,UAAU,EAAE,CAAC;IACtD,IAAI,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;QACzC,OAAO,eAAe,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC;QAClD,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC;QACpC,CAAC,CAAC,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAE1C,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC;IAEzB,eAAe,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAE7C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,GAAW;IAC7B,OAAO,MAAM,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;AAC9C,CAAC;AAED,IAAI,0BAA0B,GAAG,KAAK,CAAC;AAEvC,KAAK,UAAU,mBAAmB,CAAC,UAAkB;IACnD,IAAI,CAAC,gBAAgB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACb,kHAAkH,CACnH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChC,0BAA0B,GAAG,IAAI,CAAC;QAClC,MAAM,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,SAAS,GAAG,oBAAoB;QACpC,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC;QAClC,CAAC,CAAC,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAEvC,IAAI,YAAY,GAAG,SAAS,CAAC;IAC7B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9D,YAAY,GAAG,GAAG,SAAS,GACzB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GACjC,iBAAiB,CAAC;IACpB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,CAAC;IACjD,MAAM,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAEvD,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC9C,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["export type ResolveRemoteUrlFunction = (\n  remoteName: string\n) => string | Promise<string>;\n\ndeclare const __webpack_init_sharing__: (scope: 'default') => Promise<void>;\ndeclare const __webpack_share_scopes__: { default: unknown };\n\nlet resolveRemoteUrl: ResolveRemoteUrlFunction;\n\n/**\n * @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n */\nexport function setRemoteUrlResolver(\n  _resolveRemoteUrl: ResolveRemoteUrlFunction\n) {\n  resolveRemoteUrl = _resolveRemoteUrl;\n}\n\nlet remoteUrlDefinitions: Record<string, string>;\n\n/**\n * @deprecated Use init() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you have a remote app called `my-remote-app` and you want to use the `http://localhost:4201/mf-manifest.json` as the remote url, you should change it from:\n * ```ts\n * import { setRemoteDefinitions } from '@nx/angular/mf';\n *\n * setRemoteDefinitions({\n *   'my-remote-app': 'http://localhost:4201/mf-manifest.json'\n * });\n * ```\n * to use init():\n * ```ts\n * import { init } from '@module-federation/enhanced/runtime';\n *\n * init({\n *   name: 'host',\n *   remotes: [{\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }]\n * });\n * ```\n */\nexport function setRemoteDefinitions(definitions: Record<string, string>) {\n  remoteUrlDefinitions = definitions;\n}\n\n/**\n * @deprecated Use registerRemotes() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a remote app with `setRemoteDefinition` such as:\n * ```ts\n * import { setRemoteDefinition } from '@nx/angular/mf';\n *\n * setRemoteDefinition(\n *   'my-remote-app',\n *   'http://localhost:4201/mf-manifest.json'\n * );\n * ```\n * change it to use registerRemotes():\n * ```ts\n * import { registerRemotes } from '@module-federation/enhanced/runtime';\n *\n * registerRemotes([\n *  {\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }\n * ]);\n * ```\n */\nexport function setRemoteDefinition(remoteName: string, remoteUrl: string) {\n  remoteUrlDefinitions ??= {};\n  remoteUrlDefinitions[remoteName] = remoteUrl;\n}\n\nlet remoteModuleMap = new Map<string, unknown>();\nlet remoteContainerMap = new Map<string, unknown>();\n\n/**\n * @deprecated Use loadRemote() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a load a remote with `loadRemoteModule` such as:\n * ```ts\n * import { loadRemoteModule } from '@nx/angular/mf';\n *\n * loadRemoteModule('my-remote-app', './Module').then(m => m.RemoteEntryModule);\n * ```\n * change it to use loadRemote():\n * ```ts\n * import { loadRemote } from '@module-federation/enhanced/runtime';\n *\n * loadRemote<typeof import('my-remote-app/Module')>('my-remote-app/Module').then(m => m.RemoteEntryModule);\n * ```\n */\nexport async function loadRemoteModule(remoteName: string, moduleName: string) {\n  const remoteModuleKey = `${remoteName}:${moduleName}`;\n  if (remoteModuleMap.has(remoteModuleKey)) {\n    return remoteModuleMap.get(remoteModuleKey);\n  }\n\n  const container = remoteContainerMap.has(remoteName)\n    ? remoteContainerMap.get(remoteName)\n    : await loadRemoteContainer(remoteName);\n\n  const factory = await container.get(moduleName);\n  const Module = factory();\n\n  remoteModuleMap.set(remoteModuleKey, Module);\n\n  return Module;\n}\n\nfunction loadModule(url: string) {\n  return import(/* webpackIgnore:true */ url);\n}\n\nlet initialSharingScopeCreated = false;\n\nasync function loadRemoteContainer(remoteName: string) {\n  if (!resolveRemoteUrl && !remoteUrlDefinitions) {\n    throw new Error(\n      'Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.'\n    );\n  }\n\n  if (!initialSharingScopeCreated) {\n    initialSharingScopeCreated = true;\n    await __webpack_init_sharing__('default');\n  }\n\n  const remoteUrl = remoteUrlDefinitions\n    ? remoteUrlDefinitions[remoteName]\n    : await resolveRemoteUrl(remoteName);\n\n  let containerUrl = remoteUrl;\n  if (!remoteUrl.endsWith('.mjs') && !remoteUrl.endsWith('.js')) {\n    containerUrl = `${remoteUrl}${\n      remoteUrl.endsWith('/') ? '' : '/'\n    }remoteEntry.mjs`;\n  }\n\n  const container = await loadModule(containerUrl);\n  await container.init(__webpack_share_scopes__.default);\n\n  remoteContainerMap.set(remoteName, container);\n  return container;\n}\n"]}","/**\n * Generated bundle index. Do not edit.\n */\nexport * from './index';\n//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibngtYW5ndWxhci1tZi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvbWYvbngtYW5ndWxhci1tZi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUVILGNBQWMsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBHZW5lcmF0ZWQgYnVuZGxlIGluZGV4LiBEbyBub3QgZWRpdC5cbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL2luZGV4JztcbiJdfQ=="],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"nx-angular-mf.mjs","sources":["../tmp-esm2022/mf/mf.js","../tmp-esm2022/mf/nx-angular-mf.js"],"sourcesContent":["import { extname } from 'node:path';\nlet resolveRemoteUrl;\n/**\n * @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n */\nexport function setRemoteUrlResolver(_resolveRemoteUrl) {\n resolveRemoteUrl = _resolveRemoteUrl;\n}\nlet remoteUrlDefinitions;\n/**\n * @deprecated Use init() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you have a remote app called `my-remote-app` and you want to use the `http://localhost:4201/mf-manifest.json` as the remote url, you should change it from:\n * ```ts\n * import { setRemoteDefinitions } from '@nx/angular/mf';\n *\n * setRemoteDefinitions({\n * 'my-remote-app': 'http://localhost:4201/mf-manifest.json'\n * });\n * ```\n * to use init():\n * ```ts\n * import { init } from '@module-federation/enhanced/runtime';\n *\n * init({\n * name: 'host',\n * remotes: [{\n * name: 'my-remote-app',\n * entry: 'http://localhost:4201/mf-manifest.json'\n * }]\n * });\n * ```\n */\nexport function setRemoteDefinitions(definitions) {\n remoteUrlDefinitions = definitions;\n}\n/**\n * @deprecated Use registerRemotes() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a remote app with `setRemoteDefinition` such as:\n * ```ts\n * import { setRemoteDefinition } from '@nx/angular/mf';\n *\n * setRemoteDefinition(\n * 'my-remote-app',\n * 'http://localhost:4201/mf-manifest.json'\n * );\n * ```\n * change it to use registerRemotes():\n * ```ts\n * import { registerRemotes } from '@module-federation/enhanced/runtime';\n *\n * registerRemotes([\n * {\n * name: 'my-remote-app',\n * entry: 'http://localhost:4201/mf-manifest.json'\n * }\n * ]);\n * ```\n */\nexport function setRemoteDefinition(remoteName, remoteUrl) {\n remoteUrlDefinitions ??= {};\n remoteUrlDefinitions[remoteName] = remoteUrl;\n}\nlet remoteModuleMap = new Map();\nlet remoteContainerMap = new Map();\n/**\n * @deprecated Use loadRemote() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a load a remote with `loadRemoteModule` such as:\n * ```ts\n * import { loadRemoteModule } from '@nx/angular/mf';\n *\n * loadRemoteModule('my-remote-app', './Module').then(m => m.RemoteEntryModule);\n * ```\n * change it to use loadRemote():\n * ```ts\n * import { loadRemote } from '@module-federation/enhanced/runtime';\n *\n * loadRemote<typeof import('my-remote-app/Module')>('my-remote-app/Module').then(m => m.RemoteEntryModule);\n * ```\n */\nexport async function loadRemoteModule(remoteName, moduleName) {\n const remoteModuleKey = `${remoteName}:${moduleName}`;\n if (remoteModuleMap.has(remoteModuleKey)) {\n return remoteModuleMap.get(remoteModuleKey);\n }\n const container = remoteContainerMap.has(remoteName)\n ? remoteContainerMap.get(remoteName)\n : await loadRemoteContainer(remoteName);\n const factory = await container.get(moduleName);\n const Module = factory();\n remoteModuleMap.set(remoteModuleKey, Module);\n return Module;\n}\nfunction loadModule(url) {\n return import(/* webpackIgnore:true */ url);\n}\nlet initialSharingScopeCreated = false;\nasync function loadRemoteContainer(remoteName) {\n if (!resolveRemoteUrl && !remoteUrlDefinitions) {\n throw new Error('Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.');\n }\n if (!initialSharingScopeCreated) {\n initialSharingScopeCreated = true;\n await __webpack_init_sharing__('default');\n }\n const remoteUrl = remoteUrlDefinitions\n ? remoteUrlDefinitions[remoteName]\n : await resolveRemoteUrl(remoteName);\n const url = new URL(remoteUrl);\n const ext = extname(url.pathname);\n const needsRemoteEntry = !['.js', '.mjs', '.json'].includes(ext);\n if (needsRemoteEntry) {\n url.pathname = url.pathname.endsWith('/')\n ? `${url.pathname}remoteEntry.mjs`\n : `${url.pathname}/remoteEntry.mjs`;\n }\n const containerUrl = url.href;\n const container = await loadModule(containerUrl);\n await container.init(__webpack_share_scopes__.default);\n remoteContainerMap.set(remoteName, container);\n return container;\n}\n//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mf.js","sourceRoot":"","sources":["../../../../../packages/angular/mf/mf.ts"],"names":[],"mappings":"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","sourcesContent":["import { extname } from 'node:path';\n\nexport type ResolveRemoteUrlFunction = (\n  remoteName: string\n) => string | Promise<string>;\n\ndeclare const __webpack_init_sharing__: (scope: 'default') => Promise<void>;\ndeclare const __webpack_share_scopes__: { default: unknown };\n\nlet resolveRemoteUrl: ResolveRemoteUrlFunction;\n\n/**\n * @deprecated Use Runtime Helpers from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n */\nexport function setRemoteUrlResolver(\n  _resolveRemoteUrl: ResolveRemoteUrlFunction\n) {\n  resolveRemoteUrl = _resolveRemoteUrl;\n}\n\nlet remoteUrlDefinitions: Record<string, string>;\n\n/**\n * @deprecated Use init() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you have a remote app called `my-remote-app` and you want to use the `http://localhost:4201/mf-manifest.json` as the remote url, you should change it from:\n * ```ts\n * import { setRemoteDefinitions } from '@nx/angular/mf';\n *\n * setRemoteDefinitions({\n *   'my-remote-app': 'http://localhost:4201/mf-manifest.json'\n * });\n * ```\n * to use init():\n * ```ts\n * import { init } from '@module-federation/enhanced/runtime';\n *\n * init({\n *   name: 'host',\n *   remotes: [{\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }]\n * });\n * ```\n */\nexport function setRemoteDefinitions(definitions: Record<string, string>) {\n  remoteUrlDefinitions = definitions;\n}\n\n/**\n * @deprecated Use registerRemotes() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a remote app with `setRemoteDefinition` such as:\n * ```ts\n * import { setRemoteDefinition } from '@nx/angular/mf';\n *\n * setRemoteDefinition(\n *   'my-remote-app',\n *   'http://localhost:4201/mf-manifest.json'\n * );\n * ```\n * change it to use registerRemotes():\n * ```ts\n * import { registerRemotes } from '@module-federation/enhanced/runtime';\n *\n * registerRemotes([\n *  {\n *     name: 'my-remote-app',\n *     entry: 'http://localhost:4201/mf-manifest.json'\n *   }\n * ]);\n * ```\n */\nexport function setRemoteDefinition(remoteName: string, remoteUrl: string) {\n  remoteUrlDefinitions ??= {};\n  remoteUrlDefinitions[remoteName] = remoteUrl;\n}\n\nlet remoteModuleMap = new Map<string, unknown>();\nlet remoteContainerMap = new Map<string, unknown>();\n\n/**\n * @deprecated Use loadRemote() from '@module-federation/enhanced/runtime' instead. This will be removed in Nx 22.\n * If you set a load a remote with `loadRemoteModule` such as:\n * ```ts\n * import { loadRemoteModule } from '@nx/angular/mf';\n *\n * loadRemoteModule('my-remote-app', './Module').then(m => m.RemoteEntryModule);\n * ```\n * change it to use loadRemote():\n * ```ts\n * import { loadRemote } from '@module-federation/enhanced/runtime';\n *\n * loadRemote<typeof import('my-remote-app/Module')>('my-remote-app/Module').then(m => m.RemoteEntryModule);\n * ```\n */\nexport async function loadRemoteModule(remoteName: string, moduleName: string) {\n  const remoteModuleKey = `${remoteName}:${moduleName}`;\n  if (remoteModuleMap.has(remoteModuleKey)) {\n    return remoteModuleMap.get(remoteModuleKey);\n  }\n\n  const container = remoteContainerMap.has(remoteName)\n    ? remoteContainerMap.get(remoteName)\n    : await loadRemoteContainer(remoteName);\n\n  const factory = await container.get(moduleName);\n  const Module = factory();\n\n  remoteModuleMap.set(remoteModuleKey, Module);\n\n  return Module;\n}\n\nfunction loadModule(url: string) {\n  return import(/* webpackIgnore:true */ url);\n}\n\nlet initialSharingScopeCreated = false;\n\nasync function loadRemoteContainer(remoteName: string) {\n  if (!resolveRemoteUrl && !remoteUrlDefinitions) {\n    throw new Error(\n      'Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.'\n    );\n  }\n\n  if (!initialSharingScopeCreated) {\n    initialSharingScopeCreated = true;\n    await __webpack_init_sharing__('default');\n  }\n\n  const remoteUrl = remoteUrlDefinitions\n    ? remoteUrlDefinitions[remoteName]\n    : await resolveRemoteUrl(remoteName);\n\n  const url = new URL(remoteUrl);\n  const ext = extname(url.pathname);\n\n  const needsRemoteEntry = !['.js', '.mjs', '.json'].includes(ext);\n\n  if (needsRemoteEntry) {\n    url.pathname = url.pathname.endsWith('/')\n      ? `${url.pathname}remoteEntry.mjs`\n      : `${url.pathname}/remoteEntry.mjs`;\n  }\n\n  const containerUrl = url.href;\n\n  const container = await loadModule(containerUrl);\n  await container.init(__webpack_share_scopes__.default);\n\n  remoteContainerMap.set(remoteName, container);\n  return container;\n}\n"]}","/**\n * Generated bundle index. Do not edit.\n */\nexport * from './index';\n//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibngtYW5ndWxhci1tZi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXIvbWYvbngtYW5ndWxhci1tZi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUVILGNBQWMsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBHZW5lcmF0ZWQgYnVuZGxlIGluZGV4LiBEbyBub3QgZWRpdC5cbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL2luZGV4JztcbiJdfQ=="],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nx/angular",
|
3
|
-
"version": "21.2.0-beta.
|
3
|
+
"version": "21.2.0-beta.2",
|
4
4
|
"private": false,
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
6
6
|
"repository": {
|
@@ -58,14 +58,14 @@
|
|
58
58
|
"migrations": "./migrations.json"
|
59
59
|
},
|
60
60
|
"dependencies": {
|
61
|
-
"@nx/devkit": "21.2.0-beta.
|
62
|
-
"@nx/eslint": "21.2.0-beta.
|
63
|
-
"@nx/js": "21.2.0-beta.
|
64
|
-
"@nx/module-federation": "21.2.0-beta.
|
65
|
-
"@nx/rspack": "21.2.0-beta.
|
66
|
-
"@nx/web": "21.2.0-beta.
|
67
|
-
"@nx/webpack": "21.2.0-beta.
|
68
|
-
"@nx/workspace": "21.2.0-beta.
|
61
|
+
"@nx/devkit": "21.2.0-beta.2",
|
62
|
+
"@nx/eslint": "21.2.0-beta.2",
|
63
|
+
"@nx/js": "21.2.0-beta.2",
|
64
|
+
"@nx/module-federation": "21.2.0-beta.2",
|
65
|
+
"@nx/rspack": "21.2.0-beta.2",
|
66
|
+
"@nx/web": "21.2.0-beta.2",
|
67
|
+
"@nx/webpack": "21.2.0-beta.2",
|
68
|
+
"@nx/workspace": "21.2.0-beta.2",
|
69
69
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
70
70
|
"@typescript-eslint/type-utils": "^8.0.0",
|
71
71
|
"enquirer": "~2.3.6",
|
package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/entry-point.js
CHANGED
@@ -46,7 +46,7 @@ function createNgEntryPoint(packageJson, ngPackageJson, basePath, secondaryData)
|
|
46
46
|
directory: ensureUnixPath(secondaryDir),
|
47
47
|
declarations: pathJoinWithDest('tmp-typings', secondaryDir, `${flatModuleFile}.d.ts`),
|
48
48
|
// changed to use esm2022
|
49
|
-
declarationsBundled: pathJoinWithDest(
|
49
|
+
declarationsBundled: pathJoinWithDest(secondaryDir, `${flatModuleFile}.d.ts`),
|
50
50
|
declarationsDir: pathJoinWithDest(secondaryDir),
|
51
51
|
esm2022: pathJoinWithDest('tmp-esm2022', secondaryDir, `${flatModuleFile}.js`),
|
52
52
|
// changed to use esm2022
|
@@ -14,6 +14,16 @@ const node_path_1 = require("node:path");
|
|
14
14
|
const ng_packagr_version_1 = require("../../../../utilities/ng-packagr/ng-packagr-version");
|
15
15
|
const package_imports_1 = require("../../../../utilities/ng-packagr/package-imports");
|
16
16
|
const entry_point_1 = require("./entry-point");
|
17
|
+
async function shouldWriteFile(filePath, newContent) {
|
18
|
+
try {
|
19
|
+
const existingContent = await (0, promises_1.readFile)(filePath, 'utf-8');
|
20
|
+
return existingContent !== newContent;
|
21
|
+
}
|
22
|
+
catch (error) {
|
23
|
+
// If we can't read the existing file (including if it doesn't exist), write the new one
|
24
|
+
return true;
|
25
|
+
}
|
26
|
+
}
|
17
27
|
const writeBundlesTransform = (_options) => {
|
18
28
|
const { major: ngPackagrMajorVersion } = (0, ng_packagr_version_1.getNgPackagrVersionInfo)();
|
19
29
|
const { BuildGraph } = (0, package_imports_1.importNgPackagrPath)('ng-packagr/src/lib/graph/build-graph', ngPackagrMajorVersion);
|
@@ -29,9 +39,11 @@ const writeBundlesTransform = (_options) => {
|
|
29
39
|
entry.data.destinationFiles = entryPoint.destinationFiles;
|
30
40
|
for (const [path, outputCache] of entry.cache.outputCache.entries()) {
|
31
41
|
const normalizedPath = normalizeEsm2022Path(path, entryPoint);
|
32
|
-
// write
|
33
|
-
|
34
|
-
|
42
|
+
// Only write if content has changed
|
43
|
+
if (await shouldWriteFile(normalizedPath, outputCache.content)) {
|
44
|
+
await (0, promises_1.mkdir)((0, node_path_1.dirname)(normalizedPath), { recursive: true });
|
45
|
+
await (0, promises_1.writeFile)(normalizedPath, outputCache.content);
|
46
|
+
}
|
35
47
|
}
|
36
48
|
if (!entry.cache.outputCache.size && entryPoint.isSecondaryEntryPoint) {
|
37
49
|
await (0, promises_1.mkdir)(entryPoint.destinationPath, { recursive: true });
|
@@ -47,16 +59,17 @@ const writeBundlesTransform = (_options) => {
|
|
47
59
|
};
|
48
60
|
exports.writeBundlesTransform = writeBundlesTransform;
|
49
61
|
function normalizeEsm2022Path(path, entryPoint) {
|
62
|
+
const normalizedPath = (0, node_path_1.normalize)(path);
|
50
63
|
if (!entryPoint.primaryDestinationPath) {
|
51
|
-
return
|
64
|
+
return normalizedPath;
|
52
65
|
}
|
53
|
-
if (
|
54
|
-
return
|
66
|
+
if (normalizedPath.startsWith((0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-esm2022'))) {
|
67
|
+
return normalizedPath.replace('tmp-esm2022', 'esm2022');
|
55
68
|
}
|
56
|
-
if (
|
57
|
-
return
|
69
|
+
if (normalizedPath.startsWith((0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-typings'))) {
|
70
|
+
return normalizedPath.replace('tmp-typings', '');
|
58
71
|
}
|
59
|
-
return
|
72
|
+
return normalizedPath;
|
60
73
|
}
|
61
74
|
function toCustomNgEntryPoint(entryPoint) {
|
62
75
|
return (0, entry_point_1.createNgEntryPoint)(entryPoint.packageJson, entryPoint.ngPackageJson, entryPoint.basePath,
|
@@ -4,8 +4,8 @@ exports.updateTsconfigFiles = updateTsconfigFiles;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
5
5
|
const js_1 = require("@nx/js");
|
6
6
|
const configuration_1 = require("@nx/js/src/utils/typescript/configuration");
|
7
|
-
const semver_1 = require("semver");
|
8
7
|
const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
|
8
|
+
const semver_1 = require("semver");
|
9
9
|
const update_app_editor_tsconfig_excluded_files_1 = require("../../utils/update-app-editor-tsconfig-excluded-files");
|
10
10
|
const version_utils_1 = require("../../utils/version-utils");
|
11
11
|
const enable_strict_type_checking_1 = require("./enable-strict-type-checking");
|
@@ -43,7 +43,8 @@ function updateTsconfigFiles(tree, options) {
|
|
43
43
|
compilerOptions.esModuleInterop = true;
|
44
44
|
}
|
45
45
|
}
|
46
|
-
(0, devkit_1.
|
46
|
+
const tsconfigPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json');
|
47
|
+
(0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
|
47
48
|
json.compilerOptions = {
|
48
49
|
...json.compilerOptions,
|
49
50
|
...compilerOptions,
|
@@ -51,8 +52,24 @@ function updateTsconfigFiles(tree, options) {
|
|
51
52
|
json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
|
52
53
|
return json;
|
53
54
|
});
|
55
|
+
if (options.unitTestRunner === 'jest') {
|
56
|
+
const tsconfigSpecPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json');
|
57
|
+
(0, devkit_1.updateJson)(tree, tsconfigSpecPath, (json) => {
|
58
|
+
json.compilerOptions = {
|
59
|
+
...json.compilerOptions,
|
60
|
+
module: 'commonjs',
|
61
|
+
moduleResolution: 'node10',
|
62
|
+
};
|
63
|
+
json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
|
64
|
+
return json;
|
65
|
+
});
|
66
|
+
}
|
54
67
|
}
|
55
68
|
function updateEditorTsConfig(tree, options) {
|
69
|
+
const tsconfigEditorPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json');
|
70
|
+
if (!tree.exists(tsconfigEditorPath)) {
|
71
|
+
return;
|
72
|
+
}
|
56
73
|
const appTsConfig = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'));
|
57
74
|
const types = appTsConfig?.compilerOptions?.types ?? [];
|
58
75
|
if (types?.length) {
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { type
|
1
|
+
import { type GeneratorCallback, type Tree } from '@nx/devkit';
|
2
2
|
import type { ConvertToRspackSchema } from './schema';
|
3
3
|
export declare function convertToRspack(tree: Tree, schema: ConvertToRspackSchema): Promise<GeneratorCallback>;
|
4
4
|
export default convertToRspack;
|
@@ -2,15 +2,16 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.convertToRspack = convertToRspack;
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
5
|
+
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
6
|
+
const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
|
7
|
+
const enquirer_1 = require("enquirer");
|
8
|
+
const path_1 = require("path");
|
9
|
+
const posix_1 = require("path/posix");
|
5
10
|
const versions_1 = require("../../utils/versions");
|
6
11
|
const create_config_1 = require("./lib/create-config");
|
7
12
|
const get_custom_webpack_config_1 = require("./lib/get-custom-webpack-config");
|
8
13
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
9
14
|
const validate_supported_executor_1 = require("./lib/validate-supported-executor");
|
10
|
-
const posix_1 = require("path/posix");
|
11
|
-
const path_1 = require("path");
|
12
|
-
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
13
|
-
const enquirer_1 = require("enquirer");
|
14
15
|
const SUPPORTED_EXECUTORS = [
|
15
16
|
'@angular-devkit/build-angular:browser',
|
16
17
|
'@angular-devkit/build-angular:dev-server',
|
@@ -164,10 +165,6 @@ function handleBuildTargetOptions(tree, options, newConfigurationOptions, root)
|
|
164
165
|
customWebpackConfigPath = options.customWebpackConfig.path;
|
165
166
|
delete options.customWebpackConfig;
|
166
167
|
}
|
167
|
-
if (options.outputs) {
|
168
|
-
// handled by the Rspack inference plugin
|
169
|
-
delete options.outputs;
|
170
|
-
}
|
171
168
|
for (const [key, value] of Object.entries(options)) {
|
172
169
|
let optionName = key;
|
173
170
|
let optionValue = key in PATH_NORMALIZER ? PATH_NORMALIZER[key](tree, value, root) : value;
|
@@ -247,8 +244,9 @@ async function convertToRspack(tree, schema) {
|
|
247
244
|
root: project.root,
|
248
245
|
};
|
249
246
|
const configurationOptions = {};
|
250
|
-
|
251
|
-
|
247
|
+
let buildTarget;
|
248
|
+
let serveTarget;
|
249
|
+
const targetsToRemove = [];
|
252
250
|
let customWebpackConfigPath;
|
253
251
|
(0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
|
254
252
|
let projectServePort = DEFAULT_PORT;
|
@@ -262,14 +260,15 @@ async function convertToRspack(tree, schema) {
|
|
262
260
|
handleBuildTargetOptions(tree, configuration, configurationOptions[configurationName], project.root);
|
263
261
|
}
|
264
262
|
}
|
265
|
-
|
263
|
+
buildTarget = { name: targetName, config: target };
|
264
|
+
targetsToRemove.push(targetName);
|
266
265
|
}
|
267
266
|
else if (target.executor === '@angular-devkit/build-angular:server' ||
|
268
267
|
target.executor === '@nx/angular:webpack-server') {
|
269
268
|
createConfigOptions.ssr ??= {};
|
270
269
|
createConfigOptions.ssr.entry ??= normalizeFromProjectRoot(tree, target.options.main, project.root);
|
271
270
|
createConfigOptions.server = './src/main.server.ts';
|
272
|
-
|
271
|
+
targetsToRemove.push(targetName);
|
273
272
|
}
|
274
273
|
else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
|
275
274
|
target.executor === '@nx/angular:dev-server' ||
|
@@ -277,7 +276,7 @@ async function convertToRspack(tree, schema) {
|
|
277
276
|
createConfigOptions.devServer = {};
|
278
277
|
if (target.options) {
|
279
278
|
handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
|
280
|
-
if (target.options.port !== DEFAULT_PORT) {
|
279
|
+
if (target.options.port && target.options.port !== DEFAULT_PORT) {
|
281
280
|
projectServePort = target.options.port;
|
282
281
|
}
|
283
282
|
}
|
@@ -288,7 +287,8 @@ async function convertToRspack(tree, schema) {
|
|
288
287
|
handleDevServerTargetOptions(tree, configuration, configurationOptions[configurationName].devServer, project.root);
|
289
288
|
}
|
290
289
|
}
|
291
|
-
|
290
|
+
serveTarget = { name: targetName, config: target };
|
291
|
+
targetsToRemove.push(targetName);
|
292
292
|
}
|
293
293
|
else if (target.executor === '@angular-devkit/build-angular:prerender') {
|
294
294
|
if (target.options) {
|
@@ -309,11 +309,11 @@ async function convertToRspack(tree, schema) {
|
|
309
309
|
}
|
310
310
|
}
|
311
311
|
}
|
312
|
-
|
312
|
+
targetsToRemove.push(targetName);
|
313
313
|
}
|
314
314
|
else if (target.executor === '@angular-devkit/build-angular:app-shell') {
|
315
315
|
createConfigOptions.appShell = true;
|
316
|
-
|
316
|
+
targetsToRemove.push(targetName);
|
317
317
|
}
|
318
318
|
}
|
319
319
|
const customWebpackConfigInfo = customWebpackConfigPath
|
@@ -321,20 +321,169 @@ async function convertToRspack(tree, schema) {
|
|
321
321
|
: undefined;
|
322
322
|
(0, create_config_1.createConfig)(tree, createConfigOptions, configurationOptions, customWebpackConfigInfo?.normalizedPathToCustomWebpackConfig, customWebpackConfigInfo?.isWebpackConfigFunction);
|
323
323
|
(0, update_tsconfig_1.updateTsconfig)(tree, project.root);
|
324
|
-
for (const targetName of
|
324
|
+
for (const targetName of targetsToRemove) {
|
325
325
|
delete project.targets[targetName];
|
326
326
|
}
|
327
|
-
if (projectServePort !== DEFAULT_PORT) {
|
328
|
-
project.targets.serve ??= {};
|
329
|
-
project.targets.serve.options ??= {};
|
330
|
-
project.targets.serve.options.port = projectServePort;
|
331
|
-
}
|
332
327
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
328
|
+
// ensure plugin is registered
|
333
329
|
const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
|
334
330
|
await rspackInitGenerator(tree, {
|
335
331
|
addPlugin: true,
|
336
332
|
framework: 'angular',
|
337
333
|
});
|
334
|
+
// find the inferred target names
|
335
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
336
|
+
let inferredBuildTargetName = 'build';
|
337
|
+
let inferredServeTargetName = 'serve';
|
338
|
+
const pluginRegistration = nxJson.plugins.find((p) => typeof p === 'string' ? false : p.plugin === '@nx/rspack/plugin');
|
339
|
+
if (pluginRegistration) {
|
340
|
+
inferredBuildTargetName =
|
341
|
+
pluginRegistration.options.buildTargetName ?? inferredBuildTargetName;
|
342
|
+
inferredServeTargetName =
|
343
|
+
pluginRegistration.options.serveTargetName ?? inferredServeTargetName;
|
344
|
+
}
|
345
|
+
if (buildTarget) {
|
346
|
+
// these are all replaced by the inferred task
|
347
|
+
delete buildTarget.config.options;
|
348
|
+
delete buildTarget.config.configurations;
|
349
|
+
delete buildTarget.config.defaultConfiguration;
|
350
|
+
delete buildTarget.config.executor;
|
351
|
+
const shouldOverrideInputs = (inputs) => {
|
352
|
+
if (!inputs?.length) {
|
353
|
+
return false;
|
354
|
+
}
|
355
|
+
if (inputs.length === 2) {
|
356
|
+
// check whether the existing inputs would match the inferred task
|
357
|
+
// inputs with the exception of the @rspack/cli external dependency
|
358
|
+
// which webpack tasks wouldn't have
|
359
|
+
const namedInputs = (0, get_named_inputs_1.getNamedInputs)(project.root, {
|
360
|
+
nxJsonConfiguration: nxJson,
|
361
|
+
configFiles: [],
|
362
|
+
workspaceRoot: devkit_1.workspaceRoot,
|
363
|
+
});
|
364
|
+
if ('production' in namedInputs) {
|
365
|
+
return !['production', '^production'].every((input) => inputs.includes(input));
|
366
|
+
}
|
367
|
+
return !['default', '^default'].every((input) => inputs.includes(input));
|
368
|
+
}
|
369
|
+
return true;
|
370
|
+
};
|
371
|
+
if (shouldOverrideInputs(buildTarget.config.inputs)) {
|
372
|
+
// keep existing inputs and add the @rspack/cli external dependency
|
373
|
+
buildTarget.config.inputs = [
|
374
|
+
...buildTarget.config.inputs,
|
375
|
+
{ externalDependencies: ['@rspack/cli'] },
|
376
|
+
];
|
377
|
+
}
|
378
|
+
else {
|
379
|
+
delete buildTarget.config.inputs;
|
380
|
+
}
|
381
|
+
if (buildTarget.config.cache) {
|
382
|
+
delete buildTarget.config.cache;
|
383
|
+
}
|
384
|
+
if (buildTarget.config.dependsOn?.length === 1 &&
|
385
|
+
buildTarget.config.dependsOn[0] === `^${buildTarget.name}`) {
|
386
|
+
delete buildTarget.config.dependsOn;
|
387
|
+
}
|
388
|
+
else if (buildTarget.config.dependsOn) {
|
389
|
+
buildTarget.config.dependsOn = buildTarget.config.dependsOn.map((dep) => dep === `^${buildTarget.name}` ? `^${inferredBuildTargetName}` : dep);
|
390
|
+
}
|
391
|
+
const newOutputPath = (0, devkit_1.joinPathFragments)(project.root, createConfigOptions.outputPath.base);
|
392
|
+
const shouldOverrideOutputs = (outputs) => {
|
393
|
+
if (!outputs?.length) {
|
394
|
+
// this means the target was wrongly configured, so, we don't override
|
395
|
+
// anything and let the inferred outputs be used
|
396
|
+
return false;
|
397
|
+
}
|
398
|
+
if (outputs.length === 1) {
|
399
|
+
if (outputs[0] === '{options.outputPath}') {
|
400
|
+
// the inferred task output is created after the createConfig
|
401
|
+
// outputPath option, so we don't need to keep this
|
402
|
+
return false;
|
403
|
+
}
|
404
|
+
const normalizedOutputPath = outputs[0]
|
405
|
+
.replace('{workspaceRoot}/', '')
|
406
|
+
.replace('{projectRoot}', project.root)
|
407
|
+
.replace('{projectName}', '');
|
408
|
+
if (normalizedOutputPath === newOutputPath ||
|
409
|
+
normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
|
410
|
+
return false;
|
411
|
+
}
|
412
|
+
}
|
413
|
+
return true;
|
414
|
+
};
|
415
|
+
const normalizeOutput = (path, workspaceRoot, projectRoot) => {
|
416
|
+
const fullProjectRoot = (0, path_1.resolve)(workspaceRoot, projectRoot);
|
417
|
+
const fullPath = (0, path_1.resolve)(workspaceRoot, path);
|
418
|
+
const pathRelativeToProjectRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(fullProjectRoot, fullPath));
|
419
|
+
if (pathRelativeToProjectRoot.startsWith('..')) {
|
420
|
+
return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, path_1.relative)(workspaceRoot, fullPath));
|
421
|
+
}
|
422
|
+
return (0, devkit_1.joinPathFragments)('{projectRoot}', pathRelativeToProjectRoot);
|
423
|
+
};
|
424
|
+
if (shouldOverrideOutputs(buildTarget.config.outputs)) {
|
425
|
+
buildTarget.config.outputs = buildTarget.config.outputs.map((output) => {
|
426
|
+
if (output === '{options.outputPath}') {
|
427
|
+
// the target won't have an outputPath option, so we replace it with the new output path
|
428
|
+
return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
|
429
|
+
}
|
430
|
+
const normalizedOutputPath = output
|
431
|
+
.replace('{workspaceRoot}/', '')
|
432
|
+
.replace('{projectRoot}', project.root)
|
433
|
+
.replace('{projectName}', '');
|
434
|
+
if (/\/browser\/?$/.test(normalizedOutputPath) &&
|
435
|
+
normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
|
436
|
+
return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
|
437
|
+
}
|
438
|
+
return output;
|
439
|
+
});
|
440
|
+
}
|
441
|
+
else {
|
442
|
+
delete buildTarget.config.outputs;
|
443
|
+
}
|
444
|
+
if (buildTarget.config.syncGenerators?.length === 1 &&
|
445
|
+
buildTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
|
446
|
+
delete buildTarget.config.syncGenerators;
|
447
|
+
}
|
448
|
+
else if (buildTarget.config.syncGenerators?.length) {
|
449
|
+
buildTarget.config.syncGenerators = Array.from(new Set([
|
450
|
+
...buildTarget.config.syncGenerators,
|
451
|
+
'@nx/js:typescript-sync',
|
452
|
+
]));
|
453
|
+
}
|
454
|
+
if (Object.keys(buildTarget.config).length) {
|
455
|
+
// there's extra target metadata left that wouldn't be inferred, we keep it
|
456
|
+
project.targets[inferredBuildTargetName] = buildTarget.config;
|
457
|
+
}
|
458
|
+
}
|
459
|
+
if (serveTarget) {
|
460
|
+
delete serveTarget.config.options;
|
461
|
+
delete serveTarget.config.configurations;
|
462
|
+
delete serveTarget.config.defaultConfiguration;
|
463
|
+
delete serveTarget.config.executor;
|
464
|
+
if (serveTarget.config.continuous) {
|
465
|
+
delete serveTarget.config.continuous;
|
466
|
+
}
|
467
|
+
if (serveTarget.config.syncGenerators?.length === 1 &&
|
468
|
+
serveTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
|
469
|
+
delete serveTarget.config.syncGenerators;
|
470
|
+
}
|
471
|
+
else if (serveTarget.config.syncGenerators?.length) {
|
472
|
+
serveTarget.config.syncGenerators = Array.from(new Set([
|
473
|
+
...serveTarget.config.syncGenerators,
|
474
|
+
'@nx/js:typescript-sync',
|
475
|
+
]));
|
476
|
+
}
|
477
|
+
if (projectServePort !== DEFAULT_PORT) {
|
478
|
+
serveTarget.config.options = {};
|
479
|
+
serveTarget.config.options.port = projectServePort;
|
480
|
+
}
|
481
|
+
if (Object.keys(serveTarget.config).length) {
|
482
|
+
// there's extra target metadata left that wouldn't be inferred, we keep it
|
483
|
+
project.targets[inferredServeTargetName] = serveTarget.config;
|
484
|
+
}
|
485
|
+
}
|
486
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
338
487
|
// This is needed to prevent a circular execution of the build target
|
339
488
|
const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');
|
340
489
|
if (rootPkgJson.scripts?.build === 'nx build') {
|
@@ -19,6 +19,7 @@ function updateTsConfigFiles(tree, options) {
|
|
19
19
|
experimentalDecorators: true,
|
20
20
|
importHelpers: true,
|
21
21
|
target: 'es2022',
|
22
|
+
moduleResolution: 'bundler',
|
22
23
|
...(options.strict
|
23
24
|
? {
|
24
25
|
strict: true,
|
@@ -37,10 +38,10 @@ function updateTsConfigFiles(tree, options) {
|
|
37
38
|
compilerOptions.module = 'preserve';
|
38
39
|
}
|
39
40
|
else {
|
40
|
-
compilerOptions.moduleResolution = 'bundler';
|
41
41
|
compilerOptions.module = 'es2022';
|
42
42
|
}
|
43
|
-
(0, devkit_1.
|
43
|
+
const tsconfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json');
|
44
|
+
(0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
|
44
45
|
json.compilerOptions = {
|
45
46
|
...json.compilerOptions,
|
46
47
|
...compilerOptions,
|
@@ -57,6 +58,18 @@ function updateTsConfigFiles(tree, options) {
|
|
57
58
|
}
|
58
59
|
return json;
|
59
60
|
});
|
61
|
+
if (options.unitTestRunner === 'jest') {
|
62
|
+
const tsconfigSpecPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.spec.json');
|
63
|
+
(0, devkit_1.updateJson)(tree, tsconfigSpecPath, (json) => {
|
64
|
+
json.compilerOptions = {
|
65
|
+
...json.compilerOptions,
|
66
|
+
module: 'commonjs',
|
67
|
+
moduleResolution: 'node10',
|
68
|
+
};
|
69
|
+
json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
|
70
|
+
return json;
|
71
|
+
});
|
72
|
+
}
|
60
73
|
}
|
61
74
|
function updateProjectConfig(host, options) {
|
62
75
|
(0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
|
@@ -50,8 +50,8 @@ async function libraryGenerator(tree, schema) {
|
|
50
50
|
}
|
51
51
|
const project = await (0, add_project_1.addProject)(tree, libraryOptions);
|
52
52
|
(0, create_files_1.createFiles)(tree, options, project);
|
53
|
-
(0, update_tsconfig_files_1.updateTsConfigFiles)(tree, libraryOptions);
|
54
53
|
await addUnitTestRunner(tree, libraryOptions);
|
54
|
+
(0, update_tsconfig_files_1.updateTsConfigFiles)(tree, libraryOptions);
|
55
55
|
updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
|
56
56
|
(0, set_generator_defaults_1.setGeneratorDefaults)(tree, options);
|
57
57
|
if (!libraryOptions.standalone) {
|