Skip to content

Commit 273338f

Browse files
authored
Merge branch 'master' into support-subject
2 parents 6484f8b + dec4dc3 commit 273338f

File tree

3 files changed

+1025
-333
lines changed

3 files changed

+1025
-333
lines changed

config/rollup.config.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
import commonjs from 'rollup-plugin-commonjs'
88
import uglify from 'rollup-plugin-babili'
99
export default {
10-
exports: 'named',
11-
entry: './src/main.js',
12-
dest: './.dist/observable-air.js',
13-
format: 'umd',
14-
moduleName: 'O',
10+
input: './src/main.js',
11+
output: {
12+
exports: 'named',
13+
name: 'O',
14+
format: 'umd',
15+
file: './.dist/observable-air.js',
16+
},
1517
plugins: [
1618
uglify(),
1719
commonjs({}),

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
"nyc": "^11.0.3",
3535
"prettify": "^0.1.7",
3636
"request-promise": "^4.1.1",
37-
"rollup": "^0.52.0",
37+
"rollup": "^0.53.0",
3838
"rollup-plugin-babili": "^3.0.0",
3939
"rollup-plugin-commonjs": "^8.0.2",
4040
"rollup-plugin-uglify": "^2.0.1",
4141
"semantic-release": "^11.0.2",
42-
"ts-node": "^3.3.0",
42+
"ts-node": "^4.0.0",
4343
"tslint": "^5.3.2",
4444
"typescript": "^2.0.3",
4545
"uglify": "^0.1.5",

0 commit comments

Comments
 (0)