Skip to content

Commit 3bf6159

Browse files
gavinbarronmusale
andauthored
chore: update to lit 2.0 (#1810)
* chore: upgrade lit-element to lit v2 replace lit-element with lit as the lit-element standalone package will be deprecated in the future update all imports to use new paths as specified in the migration guide fix typing issues many const/let/var and whitespace changes due to auto fixing of lint issues added dom.iterable to tsconfig lib list to allow for of loops over NodeList<Element> moved some for loops to for of loops * chore: change variable names to _private * chore: change variable names to _private Co-authored-by: Musale Martin <[email protected]>
1 parent 7c782ff commit 3bf6159

File tree

81 files changed

+295
-250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+295
-250
lines changed

.storybook/addons/codeEditorAddon/editor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LitElement, css, html, property, customElement } from 'lit-element';
1+
import { LitElement, css, html } from 'lit';
22
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
33

44
let debounce = (func, wait, immediate) => {

gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ scssFileHeader = `
1010
// ANY CHANGES WILL BE LOST DURING BUILD
1111
// MODIFY THE .SCSS FILE INSTEAD
1212
13-
import { css } from 'lit-element';
13+
import { css } from 'lit';
1414
/**
1515
* exports lit-element css
1616
* @export styles
@@ -48,7 +48,7 @@ function runSass() {
4848

4949
function setLicense() {
5050
return gulp
51-
.src(['packages/**/src/**/*.{ts,js,scss}', "!packages/**/generated/**/*"], { base: './' })
51+
.src(['packages/**/src/**/*.{ts,js,scss}', '!packages/**/generated/**/*'], { base: './' })
5252
.pipe(license(licenseStr))
5353
.pipe(gulp.dest('./'));
5454
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"jest": "^24.5.0",
9292
"jest-junit": "^6.3.0",
9393
"lerna": "^3.22.1",
94-
"lit-element": "2.5.0",
94+
"lit": "^2.3.1",
9595
"monaco-editor": "^0.19.3",
9696
"monaco-editor-webpack-plugin": "^1.8.2",
9797
"node-sass": "npm:sass@^1.44.0",

packages/mgt-components/src/components/mgt-agenda/mgt-agenda.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
*/
77

88
import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
9-
import { customElement, html, property, TemplateResult } from 'lit-element';
9+
import { html, TemplateResult } from 'lit';
10+
import { customElement, property } from 'lit/decorators.js';
1011
import { Providers, ProviderState, MgtTemplatedComponent, prepScopes } from '@microsoft/mgt-element';
1112
import '../../styles/style-helper';
1213
import { getDayOfWeekString, getMonthString } from '../../utils/Utils';
@@ -460,8 +461,8 @@ export class MgtAgenda extends MgtTemplatedComponent {
460461
const grouped = {};
461462

462463
events.forEach(event => {
463-
var eventDate = new Date(event.start.dateTime);
464-
var dateString = eventDate.toISOString().replace('Z', '');
464+
const eventDate = new Date(event.start.dateTime);
465+
const dateString = eventDate.toISOString().replace('Z', '');
465466

466467
const header = this.getDateHeaderFromDateTimeString(dateString);
467468
grouped[header] = grouped[header] || [];

packages/mgt-components/src/components/mgt-file-list/mgt-file-list.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ import {
1313
ProviderState
1414
} from '@microsoft/mgt-element';
1515
import { DriveItem } from '@microsoft/microsoft-graph-types';
16-
import { customElement, html, internalProperty, property, TemplateResult } from 'lit-element';
17-
import { repeat } from 'lit-html/directives/repeat';
16+
import { html, TemplateResult } from 'lit';
17+
import { customElement, property, state } from 'lit/decorators.js';
18+
import { repeat } from 'lit/directives/repeat.js';
1819
import {
1920
clearFilesCache,
2021
fetchNextAndCacheForFilesPageIterator,
@@ -497,7 +498,7 @@ export class MgtFileList extends MgtTemplatedComponent {
497498
// tracking user arrow key input of selection for accessibility purpose
498499
private _focusedItemIndex: number = -1;
499500

500-
@internalProperty() private _isLoadingMore: boolean;
501+
@state() private _isLoadingMore: boolean;
501502

502503
constructor() {
503504
super();

packages/mgt-components/src/components/mgt-file-list/mgt-file-upload/mgt-file-upload.ts

Lines changed: 76 additions & 60 deletions
Large diffs are not rendered by default.

packages/mgt-components/src/components/mgt-file/mgt-file.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
*/
77

88
import { DriveItem } from '@microsoft/microsoft-graph-types';
9-
import { customElement, html, property, TemplateResult } from 'lit-element';
9+
import { html, TemplateResult } from 'lit';
10+
import { customElement, property } from 'lit/decorators.js';
1011
import { styles } from './mgt-file-css';
1112
import { MgtTemplatedComponent, Providers, ProviderState } from '@microsoft/mgt-element';
1213
import {

packages/mgt-components/src/components/mgt-get/mgt-get.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
* -------------------------------------------------------------------------------------------
66
*/
77

8-
import { customElement, html, property } from 'lit-element';
8+
import { html } from 'lit';
9+
import { customElement, property } from 'lit/decorators.js';
910
import {
1011
CacheItem,
1112
CacheService,
@@ -400,7 +401,7 @@ export class MgtGet extends MgtTemplatedComponent {
400401

401402
if (image) {
402403
response = {
403-
image: image
404+
image
404405
};
405406
}
406407
}

packages/mgt-components/src/components/mgt-login/mgt-login.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
* -------------------------------------------------------------------------------------------
66
*/
77

8-
import { customElement, html, property } from 'lit-element';
9-
import { classMap } from 'lit-html/directives/class-map';
8+
import { html } from 'lit';
9+
import { customElement, property } from 'lit/decorators.js';
10+
import { classMap } from 'lit/directives/class-map.js';
1011
import { Providers, ProviderState, MgtTemplatedComponent, IProviderAccount } from '@microsoft/mgt-element';
1112

1213
import { AvatarSize, IDynamicPerson, ViewType } from '../../graph/types';

packages/mgt-components/src/components/mgt-people-picker/mgt-people-picker.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
*/
77

88
import { User } from '@microsoft/microsoft-graph-types';
9-
import { customElement, html, internalProperty, property, TemplateResult } from 'lit-element';
10-
import { classMap } from 'lit-html/directives/class-map';
11-
import { repeat } from 'lit-html/directives/repeat';
9+
import { html, TemplateResult } from 'lit';
10+
import { customElement, property, state } from 'lit/decorators.js';
11+
import { classMap } from 'lit/directives/class-map.js';
12+
import { repeat } from 'lit/directives/repeat.js';
1213
import {
1314
findGroups,
1415
getGroupsForGroupIds,
@@ -499,9 +500,9 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
499500
// current user index to the left of the highlighted users
500501
private _currentHighlightedUserPos: number = 0;
501502

502-
@internalProperty() private _isFocused = false;
503+
@state() private _isFocused = false;
503504

504-
@internalProperty() private _foundPeople: IDynamicPerson[];
505+
@state() private _foundPeople: IDynamicPerson[];
505506

506507
private _mouseLeaveTimeout;
507508
private _mouseEnterTimeout;
@@ -877,13 +878,11 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
877878
*/
878879
protected renderSearchResults(people?: IDynamicPerson[]) {
879880
people = people || this._foundPeople;
880-
let filteredPeople = people.filter(person => person.id);
881-
let firstName = '';
881+
const filteredPeople = people.filter(person => person.id);
882882

883-
const selectedList = this.renderRoot.querySelector('.selected-list');
884883
let names = '';
885-
for (let i = 0; i < filteredPeople.length; i++) {
886-
names += filteredPeople[i].displayName.toString() + ' ';
884+
for (const person of filteredPeople) {
885+
names += person.displayName.toString() + ' ';
887886
}
888887

889888
return html`
@@ -1203,7 +1202,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
12031202
}
12041203
}
12051204
}
1206-
//people = this.getUniquePeople(people);
1205+
// people = this.getUniquePeople(people);
12071206
this._foundPeople = this.filterPeople(people);
12081207
}
12091208

@@ -1216,7 +1215,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
12161215
*/
12171216
private async getGroupsForGroupIds(graph: IGraph, people: IDynamicPerson[]) {
12181217
const groups = await getGroupsForGroupIds(graph, this.groupIds, this.groupFilters);
1219-
for (let group of groups as IDynamicPerson[]) {
1218+
for (const group of groups as IDynamicPerson[]) {
12201219
people = people.concat(group);
12211220
}
12221221
people = people.filter(person => person);
@@ -1648,7 +1647,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
16481647
} catch (error) {
16491648
if (error instanceof SyntaxError) {
16501649
const _delimeters = [',', ';'];
1651-
let listOfUsers: Array<string>;
1650+
let listOfUsers: string[];
16521651
try {
16531652
for (let i = 0; i < _delimeters.length; i++) {
16541653
listOfUsers = copiedText.split(_delimeters[i]);

0 commit comments

Comments
 (0)