Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .versionrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"//": "Configuration for https://github.com/absolute-version/commit-and-tag-version",
"releaseAs": "15.0.0-beta.0",
"releaseAs": "15.0.0",
"prerelease": true,
"preset": "conventionalcommits",
"header": "# Changelog\n\n",
Expand Down
4 changes: 0 additions & 4 deletions apps/playground/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
"base": "dist/apps/playground"
},
"index": "apps/playground/src/index.html",
"polyfills": [
"apps/playground/src/polyfills.ts",
"@skyux/packages/polyfills"
],
"tsConfig": "apps/playground/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
Expand Down
57 changes: 0 additions & 57 deletions apps/playground/src/polyfills.ts

This file was deleted.

2 changes: 1 addition & 1 deletion apps/playground/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"outDir": "../../dist/out-tsc",
"types": []
},
"files": ["src/main.ts", "src/polyfills.ts"],
"files": ["src/main.ts"],
"include": ["src/**/*.d.ts"],
"exclude": ["jest.config.ts", "**/*.test.ts", "**/*.spec.ts"]
}
10 changes: 5 additions & 5 deletions libs/clipboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"directory": "libs/clipboard"
},
"peerDependencies": {
"@angular/common": "^22.0.7",
"@angular/core": "^22.0.7",
"@skyux/core": "^15.0.0-alpha.1",
"@skyux/i18n": "^15.0.0-alpha.1",
"@skyux/icon": "^15.0.0-alpha.1"
"@angular/common": "^22.2.0",
"@angular/core": "^22.2.0",
"@skyux/core": "^15.0.0",
"@skyux/i18n": "^15.0.0",
"@skyux/icon": "^15.0.0"
},
"dependencies": {
"tslib": "^2.8.1"
Expand Down
10 changes: 3 additions & 7 deletions libs/clipboard/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"build": {
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"defaultConfiguration": "production",
"options": {
"project": "libs/clipboard/ng-package.json"
},
Expand All @@ -19,19 +20,14 @@
"development": {
"tsConfig": "libs/clipboard/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
}
},
"test": {
"executor": "@angular/build:karma",
"options": {
"tsConfig": "libs/clipboard/tsconfig.spec.json",
"karmaConfig": "libs/clipboard/karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing",
"@skyux/packages/polyfills"
],
"polyfills": ["zone.js", "zone.js/testing"],
"codeCoverage": true,
"codeCoverageExclude": ["**/fixtures/**"],
"styles": [
Expand Down
8 changes: 4 additions & 4 deletions libs/code-block/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"directory": "libs/code-block"
},
"peerDependencies": {
"@angular/common": "^22.0.7",
"@angular/core": "^22.0.7",
"@angular/platform-browser": "^22.0.7",
"@angular/common": "^22.2.0",
"@angular/core": "^22.2.0",
"@angular/platform-browser": "^22.2.0",
"@blackbaud/skyux-lib-clipboard": "0.0.0-PLACEHOLDER",
"@skyux/i18n": "^15.0.0-alpha.1"
"@skyux/i18n": "^15.0.0"
},
"dependencies": {
"prismjs": "1.30.0",
Expand Down
10 changes: 3 additions & 7 deletions libs/code-block/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"build": {
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"defaultConfiguration": "production",
"options": {
"project": "libs/code-block/ng-package.json"
},
Expand All @@ -19,19 +20,14 @@
"development": {
"tsConfig": "libs/code-block/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
}
},
"test": {
"executor": "@angular/build:karma",
"options": {
"tsConfig": "libs/code-block/tsconfig.spec.json",
"karmaConfig": "libs/code-block/karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing",
"@skyux/packages/polyfills"
],
"polyfills": ["zone.js", "zone.js/testing"],
"codeCoverage": true,
"codeCoverageExclude": ["**/fixtures/**"],
"styles": [
Expand Down
8 changes: 4 additions & 4 deletions libs/media/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"directory": "libs/media"
},
"peerDependencies": {
"@angular/common": "^22.0.7",
"@angular/core": "^22.0.7",
"@angular/platform-browser": "^22.0.7",
"@skyux/i18n": "^15.0.0-alpha.1"
"@angular/common": "^22.2.0",
"@angular/core": "^22.2.0",
"@angular/platform-browser": "^22.2.0",
"@skyux/i18n": "^15.0.0"
},
"dependencies": {
"tslib": "^2.8.1"
Expand Down
10 changes: 3 additions & 7 deletions libs/media/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"build": {
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"defaultConfiguration": "production",
"options": {
"project": "libs/media/ng-package.json"
},
Expand All @@ -19,19 +20,14 @@
"development": {
"tsConfig": "libs/media/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
}
},
"test": {
"executor": "@angular/build:karma",
"options": {
"tsConfig": "libs/media/tsconfig.spec.json",
"karmaConfig": "libs/media/karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing",
"@skyux/packages/polyfills"
],
"polyfills": ["zone.js", "zone.js/testing"],
"codeCoverage": true,
"codeCoverageExclude": ["**/fixtures/**"],
"styles": [
Expand Down
22 changes: 11 additions & 11 deletions libs/stache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
}
},
"peerDependencies": {
"@angular/cli": "^22.0.7",
"@angular/common": "^22.0.7",
"@angular/core": "^22.0.7",
"@angular/platform-browser": "^22.0.7",
"@angular/router": "^22.0.7",
"@skyux/config": "^15.0.0-alpha.1",
"@skyux/core": "^15.0.0-alpha.1",
"@skyux/i18n": "^15.0.0-alpha.1",
"@skyux/icon": "^15.0.0-alpha.1",
"@skyux/layout": "^15.0.0-alpha.1",
"@skyux/lookup": "^15.0.0-alpha.1"
"@angular/cli": "^22.2.0",
"@angular/common": "^22.2.0",
"@angular/core": "^22.2.0",
"@angular/platform-browser": "^22.2.0",
"@angular/router": "^22.2.0",
"@skyux/config": "^15.0.0",
"@skyux/core": "^15.0.0",
"@skyux/i18n": "^15.0.0",
"@skyux/icon": "^15.0.0",
"@skyux/layout": "^15.0.0",
"@skyux/lookup": "^15.0.0"
},
"dependencies": {
"jsonc-parser": "3.3.1",
Expand Down
10 changes: 3 additions & 7 deletions libs/stache/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"build": {
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"defaultConfiguration": "production",
"options": {
"project": "libs/stache/ng-package.json"
},
Expand All @@ -19,8 +20,7 @@
"development": {
"tsConfig": "libs/stache/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
}
},
"postbuild": {
"executor": "nx:run-commands",
Expand All @@ -33,11 +33,7 @@
"options": {
"tsConfig": "libs/stache/tsconfig.spec.json",
"karmaConfig": "libs/stache/karma.conf.js",
"polyfills": [
"zone.js",
"zone.js/testing",
"@skyux/packages/polyfills"
],
"polyfills": ["zone.js", "zone.js/testing"],
"codeCoverage": true,
"codeCoverageExclude": ["**/fixtures/**"],
"styles": [
Expand Down
5 changes: 1 addition & 4 deletions libs/stache/schematics/ng-add/ng-add.schematic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ export default function ngAdd(): Rule {
return (_tree, context) => {
context.addTask(new NodePackageInstallTask());

return chain([
installEssentialSkyUxPackages('^15.0.0-alpha.1'),
tryConfigureCsp(),
]);
return chain([installEssentialSkyUxPackages('^15.0.0'), tryConfigureCsp()]);
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ describe('StacheActionButtonsComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [StacheActionButtonsModule, RouterTestingModule],
providers: [{ provide: StacheRouteService, useValue: mockRouteService }],
providers: [
MockRouteService,
{ provide: StacheRouteService, useExisting: MockRouteService },
],
});
mockRouteService = TestBed.inject(MockRouteService);

fixture = TestBed.createComponent(StacheActionButtonsComponent);
component = fixture.componentInstance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { expect } from '@skyux-sdk/testing';
import { SkyAppTestUtility } from '@skyux-sdk/testing';
import { SkyAppTestUtility } from '@skyux/core/testing';

import { StacheViewportAdapterService } from '../shared/viewport-adapter.service';

Expand Down
3 changes: 2 additions & 1 deletion libs/stache/src/lib/modules/affix/affix.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import {
fakeAsync,
tick,
} from '@angular/core/testing';
import { SkyAppTestUtility, expect } from '@skyux-sdk/testing';
import { expect } from '@skyux-sdk/testing';
import { SkyAppTestUtility } from '@skyux/core/testing';

import { AffixFixtureComponent } from './fixtures/affix.component.fixture';
import { AffixFixtureModule } from './fixtures/affix.module.fixture';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
tick,
} from '@angular/core/testing';
import { expect, expectAsync } from '@skyux-sdk/testing';
import { SkyAppTestUtility } from '@skyux-sdk/testing';
import { SkyAppTestUtility } from '@skyux/core/testing';

import { StacheWindowRef } from '../shared/window-ref';

Expand Down
5 changes: 2 additions & 3 deletions libs/stache/src/lib/modules/json-data/json-data.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class StacheJsonDataService {
}

if (!this.#jsonData[name]) {
return;
return undefined;
}

return this.#jsonData[name];
Expand All @@ -39,8 +39,7 @@ export class StacheJsonDataService {

for (let i = 0; i < keys.length; i++) {
if (baseData[keys[i]] === undefined) {
baseData = undefined;
return;
return undefined;
}

baseData = baseData[keys[i]];
Expand Down
4 changes: 2 additions & 2 deletions libs/stache/src/lib/modules/nav/link.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import { DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Routes } from '@angular/router';
import { expect } from '@skyux-sdk/testing';
import {
SkyAppTestUtility,
SkyAppTestUtilityDomEventOptions,
expect,
} from '@skyux-sdk/testing';
} from '@skyux/core/testing';

import { StacheRouteService } from '../router/route.service';

Expand Down
2 changes: 1 addition & 1 deletion libs/stache/src/lib/modules/shared/window-ref.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SkyAppTestUtility } from '@skyux-sdk/testing';
import { SkyAppTestUtility } from '@skyux/core/testing';

import { StacheWindowRef } from './window-ref';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Route } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { SkyAppTestUtility, expect, expectAsync } from '@skyux-sdk/testing';
import { expect, expectAsync } from '@skyux-sdk/testing';
import { SkyAppConfig } from '@skyux/config';
import { SkyAppTestUtility } from '@skyux/core/testing';

import { StacheNavLink } from '../nav/nav-link';
import { StacheWindowRef } from '../shared/window-ref';
Expand Down
2 changes: 1 addition & 1 deletion libs/stache/src/lib/modules/wrapper/wrapper.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { StacheTitleService } from './title.service';

@Component({
encapsulation: ViewEncapsulation.None,
// eslint-disable-next-line @angular-eslint/component-selector

selector: 'stache',
templateUrl: './wrapper.component.html',
styleUrls: ['./wrapper.component.scss'],
Expand Down
Loading
Loading