Skip to content

Commit acadb09

Browse files
Add explicit file extensions to module imports (microsoft#436)
Description of changes Fixes an ESM-related bug caused by a lack of explicit file extensions (i.e. `import file` versus `import file.js`) in module imports.
1 parent bfb9755 commit acadb09

Some content is hidden

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

43 files changed

+99
-154
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,3 @@ jobs:
5959

6060
- name: Build Toolkit 🏗
6161
run: npm run build
62-
63-
build-docs:
64-
runs-on: ubuntu-latest
65-
timeout-minutes: 10
66-
steps:
67-
- name: Checkout 🛎️
68-
uses: actions/checkout@v2
69-
70-
- name: Setup Node 💾
71-
uses: actions/setup-node@v2
72-
with:
73-
node-version: '14'
74-
75-
- name: Install Dependencies 📥
76-
run: npm install
77-
78-
- name: Build Docs 🏗
79-
run: npm run build:docs

.github/workflows/docs-cd.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

azure-pipelines.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,3 @@ stages:
110110
displayName: 'Publish Artifacts 📦'
111111
inputs:
112112
ArtifactName: 'drop'
113-
114-
- job: docs
115-
timeoutInMinutes: 10
116-
117-
steps:
118-
- task: NodeTool@0
119-
displayName: 'Setup Node 💾'
120-
inputs:
121-
versionSpec: '14.x'
122-
123-
- script: npm install
124-
displayName: 'Install Dependencies 📥'
125-
126-
- script: npm run build:docs
127-
displayName: 'Build Docs 🏗'

src/badge/badge.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
fontFamily,
1717
typeRampMinus1FontSize,
1818
typeRampMinus1LineHeight,
19-
} from '../design-tokens';
19+
} from '../design-tokens.js';
2020

2121
export const badgeStyles = (
2222
context: ElementDefinitionContext,

src/badge/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
FoundationElementDefinition,
77
badgeTemplate as template,
88
} from '@microsoft/fast-foundation';
9-
import {badgeStyles as styles} from './badge.styles';
9+
import {badgeStyles as styles} from './badge.styles.js';
1010

1111
/**
1212
* The Visual Studio Code badge class.

src/button/button.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
foreground,
3434
typeRampBaseFontSize,
3535
typeRampBaseLineHeight,
36-
} from '../design-tokens';
36+
} from '../design-tokens.js';
3737

3838
/**
3939
* Developer note:

src/button/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
Button as FoundationButton,
88
buttonTemplate as template,
99
} from '@microsoft/fast-foundation';
10-
import {buttonStyles as styles} from './button.styles';
10+
import {buttonStyles as styles} from './button.styles.js';
1111

1212
/**
1313
* Types of button appearance.

src/checkbox/checkbox.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
foreground,
2222
typeRampBaseFontSize,
2323
typeRampBaseLineHeight,
24-
} from '../design-tokens';
24+
} from '../design-tokens.js';
2525

2626
export const checkboxStyles = (
2727
context: ElementDefinitionContext,

src/checkbox/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
Checkbox as FoundationCheckbox,
77
checkboxTemplate as template,
88
} from '@microsoft/fast-foundation';
9-
import {checkboxStyles as styles} from './checkbox.styles';
9+
import {checkboxStyles as styles} from './checkbox.styles.js';
1010

1111
/**
1212
* The Visual Studio Code checkbox class.

src/custom-elements.ts

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33
import type {Container} from '@microsoft/fast-foundation';
4-
import {vsCodeBadge} from './badge/index';
5-
import {vsCodeButton} from './button/index';
6-
import {vsCodeCheckbox} from './checkbox/index';
4+
import {vsCodeBadge} from './badge/index.js';
5+
import {vsCodeButton} from './button/index.js';
6+
import {vsCodeCheckbox} from './checkbox/index.js';
77
import {
88
vsCodeDataGrid,
99
vsCodeDataGridCell,
1010
vsCodeDataGridRow,
11-
} from './data-grid/index';
12-
import {vsCodeDivider} from './divider/index';
13-
import {vsCodeDropdown} from './dropdown/index';
14-
import {vsCodeLink} from './link/index';
15-
import {vsCodeOption} from './option/index';
16-
import {vsCodePanels, vsCodePanelTab, vsCodePanelView} from './panels/index';
17-
import {vsCodeProgressRing} from './progress-ring/index';
18-
import {vsCodeRadioGroup} from './radio-group/index';
19-
import {vsCodeRadio} from './radio/index';
20-
import {vsCodeTag} from './tag/index';
21-
import {vsCodeTextArea} from './text-area/index';
22-
import {vsCodeTextField} from './text-field/index';
11+
} from './data-grid/index.js';
12+
import {vsCodeDivider} from './divider/index.js';
13+
import {vsCodeDropdown} from './dropdown/index.js';
14+
import {vsCodeLink} from './link/index.js';
15+
import {vsCodeOption} from './option/index.js';
16+
import {vsCodePanels, vsCodePanelTab, vsCodePanelView} from './panels/index.js';
17+
import {vsCodeProgressRing} from './progress-ring/index.js';
18+
import {vsCodeRadioGroup} from './radio-group/index.js';
19+
import {vsCodeRadio} from './radio/index.js';
20+
import {vsCodeTag} from './tag/index.js';
21+
import {vsCodeTextArea} from './text-area/index.js';
22+
import {vsCodeTextField} from './text-field/index.js';
2323

2424
// Don't delete these. They're needed so that API-extractor doesn't add import types
2525
// with improper pathing
2626
/* eslint-disable @typescript-eslint/no-unused-vars */
27-
import type {Badge} from './badge/index';
28-
import type {Button} from './button/index';
29-
import type {Checkbox} from './checkbox/index';
30-
import type {DataGrid, DataGridCell, DataGridRow} from './data-grid/index';
31-
import type {Divider} from './divider/index';
32-
import type {Dropdown} from './dropdown/index';
33-
import type {Link} from './link/index';
34-
import type {Option} from './option/index';
35-
import type {Panels, PanelTab, PanelView} from './panels/index';
36-
import type {ProgressRing} from './progress-ring/index';
37-
import type {RadioGroup} from './radio-group/index';
38-
import type {Radio} from './radio/index';
39-
import type {Tag} from './tag/index';
40-
import type {TextArea} from './text-area/index';
41-
import type {TextField} from './text-field/index';
27+
import type {Badge} from './badge/index.js';
28+
import type {Button} from './button/index.js';
29+
import type {Checkbox} from './checkbox/index.js';
30+
import type {DataGrid, DataGridCell, DataGridRow} from './data-grid/index.js';
31+
import type {Divider} from './divider/index.js';
32+
import type {Dropdown} from './dropdown/index.js';
33+
import type {Link} from './link/index.js';
34+
import type {Option} from './option/index.js';
35+
import type {Panels, PanelTab, PanelView} from './panels/index.js';
36+
import type {ProgressRing} from './progress-ring/index.js';
37+
import type {RadioGroup} from './radio-group/index.js';
38+
import type {Radio} from './radio/index.js';
39+
import type {Tag} from './tag/index.js';
40+
import type {TextArea} from './text-area/index.js';
41+
import type {TextField} from './text-field/index.js';
4242

4343
// export all components
4444
export {

0 commit comments

Comments
 (0)