From 9b9c3d9bc0e0cd2d2fe12377bbad5ddf4de523e4 Mon Sep 17 00:00:00 2001 From: lipata Date: Tue, 22 Nov 2022 23:29:12 +0200 Subject: [PATCH 1/2] chore: revert temporary workarounds --- packages/cli/lib/commands/upgrade.ts | 2 +- packages/core/packages/PackageManager.ts | 4 ++-- .../app/__path__/__filePrefix__.component.scss | 2 +- .../app/__path__/__filePrefix__.component.scss | 2 +- .../igx-ts/projects/_base/files/tsconfig.json | 2 +- spec/unit/packageManager-spec.ts | 18 +++++++++--------- spec/unit/upgrade-spec.ts | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/cli/lib/commands/upgrade.ts b/packages/cli/lib/commands/upgrade.ts index 0f06adbf2..2e6bf0ebd 100644 --- a/packages/cli/lib/commands/upgrade.ts +++ b/packages/cli/lib/commands/upgrade.ts @@ -56,7 +56,7 @@ command = { if (success && !argv.skipInstall) { Util.log("Installing npm packages."); try { - Util.execSync("npm install --force --quiet"); + Util.execSync("npm install --quiet"); Util.log("npm packages installed."); } catch (error) { Util.error(`Error installing npm packages.`); diff --git a/packages/core/packages/PackageManager.ts b/packages/core/packages/PackageManager.ts index c0c04c7ce..bab6378a2 100644 --- a/packages/core/packages/PackageManager.ts +++ b/packages/core/packages/PackageManager.ts @@ -95,7 +95,7 @@ export class PackageManager { case "npm": /* passes through */ default: - command = `${managerCommand} install --force --quiet`; + command = `${managerCommand} install --quiet`; break; } await this.flushQueue(false); @@ -277,7 +277,7 @@ export class PackageManager { case "npm": /* passes through */ default: - return `${managerCommand} install ${packageName} --force --quiet --save`; + return `${managerCommand} install ${packageName} --quiet --save`; } } diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.scss b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.scss index 40bc3a1c1..1f69471a9 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.scss +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-grid/files/src/app/__path__/__filePrefix__.component.scss @@ -236,7 +236,7 @@ $green-palette: palette($primary: #09f, $secondary: #72da67, $surface: #333); ::ng-deep { .fin-dark-theme { - @include dark-theme($dark-palette); + @include dark-theme($green-palette); background: #333; igx-grid-cell { diff --git a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.scss b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.scss index 5da5ea607..abeacb70a 100644 --- a/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.scss +++ b/packages/igx-templates/igx-ts/custom-templates/fintech-tree-grid/files/src/app/__path__/__filePrefix__.component.scss @@ -218,7 +218,7 @@ $green-palette: palette($primary: #09f, $secondary: #72da67, $surface: #333); ::ng-deep { .fin-dark-theme { - @include dark-theme($dark-palette); + @include dark-theme($green-palette); background: #333; ::-moz-placeholder { diff --git a/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json b/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json index 24dd16d32..50d5278c9 100644 --- a/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json +++ b/packages/igx-templates/igx-ts/projects/_base/files/tsconfig.json @@ -5,7 +5,7 @@ "baseUrl": "./", "outDir": "./dist/out-tsc", "forceConsistentCasingInFileNames": true, - "strict": false, + "strict": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, "sourceMap": true, diff --git a/spec/unit/packageManager-spec.ts b/spec/unit/packageManager-spec.ts index 24fa9a237..ab4491c30 100644 --- a/spec/unit/packageManager-spec.ts +++ b/spec/unit/packageManager-spec.ts @@ -223,7 +223,7 @@ describe("Unit - Package Manager", () => { await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true); expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@"~20.1"`, true); expect(Util.execSync).toHaveBeenCalledWith( - `npm install @infragistics/ignite-ui-full@"~20.1" --force --quiet --save`, + `npm install @infragistics/ignite-ui-full@"~20.1" --quiet --save`, jasmine.any(Object) ); expect(TestPackageManager.removePackage).toHaveBeenCalledWith("ignite-ui", true); @@ -232,7 +232,7 @@ describe("Unit - Package Manager", () => { await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true); expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@"^17.1"`, true); expect(Util.execSync).toHaveBeenCalledWith( - `npm install @infragistics/ignite-ui-full@"^17.1" --force --quiet --save`, + `npm install @infragistics/ignite-ui-full@"^17.1" --quiet --save`, jasmine.any(Object) ); @@ -240,7 +240,7 @@ describe("Unit - Package Manager", () => { await TestPackageManager.ensureIgniteUISource(true, mockTemplateMgr, true); expect(TestPackageManager.addPackage).toHaveBeenCalledWith(`@infragistics/ignite-ui-full@">=0.1.0 <0.2.0"`, true); expect(Util.execSync).toHaveBeenCalledWith( - `npm install @infragistics/ignite-ui-full@">=0.1.0 <0.2.0" --force --quiet --save`, + `npm install @infragistics/ignite-ui-full@">=0.1.0 <0.2.0" --quiet --save`, jasmine.any(Object) ); done(); @@ -263,7 +263,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`); expect(Util.log).toHaveBeenCalledWith(`Error installing npm packages.`); expect(Util.log).toHaveBeenCalledWith(`Example`); - expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`, + expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`, { stdio: ["inherit"], killSignal: "SIGINT" }); expect(ProjectConfig.setConfig).toHaveBeenCalledWith({ packagesInstalled: true }); done(); @@ -280,7 +280,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledTimes(2); expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`); expect(Util.log).toHaveBeenCalledWith(`Packages installed successfully`); - expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`, + expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`, { stdio: ["inherit"], killSignal: "SIGINT" }); expect(ProjectConfig.setConfig).toHaveBeenCalledWith({ packagesInstalled: true }); done(); @@ -301,7 +301,7 @@ describe("Unit - Package Manager", () => { await PackageManager.installPackages(true); expect(Util.log).toHaveBeenCalledTimes(1); expect(Util.log).toHaveBeenCalledWith(`Installing npm packages`); - expect(Util.execSync).toHaveBeenCalledWith(`npm install --force --quiet`, + expect(Util.execSync).toHaveBeenCalledWith(`npm install --quiet`, { stdio: ["inherit"], killSignal: "SIGINT" }); expect(process.exit).toHaveBeenCalled(); expect(ProjectConfig.setConfig).toHaveBeenCalledTimes(0); @@ -345,7 +345,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledWith(`Error installing package example-package with npm`); expect(Util.log).toHaveBeenCalledWith(`Error`); expect(Util.execSync).toHaveBeenCalledWith( - `npm install example-package --force --quiet --save`, { stdio: "pipe", encoding: "utf8" }); + `npm install example-package --quiet --save`, { stdio: "pipe", encoding: "utf8" }); done(); }); it("Should run addPackage properly without error code", async done => { @@ -355,7 +355,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledTimes(1); expect(Util.log).toHaveBeenCalledWith(`Package example-package installed successfully`); expect(Util.execSync).toHaveBeenCalledWith( - `npm install example-package --force --quiet --save`, { stdio: "pipe", encoding: "utf8" }); + `npm install example-package --quiet --save`, { stdio: "pipe", encoding: "utf8" }); done(); }); @@ -380,7 +380,7 @@ describe("Unit - Package Manager", () => { expect(Util.log).toHaveBeenCalledTimes(0); expect(cp.exec).toHaveBeenCalledTimes(1); expect(cp.exec).toHaveBeenCalledWith( - `npm install test-pack --force --quiet --no-save`, {}, jasmine.any(Function)); + `npm install test-pack --quiet --no-save`, {}, jasmine.any(Function)); done(); }); diff --git a/spec/unit/upgrade-spec.ts b/spec/unit/upgrade-spec.ts index 9233c24d5..5139351fb 100644 --- a/spec/unit/upgrade-spec.ts +++ b/spec/unit/upgrade-spec.ts @@ -55,7 +55,7 @@ describe("Unit - Upgrade command", () => { upgradeIgniteUIPackagesSpy.and.returnValue(Promise.resolve(true)); await upgradeCmd.execute({ skipInstall: false }); expect(mockProject.upgradeIgniteUIPackages).toHaveBeenCalledTimes(3); - expect(Util.execSync).toHaveBeenCalledWith("npm install --force --quiet"); + expect(Util.execSync).toHaveBeenCalledWith("npm install --quiet"); done(); }); From c0de4c5e4d811eac4b47cd78f4593737a099e436 Mon Sep 17 00:00:00 2001 From: lipata Date: Fri, 2 Jun 2023 16:53:21 +0300 Subject: [PATCH 2/2] fix(igx): fix typo --- .../files/src/app/__path__/__filePrefix__.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.scss b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.scss index e43e28acd..5a37f4e20 100644 --- a/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.scss +++ b/packages/igx-templates/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__filePrefix__.component.scss @@ -370,7 +370,7 @@ @keyframes spin-fade { 0% { opacity: 0; - tranfsorm: rotate(0); + transform: rotate(0); } 100% {