From ad82691ecb80bffa1a62924cc86b0a09953ef8f7 Mon Sep 17 00:00:00 2001
From: Coby Sher <63015754+CobyPear@users.noreply.github.com>
Date: Wed, 18 Aug 2021 07:57:01 -0500
Subject: [PATCH 1/2] Removed esm build for angular-schematics package

---
 packages/sitecore-jss-angular-schematics/package.json      | 5 +----
 packages/sitecore-jss-angular-schematics/tsconfig-esm.json | 7 -------
 packages/sitecore-jss-angular-schematics/tsconfig.json     | 5 ++---
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 packages/sitecore-jss-angular-schematics/tsconfig-esm.json

diff --git a/packages/sitecore-jss-angular-schematics/package.json b/packages/sitecore-jss-angular-schematics/package.json
index eadefaa213..09b50dcd3c 100644
--- a/packages/sitecore-jss-angular-schematics/package.json
+++ b/packages/sitecore-jss-angular-schematics/package.json
@@ -2,11 +2,8 @@
   "name": "@sitecore-jss/sitecore-jss-angular-schematics",
   "version": "19.0.0-canary.47",
   "description": "Scaffolding schematics for Sitecore JSS Angular apps",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "sideEffects": false,
   "scripts": {
-    "build": "tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
+    "build": "tsc -p tsconfig.json",
     "test-package": "jasmine src/**/*_spec.js",
     "test": "npm run build && npm run test-package",
     "coverage": "nyc npm run test-package"
diff --git a/packages/sitecore-jss-angular-schematics/tsconfig-esm.json b/packages/sitecore-jss-angular-schematics/tsconfig-esm.json
deleted file mode 100644
index eb58bc1628..0000000000
--- a/packages/sitecore-jss-angular-schematics/tsconfig-esm.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "es6",
-    "outDir": "dist/esm"
-  },
-}
diff --git a/packages/sitecore-jss-angular-schematics/tsconfig.json b/packages/sitecore-jss-angular-schematics/tsconfig.json
index 3a3a3cfe79..7450debdb3 100644
--- a/packages/sitecore-jss-angular-schematics/tsconfig.json
+++ b/packages/sitecore-jss-angular-schematics/tsconfig.json
@@ -6,7 +6,7 @@
       "dom"
     ],
     "newLine": "LF",
-    "module": "commonjs",
+    "module": "es2020",
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
@@ -19,8 +19,7 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strictNullChecks": true,
-    "target": "es6",
-    "outDir": "dist/cjs",
+    "target": "es5",
     "types": [
       "jasmine",
       "node"

From f4ff20777a6e7f8a443d96179f0ff811e0f8ea41 Mon Sep 17 00:00:00 2001
From: Coby Sher <63015754+CobyPear@users.noreply.github.com>
Date: Fri, 27 Aug 2021 11:58:46 -0500
Subject: [PATCH 2/2] Revert tsconfig.json to before esm modules

---
 packages/sitecore-jss-angular-schematics/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/sitecore-jss-angular-schematics/tsconfig.json b/packages/sitecore-jss-angular-schematics/tsconfig.json
index 7450debdb3..8905852589 100644
--- a/packages/sitecore-jss-angular-schematics/tsconfig.json
+++ b/packages/sitecore-jss-angular-schematics/tsconfig.json
@@ -6,7 +6,7 @@
       "dom"
     ],
     "newLine": "LF",
-    "module": "es2020",
+    "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
@@ -19,7 +19,7 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strictNullChecks": true,
-    "target": "es5",
+    "target": "es6",
     "types": [
       "jasmine",
       "node"