Flatten output paths

`lib/esm/monaco.contribution.js` → `index.js`
`lib/esm/yaml.worker.js` → `yaml.worker.js`

Closes #132
This commit is contained in:
Remco Haszing 2021-11-15 18:30:47 +01:00
parent 545e6a6bc4
commit 90d895a214
No known key found for this signature in database
GPG key ID: 40D9F5FE9155FD3C
7 changed files with 72 additions and 78 deletions

4
.gitignore vendored
View file

@ -1,5 +1,7 @@
dist/ dist/
node_modules/ node_modules/
/lib/ /index.js
/yaml.worker.js
*.log *.log
*.map
*.tgz *.tgz

View file

@ -1,3 +1,3 @@
/dist/ dist/
/lib/ /index.js
/out/ /yaml.worker.js

View file

@ -1,18 +1,13 @@
const { promises: fs } = require('fs');
const { join } = require('path');
const { build } = require('esbuild'); const { build } = require('esbuild');
const { dependencies, peerDependencies } = require('./package.json'); const { dependencies, peerDependencies } = require('./package.json');
fs.rm(join(__dirname, 'lib'), { force: true, recursive: true })
.then(() =>
build({ build({
entryPoints: ['src/monaco.contribution.ts', 'src/yaml.worker.ts'], entryPoints: ['src/index.ts', 'src/yaml.worker.ts'],
bundle: true, bundle: true,
external: Object.keys({ ...dependencies, ...peerDependencies }), external: Object.keys({ ...dependencies, ...peerDependencies }),
logLevel: 'info', logLevel: 'info',
outdir: 'lib/esm', outdir: '.',
sourcemap: true, sourcemap: true,
format: 'esm', format: 'esm',
target: ['es2019'], target: ['es2019'],
@ -63,9 +58,7 @@ fs.rm(join(__dirname, 'lib'), { force: true, recursive: true })
}, },
}, },
], ],
}), }).catch((error) => {
)
.catch((error) => {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.error(error); console.error(error);
process.exit(1); process.exit(1);

View file

@ -31,7 +31,7 @@ window.MonacoEnvironment = {
case 'editorWorkerService': case 'editorWorkerService':
return new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker', import.meta.url)); return new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker', import.meta.url));
case 'yaml': case 'yaml':
return new Worker(new URL('monaco-yaml/lib/esm/yaml.worker', import.meta.url)); return new Worker(new URL('monaco-yaml/yaml.worker', import.meta.url));
default: default:
throw new Error(`Unknown label ${label}`); throw new Error(`Unknown label ${label}`);
} }

View file

@ -1,7 +1,7 @@
import { editor, Uri } from 'monaco-editor'; import { editor, Uri } from 'monaco-editor';
import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'; import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
import { setDiagnosticsOptions } from 'monaco-yaml'; import { setDiagnosticsOptions } from 'monaco-yaml';
import YamlWorker from 'monaco-yaml/lib/esm/yaml.worker?worker'; import YamlWorker from 'monaco-yaml/yaml.worker?worker';
window.MonacoEnvironment = { window.MonacoEnvironment = {
getWorker(moduleId, label) { getWorker(moduleId, label) {

View file

@ -7,12 +7,11 @@
"prepack": "node build.js", "prepack": "node build.js",
"prepare": "husky install" "prepare": "husky install"
}, },
"main": "./lib/esm/monaco.contribution.js",
"module": "./lib/esm/monaco.contribution.js",
"typings": "./index.d.ts", "typings": "./index.d.ts",
"files": [ "files": [
"lib", "index.js",
"index.d.ts" "index.d.ts",
"yaml.worker.js"
], ],
"workspaces": [ "workspaces": [
"examples/*" "examples/*"