Skip to content

Commit

Permalink
Load json with es2015 modules agiain. Revert when microsoft/TypeScrip…
Browse files Browse the repository at this point in the history
…t#25755 has been resolved. (#4143)
  • Loading branch information
domoritz committed Aug 23, 2018
1 parent a58dc0d commit 1410c03
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test": "test"
},
"scripts": {
"prebuild": "mkdir -p build/src",
"prebuild": "mkdir -p build/src && cp package.json build/",
"build": "npm run build:only",
"build:only": "tsc && rollup -c",
"postbuild": "uglifyjs build/vega-lite.js -cm --source-map content=build/vega-lite.js.map,filename=build/vega-lite.min.js.map -o build/vega-lite.min.js && npm run schema",
Expand Down
3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
"compilerOptions": {
"outDir": "./build/",
"target": "es5",
"module": "commonjs",
"module": "es2015",
"moduleResolution": "node",
"resolveJsonModule": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"declaration": true,
Expand Down
4 changes: 4 additions & 0 deletions typings/json.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
declare module '*.json' {
const value: any;
export default value;
}

0 comments on commit 1410c03

Please sign in to comment.