update to ng16

manfredsteyer · manfredsteyer · commit 8ce46d0ed70c · 2023-05-06T20:29:49.000+02:00
diff --git a/libs/mf-runtime/package.json b/libs/mf-runtime/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@angular-architects/module-federation-runtime",
   "license": "MIT",
-  "version": "15.0.3",
+  "version": "16.0.0",
   "peerDependencies": {
-    "@angular/common": ">=15.0.0",
-    "@angular/core": ">=15.0.0"
+    "@angular/common": ">=16.0.0",
+    "@angular/core": ">=16.0.0"
   },
   "dependencies": {
     "tslib": "^2.0.0"
diff --git a/libs/mf-tools/package.json b/libs/mf-tools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@angular-architects/module-federation-tools",
-  "version": "15.0.3",
+  "version": "16.0.0",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/common": ">=15.0.0",
-    "@angular/core": ">=15.0.0",
-    "@angular/router": ">=15.0.0",
-    "@angular-architects/module-federation": "^15.0.3",
-    "@angular/platform-browser": ">=15.0.0",
+    "@angular/common": ">=16.0.0",
+    "@angular/core": ">=16.0.0",
+    "@angular/router": ">=16.0.0",
+    "@angular-architects/module-federation": "^16.0.0",
+    "@angular/platform-browser": ">=16.0.0",
     "rxjs": ">= 6.0.0"
   },
   "dependencies": {
diff --git a/libs/mf/package.json b/libs/mf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation",
-  "version": "15.0.3",
+  "version": "16.0.0",
   "license": "MIT",
   "repository": {
     "type": "GitHub",
@@ -17,7 +17,7 @@
   "schematics": "./collection.json",
   "builders": "./builders.json",
   "dependencies": {
-    "@angular-architects/module-federation-runtime": "15.0.3",
+    "@angular-architects/module-federation-runtime": "16.0.0",
     "word-wrap": "^1.2.3",
     "callsite": "^1.0.0",
     "node-fetch": "^2.6.7",
diff --git a/libs/mf/src/schematics/mf/schematic.ts b/libs/mf/src/schematics/mf/schematic.ts
@@ -386,11 +386,11 @@ export default function config(options: MfSchematicSchema): Rule {
 
     const dep = getPackageJsonDependency(tree, 'ngx-build-plus');
 
-    if (!dep || !semver.satisfies(dep.version, '>=15.0.0')) {
+    if (!dep || !semver.satisfies(dep.version, '>=16.0.0')) {
       addPackageJsonDependency(tree, {
         name: 'ngx-build-plus',
         type: NodeDependencyType.Dev,
-        version: '^15.0.0',
+        version: '^16.0.0',
         overwrite: true,
       });
 
diff --git a/libs/native-federation-core/package.json b/libs/native-federation-core/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@softarc/native-federation",
-  "version": "1.1.1-beta.0",
+  "version": "1.1.1",
   "type": "commonjs",
   "dependencies": {
     "json5": "^2.2.0",
     "npmlog": "^6.0.2",
-    "@softarc/native-federation-runtime": "1.1.1-beta.0"
+    "@softarc/native-federation-runtime": "1.1.1"
   }
 }
diff --git a/libs/native-federation-core/src/lib/core/build-adapter.ts b/libs/native-federation-core/src/lib/core/build-adapter.ts
@@ -14,6 +14,7 @@ export interface BuildAdapterOptions {
   mappedPaths: MappedPath[];
   packageName?: string;
   esm?: boolean;
+  dev?: boolean;
   watch?: boolean;
   kind: 'shared-package' | 'shared-mapping' | 'exposed';
 }
diff --git a/libs/native-federation-core/src/lib/core/bundle-exposed.ts b/libs/native-federation-core/src/lib/core/bundle-exposed.ts
@@ -34,6 +34,7 @@ export async function bundleExposed(
         tsConfigPath: options.tsConfig,
         external: externals,
         outfile: outFilePath,
+        dev: !!options.dev,
         watch: options.watch,
         mappedPaths: config.sharedMappings,
         kind: 'exposed',
diff --git a/libs/native-federation-core/src/lib/core/bundle-shared-mappings.ts b/libs/native-federation-core/src/lib/core/bundle-shared-mappings.ts
@@ -30,6 +30,7 @@ export async function bundleSharedMappings(
         outfile: outFilePath,
         mappedPaths: [],
         watch: fedOptions.watch,
+        dev: !!fedOptions.dev,
         kind: 'shared-mapping',
       });
 
diff --git a/libs/native-federation-core/src/lib/core/bundle-shared.ts b/libs/native-federation-core/src/lib/core/bundle-shared.ts
@@ -47,10 +47,10 @@ export async function bundleShared(
     const encName = pi.packageName.replace(/[^A-Za-z0-9]/g, '_');
     const encVersion = pi.version.replace(/[^A-Za-z0-9]/g, '_');
 
-    // const env = fedOptions.dev ? 'dev' : 'prod';
+    const env = fedOptions.dev ? 'dev' : 'prod';
 
     // const outFileName = `${encName}-${encVersion}-${hash}.js`;
-    const outFileName = `${encName}-${encVersion}.js`;
+    const outFileName = `${encName}-${encVersion}-${env}.js`;
 
     const cachePath = path.join(
       fedOptions.workspaceRoot,
@@ -82,6 +82,7 @@ export async function bundleShared(
           mappedPaths: config.sharedMappings,
           packageName: pi.packageName,
           esm: pi.esm,
+          dev: !!fedOptions.dev,
           kind: 'shared-package',
         });
       } catch (e) {
diff --git a/libs/native-federation-esbuild/package.json b/libs/native-federation-esbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-esbuild",
-  "version": "1.1.1-beta.0",
+  "version": "1.1.1",
   "type": "commonjs",
   "dependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
diff --git a/libs/native-federation-esbuild/src/lib/adapter.ts b/libs/native-federation-esbuild/src/lib/adapter.ts
@@ -24,8 +24,6 @@ export type ReplacementConfig = {
   file: string
 };
 
-export type Environment = 'dev' | 'prod';
-
 export interface EsBuildAdapterConfig {
   plugins: esbuild.Plugin[];
   fileReplacements?: Record<string, string | ReplacementConfig>
@@ -36,8 +34,6 @@ export interface EsBuildAdapterConfig {
 
 export function createEsBuildAdapter(config: EsBuildAdapterConfig) {
   
-  normalizeConfig(config);
-
   if (!config.compensateExports) {
     config.compensateExports = [new RegExp('/react/')];
   }
@@ -50,7 +46,7 @@ export function createEsBuildAdapter(config: EsBuildAdapterConfig) {
     const tmpFolder = `node_modules/.tmp/${pkgName}`;
 
     if (isPkg) {
-      await prepareNodePackage(entryPoint, external, tmpFolder, config);
+      await prepareNodePackage(entryPoint, external, tmpFolder, config, !!options.dev);
     }
 
     await esbuild.build({
@@ -59,8 +55,8 @@ export function createEsBuildAdapter(config: EsBuildAdapterConfig) {
       outfile,
       loader: config.loader,
       bundle: true,
-      sourcemap: true,
-      minify: true,
+      sourcemap: options.dev,
+      minify: !options.dev,
       watch: !watch
         ? false
         : {
@@ -86,16 +82,6 @@ export function createEsBuildAdapter(config: EsBuildAdapterConfig) {
   };
 }
 
-function normalizeConfig(config: EsBuildAdapterConfig) {
-  if (!config.environment) {
-    config.environment = 'dev';
-  }
-
-  if (!config.sourcemap) {
-    config.sourcemap = config.environment === 'dev';
-  }
-}
-
 function compensateExports(entryPoint: string, outfile?: string): void {
   const inExports = collectExports(entryPoint);
   const outExports = outfile ? collectExports(outfile) : inExports;
@@ -120,12 +106,15 @@ async function prepareNodePackage(
   external: string[],
   tmpFolder: string,
   config: EsBuildAdapterConfig,
+  dev: boolean
 ) {
 
   if (config.fileReplacements) {
     entryPoint = replaceEntryPoint(entryPoint, normalize(config.fileReplacements));
   }
 
+  const env = dev ? 'development' : 'production';
+
   const result = await rollup({
     input: entryPoint,
 
@@ -136,7 +125,7 @@ async function prepareNodePackage(
       replace({
         preventAssignment: true,
         values: {
-          'process.env.NODE_ENV': '"development"',
+          'process.env.NODE_ENV': `"${env}"`,
         },
       }),
     ],
@@ -145,7 +134,7 @@ async function prepareNodePackage(
   await result.write({
     format: 'esm',
     file: tmpFolder,
-    sourcemap: true,
+    sourcemap: dev,
     exports: 'named',
   });
 
diff --git a/libs/native-federation-runtime/package.json b/libs/native-federation-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-runtime",
-  "version": "1.1.1-beta.0",
+  "version": "1.1.1",
   "peerDependencies": {},
   "dependencies": {
     "tslib": "^2.3.0"
diff --git a/libs/native-federation/package.json b/libs/native-federation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation",
-  "version": "1.1.1-beta.0",
+  "version": "1.1.1",
   "main": "src/index.js",
   "generators": "./collection.json",
   "builders": "./builders.json",
@@ -23,8 +23,8 @@
     "rollup-plugin-node-externals": "^4.1.1",
     "esbuild": "^0.15.5",
     "@babel/core": "^7.19.0",
-    "@softarc/native-federation": "1.1.1-beta.0",
-    "@softarc/native-federation-runtime": "1.1.1-beta.0",
+    "@softarc/native-federation": "1.1.1",
+    "@softarc/native-federation-runtime": "1.1.1",
     "@rollup/plugin-json": "^4.1.0",
     "cross-spawn": "^7.0.3",
     "rollup-plugin-terser": "^7.0.2",
diff --git a/update-local.bat b/update-local.bat
@@ -1,7 +1,7 @@
-call npm unpublish @softarc/native-federation@1.1.1-beta.0 --registry http://localhost:4873
-call npm unpublish @softarc/native-federation-runtime@1.1.1-beta.0 --registry http://localhost:4873
-call npm unpublish @softarc/native-federation-esbuild@1.1.1-beta.0 --registry http://localhost:4873
-call npm unpublish @angular-architects/native-federation@1.1.1-beta.0 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation@1.1.1 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation-runtime@1.1.1 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation-esbuild@1.1.1 --registry http://localhost:4873
+call npm unpublish @angular-architects/native-federation@1.1.1 --registry http://localhost:4873
 
 call nx build native-federation
 call nx build native-federation-core

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation",`
`3`		`- "version": "1.1.1-beta.0",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"type": "commonjs",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"json5": "^2.2.0",`
`7`	`7`	`"npmlog": "^6.0.2",`
`8`		`- "@softarc/native-federation-runtime": "1.1.1-beta.0"`
	`8`	`+ "@softarc/native-federation-runtime": "1.1.1"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export interface BuildAdapterOptions {`
`14`	`14`	`mappedPaths: MappedPath[];`
`15`	`15`	`packageName?: string;`
`16`	`16`	`esm?: boolean;`
	`17`	`+ dev?: boolean;`
`17`	`18`	`watch?: boolean;`
`18`	`19`	`kind: 'shared-package' \| 'shared-mapping' \| 'exposed';`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation-esbuild",`
`3`		`- "version": "1.1.1-beta.0",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"type": "commonjs",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@rollup/plugin-commonjs": "^22.0.2",`