Always compile to esm

This commit is contained in:
Alex Dima 2018-03-08 16:48:54 +01:00
parent e2b014d8d7
commit 9be21f963e
5 changed files with 4 additions and 13 deletions

1
.gitignore vendored
View file

@ -1,4 +1,3 @@
/node_modules/ /node_modules/
/out/ /out/
/out-esm/
/release/ /release/

View file

@ -3,7 +3,7 @@
"version": "1.3.2", "version": "1.3.2",
"description": "JSON plugin for the Monaco Editor", "description": "JSON plugin for the Monaco Editor",
"scripts": { "scripts": {
"compile": "node ./scripts/rmdir.js ./out && tsc -p ./src && tsc -p ./src/tsconfig.esm.json", "compile": "node ./scripts/rmdir.js ./out && tsc -p ./src",
"watch": "tsc -p ./src --watch", "watch": "tsc -p ./src --watch",
"prepublish": "node ./scripts/rmdir.js ./release && npm run compile && node ./scripts/release.js && webpack --config webpack.dev.config.js && webpack --config webpack.min.config.js && node ./scripts/copy.js ./src/monaco.d.ts ./release/min/monaco.d.ts", "prepublish": "node ./scripts/rmdir.js ./release && npm run compile && node ./scripts/release.js && webpack --config webpack.dev.config.js && webpack --config webpack.min.config.js && node ./scripts/copy.js ./src/monaco.d.ts ./release/min/monaco.d.ts",
"install-service-next": "npm install vscode-json-languageservice@next -f -D && npm install vscode-languageserver-types@next -f -D", "install-service-next": "npm install vscode-json-languageservice@next -f -D && npm install vscode-languageserver-types@next -f -D",

View file

@ -6,7 +6,7 @@ var path = require("path");
var REPO_ROOT = path.join(__dirname, '../'); var REPO_ROOT = path.join(__dirname, '../');
process({ process({
repoRoot: REPO_ROOT, repoRoot: REPO_ROOT,
esmSource: 'out-esm', esmSource: 'out',
esmDestination: 'release/esm', esmDestination: 'release/esm',
entryPoints: [ entryPoints: [
'monaco.contribution.js', 'monaco.contribution.js',
@ -14,7 +14,7 @@ process({
'json.worker.js' 'json.worker.js'
], ],
resolveAlias: { resolveAlias: {
'vscode-nls': path.join(REPO_ROOT, "out-esm/fillers/vscode-nls.js") 'vscode-nls': path.join(REPO_ROOT, "out/fillers/vscode-nls.js")
}, },
resolveSkip: [ resolveSkip: [
'monaco-editor-core' 'monaco-editor-core'

View file

@ -1,8 +0,0 @@
{
"compilerOptions": {
"module": "es6",
"moduleResolution": "node",
"outDir": "../out-esm",
"target": "es5"
}
}

View file

@ -1,6 +1,6 @@
{ {
"compilerOptions": { "compilerOptions": {
"module": "umd", "module": "es6",
"moduleResolution": "node", "moduleResolution": "node",
"outDir": "../out", "outDir": "../out",
"target": "es5" "target": "es5"