ESM: Do not append the `.js` suffix to imports if it's already there

pull/2921/head
Alex Dima
parent 5330724dff
commit 1134d5e82b
No known key found for this signature in database
GPG Key ID: 39563C1504FDD0C9

@ -272,7 +272,8 @@ function ESM_addImportSuffix(files) {
const pos = info.importedFiles[i].pos;
const end = info.importedFiles[i].end;
if (/\.css$/.test(importText)) {
if (/(\.css)|(\.js)$/.test(importText)) {
// A CSS import or an import already using .js
continue;
}

6
package-lock.json generated

@ -1159,9 +1159,9 @@
}
},
"monaco-editor-core": {
"version": "0.32.0-dev.20220124",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.32.0-dev.20220124.tgz",
"integrity": "sha512-R1MawhuYlGGRNI2jF2jC1z894XGG9NyQnZ6TXLgo88ygaAQUvxp0q4pQp+rkL0x2Q0DZF1CbvclKJlxfniAdiw==",
"version": "0.32.0-dev.20220126",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.32.0-dev.20220126.tgz",
"integrity": "sha512-qHwkHRgotDKe+9zXT2t2E7hHnrFHUPoaPuwJhsgRSPGTxoMlLL+qxbf9xsQI634Fl9TjOzDsH8OOD5p1hTvJdA==",
"dev": true
},
"mri": {

@ -41,7 +41,7 @@
"jsdom": "^19.0.0",
"jsonc-parser": "^3.0.0",
"mocha": "^9.1.3",
"monaco-editor-core": "0.32.0-dev.20220124",
"monaco-editor-core": "0.32.0-dev.20220126",
"playwright": "^1.16.3",
"prettier": "^2.4.1",
"pretty-quick": "^3.1.1",

@ -2094,6 +2094,21 @@ declare namespace monaco.editor {
isAttachedToEditor(): boolean;
}
export enum PositionAffinity {
/**
* Prefers the left most position.
*/
Left = 0,
/**
* Prefers the right most position.
*/
Right = 1,
/**
* No preference.
*/
None = 2
}
/**
* A change
*/
@ -4466,8 +4481,13 @@ declare namespace monaco.editor {
/**
* The column after which this zone should appear.
* If not set, the maxLineColumn of `afterLineNumber` will be used.
* This is relevant for wrapped lines.
*/
afterColumn?: number;
/**
* If the `afterColumn` has multiple view columns, the affinity specifies which one to use. Defaults to `none`.
*/
afterColumnAffinity?: PositionAffinity;
/**
* Suppress mouse down events.
* If set, the editor will attach a mouse down listener to the view zone and .preventDefault on it.
@ -6196,6 +6216,11 @@ declare namespace monaco.languages {
*/
readonly range?: IRange;
readonly command?: Command;
/**
* If set to `true`, unopened closing brackets are removed and unclosed opening brackets are closed.
* Defaults to `false`.
*/
readonly completeBracketPairs?: boolean;
}
export interface InlineCompletions<TItem extends InlineCompletion = InlineCompletion> {

@ -2094,6 +2094,21 @@ declare namespace monaco.editor {
isAttachedToEditor(): boolean;
}
export enum PositionAffinity {
/**
* Prefers the left most position.
*/
Left = 0,
/**
* Prefers the right most position.
*/
Right = 1,
/**
* No preference.
*/
None = 2
}
/**
* A change
*/
@ -4466,8 +4481,13 @@ declare namespace monaco.editor {
/**
* The column after which this zone should appear.
* If not set, the maxLineColumn of `afterLineNumber` will be used.
* This is relevant for wrapped lines.
*/
afterColumn?: number;
/**
* If the `afterColumn` has multiple view columns, the affinity specifies which one to use. Defaults to `none`.
*/
afterColumnAffinity?: PositionAffinity;
/**
* Suppress mouse down events.
* If set, the editor will attach a mouse down listener to the view zone and .preventDefault on it.
@ -6196,6 +6216,11 @@ declare namespace monaco.languages {
*/
readonly range?: IRange;
readonly command?: Command;
/**
* If set to `true`, unopened closing brackets are removed and unclosed opening brackets are closed.
* Defaults to `false`.
*/
readonly completeBracketPairs?: boolean;
}
export interface InlineCompletions<TItem extends InlineCompletion = InlineCompletion> {

Loading…
Cancel
Save