Skip to content

Commit

Permalink
Merge pull request #2178 from umbraco/release/14.2
Browse files Browse the repository at this point in the history
Merge release 14.2 into main
  • Loading branch information
leekelleher authored Aug 7, 2024
2 parents 9e85ffe + 13d7c4e commit ebad507
Show file tree
Hide file tree
Showing 979 changed files with 2,179 additions and 1,593 deletions.
4 changes: 3 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import wcPlugin from 'eslint-plugin-wc';
import litPlugin from 'eslint-plugin-lit';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import tseslint from 'typescript-eslint';
import jsdoc from 'eslint-plugin-jsdoc';

export default [
// Recommended config applied to all files
js.configs.recommended,
...tseslint.configs.recommended,
wcPlugin.configs['flat/recommended'],
litPlugin.configs['flat/recommended'],
jsdoc.configs['flat/recommended'], // We use the non typescript version to allow types to be defined in the jsdoc comments. This will allow js docs as an alternative to typescript types.
localRules.configs.all,
eslintPluginPrettierRecommended,

Expand Down Expand Up @@ -46,7 +48,7 @@ export default [
},
rules: {
semi: ['warn', 'always'],
"prettier/prettier": ["warn", { "endOfLine": "auto" }],
'prettier/prettier': ['warn', { endOfLine: 'auto' }],
'no-unused-vars': 'off', //Let '@typescript-eslint/no-unused-vars' catch the errors to allow unused function parameters (ex: in interfaces)
'no-var': 'error',
...importPlugin.configs.recommended.rules,
Expand Down
150 changes: 146 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,14 @@
"eslint": "^9.7.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.11.0",
"eslint-plugin-lit": "^1.14.0",
"eslint-plugin-local-rules": "^3.0.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-wc": "^2.1.0",
"glob": "^11.0.0",
"globals": "^15.8.0",
"lucide-static": "^0.408.0",
"lucide-static": "^0.424.0",
"msw": "^1.3.2",
"playwright-msw": "^3.0.1",
"prettier": "3.3.3",
Expand Down
1 change: 1 addition & 0 deletions src/apps/app/app-auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export class UmbAppAuthController extends UmbControllerBase {
/**
* Starts the authorization flow.
* It will check which providers are available and either redirect directly to the provider or show a provider selection screen.
* @param userLoginState
*/
async makeAuthorizationRequest(userLoginState: UmbUserLoginState = 'loggingIn'): Promise<boolean> {
if (!this.#authContext) {
Expand Down
4 changes: 0 additions & 4 deletions src/apps/app/app-error.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,27 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
export class UmbAppErrorElement extends UmbLitElement {
/**
* The headline to display
*
* @attr
*/
@property()
errorHeadline?: string | null;

/**
* The error message to display
*
* @attr
*/
@property()
errorMessage?: string | null;

/**
* The error to display
*
* @attr
*/
@property()
error?: unknown;

/**
* Hide the back button
*
* @attr
*/
@property({ type: Boolean, attribute: 'hide-back-button' })
Expand Down
2 changes: 0 additions & 2 deletions src/apps/app/app.element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { hasOwnOpener, retrieveStoredPath } from '@umbraco-cms/backoffice/utils'
export class UmbAppElement extends UmbLitElement {
/**
* The base URL of the configured Umbraco server.
*
* @attr
* @remarks This is the base URL of the Umbraco server, not the base URL of the backoffice.
*/
Expand All @@ -39,7 +38,6 @@ export class UmbAppElement extends UmbLitElement {

/**
* The base path of the backoffice.
*
* @attr
*/
@property({ type: String })
Expand Down
6 changes: 3 additions & 3 deletions src/apps/app/server-connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class UmbServerConnection {

/**
* Gets the URL of the server.
* @return {*}
* @returns {*}
* @memberof UmbServerConnection
*/
getUrl() {
Expand All @@ -33,7 +33,7 @@ export class UmbServerConnection {

/**
* Gets the status of the server.
* @return {string}
* @returns {string}
* @memberof UmbServerConnection
*/
getStatus() {
Expand All @@ -43,7 +43,7 @@ export class UmbServerConnection {

/**
* Checks if the server is connected.
* @return {boolean}
* @returns {boolean}
* @memberof UmbServerConnection
*/
getIsConnected() {
Expand Down
6 changes: 3 additions & 3 deletions src/apps/installer/installer.context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class UmbInstallerContext {
/**
* Observable method to get the current step in the installation process
* @public
* @return {*} {Observable<number>}
* @returns {*} {Observable<number>}
* @memberof UmbInstallerContext
*/
public currentStepChanges(): Observable<number> {
Expand All @@ -48,7 +48,7 @@ export class UmbInstallerContext {
/**
* Observable method to get the install status in the installation process
* @public
* @return {*} {(Observable<ProblemDetails | null>)}
* @returns {*} {(Observable<ProblemDetails | null>)}
* @memberof UmbInstallerContext
*/
public installStatusChanges(): Observable<ProblemDetails | null> {
Expand Down Expand Up @@ -96,7 +96,7 @@ export class UmbInstallerContext {
/**
* Get the data for the installation process
* @public
* @return {*} {PostInstallRequest}
* @returns {*} {PostInstallRequest}
* @memberof UmbInstallerContext
*/
public getData(): InstallRequestModel {
Expand Down
2 changes: 2 additions & 0 deletions src/assets/lang/en-us.ts
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ export default {
logout: 'Logout',
macro: 'Macro',
mandatory: 'Mandatory',
manifest: 'Manifest',
media: 'Media',
message: 'Message',
move: 'Move',
Expand Down Expand Up @@ -2403,6 +2404,7 @@ export default {
tabClipboard: 'Clipboard',
tabBlockSettings: 'Settings',
headlineAdvanced: 'Advanced',
headlineCustomView: 'Custom View',
forceHideContentEditor: 'Hide content editor',
forceHideContentEditorHelp: 'Hide the content edit button and the content editor from the Block Editor overlay',
gridInlineEditing: 'Inline editing',
Expand Down
Loading

0 comments on commit ebad507

Please sign in to comment.