Merge branch 'main' into v15/dev

umbraco · Sep 12, 2024 · 97ee4cd · 97ee4cd
2 parents dbfee9c + 861b761
commit 97ee4cd
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 23 deletions.
diff --git a/devops/tsconfig/index.js b/devops/tsconfig/index.js
@@ -18,6 +18,9 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 const tsConfigBase = {
 	compilerOptions: {
 		module: 'esnext',
+		moduleResolution: 'bundler',
+		moduleDetection: 'force',
+		verbatimModuleSyntax: true,
 		target: 'es2022',
 		lib: ['es2022', 'dom', 'dom.iterable'],
 		outDir: './types',
@@ -29,8 +32,6 @@ const tsConfigBase = {
 		incremental: true,
 		skipLibCheck: true,
 		noImplicitOverride: true,
-		/* Bundler mode */
-		moduleResolution: 'bundler',
 		allowImportingTsExtensions: true,
 		resolveJsonModule: true,
 		isolatedModules: true,

diff --git a/examples/sorter-with-nested-containers/sorter-item.ts b/examples/sorter-with-nested-containers/sorter-item.ts
@@ -1,7 +1,6 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, html, customElement, LitElement, state, repeat, property } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, LitElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
-import { UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 
 @customElement('example-sorter-item')
 export class ExampleSorterItem extends UmbElementMixin(LitElement) {

diff --git a/examples/sorter-with-two-containers/sorter-group.ts b/examples/sorter-with-two-containers/sorter-group.ts
@@ -1,10 +1,10 @@
+import type ExampleSorterItem from './sorter-item.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, LitElement, repeat, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
-import { UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
+import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 
 import './sorter-item.js';
-import ExampleSorterItem from './sorter-item.js';
 
 export type ModelEntryType = {
 	name: string;

diff --git a/examples/sorter-with-two-containers/sorter-item.ts b/examples/sorter-with-two-containers/sorter-item.ts
@@ -1,7 +1,6 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, html, customElement, LitElement, state, repeat, property } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, LitElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
-import { UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 
 @customElement('example-sorter-item')
 export class ExampleSorterItem extends UmbElementMixin(LitElement) {

diff --git a/src/external/router-slot/config.ts b/src/external/router-slot/config.ts
@@ -1,4 +1,4 @@
-import { PathMatch } from './model.js';
+import type { PathMatch } from './model.js';
 
 export const CATCH_ALL_WILDCARD: string = '**';
 export const TRAVERSE_FLAG: string = '\\.\\.\\/';

diff --git a/src/external/router-slot/router-slot.ts b/src/external/router-slot/router-slot.ts
@@ -1,5 +1,5 @@
 import { GLOBAL_ROUTER_EVENTS_TARGET, ROUTER_SLOT_TAG_NAME } from './config.js';
-import {
+import type {
 	Cancel,
 	EventListenerSubscription,
 	GlobalRouterEvent,

diff --git a/src/external/router-slot/util/events.ts b/src/external/router-slot/util/events.ts
@@ -1,5 +1,5 @@
-import { GLOBAL_ROUTER_EVENTS_TARGET } from '../config';
-import { EventListenerSubscription, GlobalRouterEvent, IRoute, IRoutingInfo } from '../model';
+import { GLOBAL_ROUTER_EVENTS_TARGET } from '../config.js';
+import type { EventListenerSubscription, GlobalRouterEvent, IRoute, IRoutingInfo } from '../model.js';
 
 /**
  * Dispatches a did change route event.

diff --git a/src/external/router-slot/util/history.ts b/src/external/router-slot/util/history.ts
@@ -1,6 +1,6 @@
-import { GLOBAL_ROUTER_EVENTS_TARGET, HISTORY_PATCH_NATIVE_KEY } from '../config';
-import { GlobalRouterEvent } from '../model';
-import { dispatchGlobalRouterEvent } from './events';
+import { GLOBAL_ROUTER_EVENTS_TARGET, HISTORY_PATCH_NATIVE_KEY } from '../config.js';
+import type { GlobalRouterEvent } from '../model.js';
+import { dispatchGlobalRouterEvent } from './events.js';
 
 // Mapping a history functions to the events they are going to dispatch.
 export const historyPatches: [string, GlobalRouterEvent[]][] = [

diff --git a/src/external/router-slot/util/router.ts b/src/external/router-slot/util/router.ts
@@ -1,5 +1,5 @@
-import { CATCH_ALL_WILDCARD, DEFAULT_PATH_MATCH, PARAM_IDENTIFIER, TRAVERSE_FLAG } from '../config';
-import {
+import { CATCH_ALL_WILDCARD, DEFAULT_PATH_MATCH, PARAM_IDENTIFIER, TRAVERSE_FLAG } from '../config.js';
+import type {
 	IComponentRoute,
 	IRedirectRoute,
 	IResolverRoute,
@@ -12,8 +12,8 @@ import {
 	PathFragment,
 	RouterTree,
 	IRoutingInfo,
-} from '../model';
-import { constructPathWithBasePath, path as getPath, queryString, stripSlash } from './url';
+} from '../model.js';
+import { constructPathWithBasePath, path as getPath, queryString, stripSlash } from './url.js';
 
 /**
  * Determines whether the path is active.

diff --git a/src/external/router-slot/util/shadow.ts b/src/external/router-slot/util/shadow.ts
@@ -1,5 +1,5 @@
-import { ROUTER_SLOT_TAG_NAME } from '../config';
-import { IRouterSlot } from '../model';
+import { ROUTER_SLOT_TAG_NAME } from '../config.js';
+import type { IRouterSlot } from '../model.js';
 
 /**
  * Queries the parent router.

diff --git a/src/external/router-slot/util/url.ts b/src/external/router-slot/util/url.ts
@@ -1,4 +1,4 @@
-import { ISlashOptions, Params, Query } from '../model';
+import type { ISlashOptions, Query } from '../model.js';
 
 const $anchor = document.createElement('a');
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,6 +10,9 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 {
 	"compilerOptions": {
 		"module": "esnext",
+		"moduleResolution": "bundler",
+		"moduleDetection": "force",
+		"verbatimModuleSyntax": true,
 		"target": "es2022",
 		"lib": ["es2022", "dom", "dom.iterable"],
 		"outDir": "./types",
@@ -21,7 +24,6 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 		"incremental": true,
 		"skipLibCheck": true,
 		"noImplicitOverride": true,
-		"moduleResolution": "bundler",
 		"allowImportingTsExtensions": true,
 		"resolveJsonModule": true,
 		"isolatedModules": true,