Skip to content

Commit

Permalink
Let "module" version not be ES6, just ESM. (#462)
Browse files Browse the repository at this point in the history
* Let "module" version not be ES6, just ESM.
Best practice seems to be not to deliver ES6 modules but ESM modules (just ES module syntax but not other non-ES5 code).
Resolves #460.
  • Loading branch information
dfahlander committed Jan 30, 2017
1 parent 6caf09b commit 733bda4
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 69 deletions.
4 changes: 2 additions & 2 deletions addons/Dexie.Observable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0.0-beta.2",
"description": "Addon to Dexie that makes it possible to observe database changes no matter if they occur on other db instance or other window.",
"main": "dist/dexie-observable.js",
"module": "src/Dexie.Observable.js",
"jsnext:main": "src/Dexie.Observable.js",
"module": "dist/dexie-observable.jsm",
"jsnext:main": "dist/dexie-observable.jsm",
"typings": "dist/dexie-observable.d.ts",
"jspm": {
"format": "cjs",
Expand Down
18 changes: 0 additions & 18 deletions addons/Dexie.Observable/tools/build-configs/rollup.config.es6.js

This file was deleted.

9 changes: 7 additions & 2 deletions addons/Dexie.Observable/tools/build-configs/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ const version = require(path.resolve(__dirname, '../../package.json')).version;

export default {
entry: 'tools/tmp/es5/src/Dexie.Observable.js',
dest: 'dist/dexie-observable.js',
format: 'umd',
targets: [{
dest: 'dist/dexie-observable.js',
format: 'umd',
},{
dest: 'dist/dexie-observable.es.js',
format: 'es'
}],
sourceMap: true,
banner: readFileSync(path.resolve(__dirname, 'banner.txt'))+""
.replace(/{version}/g, version)
Expand Down
4 changes: 3 additions & 1 deletion addons/Dexie.Syncable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"version": "1.0.0-beta.2",
"description": "Addon to Dexie that makes it possible to sync indexeDB with remote databases.",
"main": "dist/dexie-syncable.js",
"jsnext:main": "src/Dexie.Syncable.js",
"module": "dist/dexie-syncable.jsm",
"jsnext:main": "dist/dexie-syncable.jsm",
"typings": "dist/dexie-syncable.d.ts",
"jspm": {
"format": "cjs",
"ignore": [
Expand Down
18 changes: 0 additions & 18 deletions addons/Dexie.Syncable/tools/build-configs/rollup.config.es6.js

This file was deleted.

9 changes: 7 additions & 2 deletions addons/Dexie.Syncable/tools/build-configs/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ const version = require(path.resolve(__dirname, '../../package.json')).version;

export default {
entry: 'tools/tmp/es5/addons/Dexie.Syncable/src/Dexie.Syncable.js',
dest: 'dist/dexie-syncable.js',
format: 'umd',
targets: [{
dest: 'dist/dexie-syncable.js',
format: 'umd',
},{
dest: 'dist/dexie-syncable.es.js',
format: 'es'
}],
sourceMap: true,
banner: readFileSync(path.resolve(__dirname, 'banner.txt'))+""
.replace(/{version}/g, version)
Expand Down
11 changes: 3 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "2.0.0-beta.9",
"description": "A Minimalistic Wrapper for IndexedDB",
"main": "dist/dexie.js",
"module": "dist/dexie.es6.js",
"jsnext:main": "dist/dexie.es6.js",
"module": "dist/dexie.jsm",
"jsnext:main": "dist/dexie.jsm",
"typings": "dist/dexie.d.ts",
"jspm": {
"format": "cjs",
Expand Down Expand Up @@ -53,14 +53,9 @@
"node tools/replaceVersionAndDate.js dist/dexie.js",
"eslint src"
],
"dexie-es6": [
"tsc --allowJs -t es2015 -m es2015 --outDir tools/tmp/es6/src/ --sourceMap src/Dexie.js [--watch 'Compilation complete.']",
"rollup -c tools/build-configs/rollup.config.es6.js",
"node tools/replaceVersionAndDate.js dist/dexie.es6.js"
],
"release": [
"# Build ES5 umd module as well as the es6 module.",
"just-build dexie dexie-es6",
"just-build dexie",
"# Copy Dexie.d.ts to dist and replace version in it",
"node -e \"fs.writeFileSync('dist/dexie.d.ts', fs.readFileSync('src/Dexie.d.ts'))\"",
"node tools/replaceVersionAndDate.js dist/dexie.d.ts",
Expand Down
16 changes: 0 additions & 16 deletions tools/build-configs/rollup.config.es6.js

This file was deleted.

9 changes: 7 additions & 2 deletions tools/build-configs/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ const version = require(path.resolve(__dirname, '../../package.json')).version;

export default {
entry: 'tools/tmp/es5/src/Dexie.js',
dest: 'dist/dexie.js',
format: 'umd',
targets: [{
dest: 'dist/dexie.js',
format: 'umd',
},{
dest: 'dist/dexie.es.js',
format: 'es'
}],
sourceMap: true,
banner: readFileSync(path.resolve(__dirname, 'banner.txt'))+""
.replace(/{version}/g, version)
Expand Down

0 comments on commit 733bda4

Please sign in to comment.