update AMD builds

wq · Jul 1, 2019 · 6b0fd40 · 6b0fd40
1 parent 8c67580
commit 6b0fd40
Show file tree

Hide file tree

Showing 13 changed files with 170 additions and 56 deletions.
diff --git a/Makefile b/Makefile
@@ -35,17 +35,28 @@ js_leaflet_draw:
  cat packages/map/node_modules/leaflet-draw/dist/leaflet.draw-src.js >> js/leaflet.draw.js
  echo "\n});" >> js/leaflet.draw.js
 
-js_lib: js_build js_leaflet_draw
+js_regenerator_runtime:
+ echo "define(function() {" > js/regenerator-runtime.js
+ cat node_modules/regenerator-runtime/runtime.js >> js/regenerator-runtime.js
+ echo "\nreturn regeneratorRuntime;\n});" >> js/regenerator-runtime.js
+
+js_lib: js_build js_leaflet_draw js_regenerator_runtime
  cp -p packages/chart/node_modules/d3/dist/d3.js js/d3.js
  cp -p packages/map/node_modules/esri-leaflet/dist/esri-leaflet-debug.js js/esri-leaflet.js
  cp -p packages/markdown/dist/highlight.js js/highlight.js
  cp -p packages/jquery-mobile/node_modules/jquery/dist/jquery.js js/jquery.js
  cp -p packages/jquery-mobile/dist/jquery.mobile.js js/jquery.mobile.js
  cp -p packages/store/node_modules/redux/dist/redux.js js/redux.js
+ cp -p packages/store/node_modules/redux-persist/dist/redux-persist.js js/redux-persist.js
+ cp -p packages/store/node_modules/redux-logger/dist/redux-logger.js js/redux-logger.js
  cp -p packages/router/node_modules/redux-first-router/dist/redux-first-router.js js/redux-first-router.js
+ cp -p packages/model/node_modules/redux-orm/dist/redux-orm.js js/redux-orm.js
+ sed -i "s/ReduxOrm/redux-orm/" js/redux-orm.js
+ cp -p packages/outbox/dist/redux-offline.js js/redux-offline.js
  cp -p packages/outbox/dist/json-forms.js js/json-forms.js
  cp -p packages/map/node_modules/leaflet/dist/leaflet-src.js js/leaflet.js
  cp -p packages/map/node_modules/leaflet.markercluster/dist/leaflet.markercluster-src.js js/leaflet.markercluster.js
+ sed -i "s/'exports'/'exports', 'leaflet'/" js/leaflet.markercluster.js
  cp -p packages/map/node_modules/leaflet.wms/dist/leaflet.wms.js js/leaflet.wms.js
  cp -p packages/store/node_modules/localforage/dist/localforage.js js/localforage.js
  cp -p packages/markdown/node_modules/marked/lib/marked.js js/marked.js

diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js
@@ -1,5 +1,5 @@
 import pkg from './package.json';
-import { makeBanner, wqDeps, babel } from '../../rollup-utils.js';
+import { makeBanner, wqDeps, babelNPM, babelAMD } from '../../rollup-utils.js';
 const banners = {
  app: makeBanner(pkg, 2012),
  patterns: makeBanner(
@@ -33,7 +33,7 @@ export default [
  // ESM
  {
  input: 'packages/app/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [wqDeps('@wq'), babelNPM()],
  external: ['localforage'],
  output: [
  {
@@ -46,7 +46,7 @@ export default [
  // CJS
  {
  input: 'packages/app/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [wqDeps('@wq'), babelNPM()],
  external: ['localforage'],
  output: [
  {
@@ -60,7 +60,7 @@ export default [
  // AMD (for wq.app Python package)
  {
  input: 'packages/app/src/app.js',
- plugins: [wqDeps('.'), babel()],
+ plugins: [wqDeps('.'), babelAMD()],
  external: ['./spinner'],
  output: [
  {
@@ -73,7 +73,7 @@ export default [
  },
  {
  input: 'packages/app/src/patterns.js',
- plugins: [wqDeps('.'), babel()],
+ plugins: [wqDeps('.'), babelAMD()],
  output: [
  {
  banner: banners.patterns,
@@ -85,7 +85,7 @@ export default [
  },
  {
  input: 'packages/app/src/photos.js',
- plugins: [wqDeps('.'), babel()],
+ plugins: [wqDeps('.'), babelAMD()],
  external: ['localforage'],
  output: [
  {
@@ -98,7 +98,7 @@ export default [
  },
  {
  input: 'packages/app/src/spinner.js',
- plugins: [babel()],
+ plugins: [babelAMD()],
  output: [
  {
  banner: banners.spinner,

diff --git a/packages/chart/rollup.config.js b/packages/chart/rollup.config.js
@@ -1,6 +1,6 @@
 import ignore from 'rollup-plugin-ignore';
 import pkg from './package.json';
-import { makeBanner, wqDeps, babel } from '../../rollup-utils.js';
+import { makeBanner, wqDeps, babelNPM, babelAMD } from '../../rollup-utils.js';
 const banners = {
  chart: makeBanner(pkg, 2013),
  chartapp: makeBanner(
@@ -26,7 +26,7 @@ export default [
  // ESM
  {
  input: 'packages/chart/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [wqDeps('@wq'), babelNPM()],
  external: ['d3', 'whatwg-fetch'],
  output: [
  {
@@ -39,7 +39,7 @@ export default [
  // CJS
  {
  input: 'packages/chart/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [wqDeps('@wq'), babelNPM()],
  external: ['d3', 'whatwg-fetch'],
  output: [
  {
@@ -53,7 +53,7 @@ export default [
  // AMD (for wq.app Python package)
  {
  input: 'packages/chart/src/chart.js',
- plugins: [wqDeps(), babel()],
+ plugins: [wqDeps(), babelAMD()],
  external: ['d3'],
  output: [
  {
@@ -66,7 +66,7 @@ export default [
  },
  {
  input: 'packages/chart/src/chartapp.js',
- plugins: [wqDeps(), ignore(['whatwg-fetch']), babel()],
+ plugins: [wqDeps(), ignore(['whatwg-fetch']), babelAMD()],
  external: ['d3', './chart', './pandas'],
  output: [
  {
@@ -79,7 +79,7 @@ export default [
  },
  {
  input: 'packages/chart/src/pandas.js',
- plugins: [wqDeps(), ignore(['whatwg-fetch']), babel()],
+ plugins: [wqDeps(), ignore(['whatwg-fetch']), babelAMD()],
  external: ['d3'],
  output: [
  {

diff --git a/packages/map/rollup.config.js b/packages/map/rollup.config.js
@@ -1,5 +1,5 @@
 import pkg from './package.json';
-import { makeBanner, wqDeps, babel } from '../../rollup-utils.js';
+import { makeBanner, wqDeps, babelNPM, babelAMD } from '../../rollup-utils.js';
 const banners = {
  map: makeBanner(pkg, 2013),
  locate: makeBanner(
@@ -25,7 +25,7 @@ export default [
  // ESM
  {
  input: 'packages/map/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [wqDeps('@wq'), babelNPM()],
  external: ['leaflet', 'esri-leaflet', 'leaflet.wms'],
  output: [
  {
@@ -38,7 +38,7 @@ export default [
  // CJS
  {
  input: 'packages/map/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [wqDeps('@wq'), babelNPM()],
  external: ['leaflet', 'esri-leaflet', 'leaflet.wms'],
  output: [
  {
@@ -52,7 +52,7 @@ export default [
  // AMD (for wq.app Python package)
  {
  input: 'packages/map/src/map.js',
- plugins: [wqDeps('.'), babel()],
+ plugins: [wqDeps('.'), babelAMD()],
  external: ['leaflet'],
  output: [
  {
@@ -66,7 +66,7 @@ export default [
  {
  input: 'packages/map/src/locate.js',
  external: ['leaflet'],
- plugins: [babel()],
+ plugins: [babelAMD()],
  output: [
  {
  banner: banners.locate,
@@ -79,7 +79,7 @@ export default [
  {
  input: 'packages/map/src/mapserv.js',
  external: ['leaflet', 'esri-leaflet', 'leaflet.wms', './map'],
- plugins: [babel()],
+ plugins: [babelAMD()],
  output: [
  {
  banner: banners.mapserv,

diff --git a/packages/markdown/rollup.config.js b/packages/markdown/rollup.config.js
@@ -1,14 +1,19 @@
 import commonjs from 'rollup-plugin-commonjs';
 import resolve from 'rollup-plugin-node-resolve';
 import pkg from './package.json';
-import { makeBanner, vendorLib, babel } from '../../rollup-utils.js';
+import {
+ makeBanner,
+ vendorLib,
+ babelNPM,
+ babelAMD
+} from '../../rollup-utils.js';
 const banner = makeBanner(pkg, 2013);
 
 export default [
  // ESM
  {
  input: 'packages/markdown/index.js',
- plugins: [babel()],
+ plugins: [babelNPM()],
  external: id => id === 'marked' || id.match(/^highlight\.js\/./),
  output: [
  {
@@ -21,7 +26,7 @@ export default [
  // CJS
  {
  input: 'packages/markdown/index.js',
- plugins: [babel()],
+ plugins: [babelNPM()],
  external: id => id === 'marked' || id.match(/^highlight\.js\/./),
  output: [
  {
@@ -35,7 +40,7 @@ export default [
  {
  input: 'packages/markdown/index.js',
  external: ['marked'],
- plugins: [vendorLib('./highlight'), babel()],
+ plugins: [vendorLib('./highlight'), babelAMD()],
  output: [
  {
  banner: banner,

diff --git a/packages/model/rollup.config.js b/packages/model/rollup.config.js
@@ -1,14 +1,14 @@
 import commonjs from 'rollup-plugin-commonjs';
 import resolve from 'rollup-plugin-node-resolve';
 import pkg from './package.json';
-import { makeBanner, wqDeps, babel } from '../../rollup-utils.js';
+import { makeBanner, wqDeps, babelNPM, babelAMD } from '../../rollup-utils.js';
 const banner = makeBanner(pkg, 2012);
 
 export default [
  // ESM
  {
  input: 'packages/model/index.js',
- plugins: [wqDeps('@wq'), commonjs(), resolve(), babel()],
+ plugins: [wqDeps('@wq'), commonjs(), resolve(), babelNPM()],
  external: ['redux-orm'],
  output: [
  {
@@ -21,26 +21,28 @@ export default [
  // CJS
  {
  input: 'packages/model/index.js',
- plugins: [wqDeps('@wq'), commonjs(), resolve(), babel()],
+ plugins: [wqDeps('@wq'), commonjs(), resolve(), babelNPM()],
  external: ['redux-orm'],
  output: [
  {
  banner: banner,
  file: 'packages/model/dist/index.js',
- format: 'cjs'
+ format: 'cjs',
+ exports: 'named'
  }
  ]
  },
  // AMD (for wq.app Python package)
  {
  input: 'packages/model/index.js',
- plugins: [wqDeps(), commonjs(), resolve(), babel()],
+ plugins: [wqDeps(), commonjs(), resolve(), babelAMD()],
  external: ['redux-orm'],
  output: [
  {
  banner: banner,
  file: 'packages/model/dist/model.js',
  format: 'amd',
+ exports: 'named',
  indent: false
  }
  ]

diff --git a/packages/outbox/rollup.config.js b/packages/outbox/rollup.config.js
@@ -1,12 +1,42 @@
+import commonjs from 'rollup-plugin-commonjs';
+import resolve from 'rollup-plugin-node-resolve';
 import pkg from './package.json';
-import { makeBanner, wqDeps, vendorLib, babel } from '../../rollup-utils.js';
+import {
+ makeBanner,
+ wqDeps,
+ vendorLib,
+ babelNPM,
+ babelAMD
+} from '../../rollup-utils.js';
 const banner = makeBanner(pkg, 2012);
 
+const offlineForAMD = {
+ resolveId(path) {
+ if (path === './offline') {
+ return {
+ id: 'redux-offline',
+ external: true
+ };
+ }
+ }
+};
+
+const offlineForNPM = {
+ resolveId(path) {
+ if (path.match(/^@redux-offline/)) {
+ return {
+ id: path,
+ external: true
+ };
+ }
+ }
+};
+
 export default [
  // ESM
  {
  input: 'packages/outbox/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [offlineForNPM, wqDeps('@wq'), babelNPM()],
  output: [
  {
  banner: banner,
@@ -18,25 +48,31 @@ export default [
  // CJS
  {
  input: 'packages/outbox/index.js',
- plugins: [wqDeps('@wq'), babel()],
+ plugins: [offlineForNPM, wqDeps('@wq'), babelNPM()],
  output: [
  {
  banner: banner,
  file: 'packages/outbox/dist/index.js',
- format: 'cjs'
+ format: 'cjs',
+ exports: 'named'
  }
  ]
  },
  // AMD (for wq.app Python package)
  {
  input: 'packages/outbox/index.js',
- external: ['json-forms'],
- plugins: [wqDeps(), vendorLib('../vendor/json-forms'), babel()],
+ plugins: [
+ offlineForAMD,
+ wqDeps(),
+ vendorLib('../vendor/json-forms'),
+ babelAMD()
+ ],
  output: [
  {
  banner: banner,
  file: 'packages/outbox/dist/outbox.js',
  format: 'amd',
+ exports: 'named',
  indent: false
  }
  ]
@@ -50,5 +86,17 @@ export default [
  indent: false
  }
  ]
+ },
+ {
+ input: 'packages/outbox/src/offline.js',
+ plugins: [resolve(), commonjs()],
+ external: ['redux', 'redux-persist'],
+ output: [
+ {
+ file: 'packages/outbox/dist/redux-offline.js',
+ format: 'amd',
+ indent: false
+ }
+ ]
  }
 ];
diff --git a/packages/outbox/src/offline.js b/packages/outbox/src/offline.js
@@ -0,0 +1,6 @@
+import { createOffline } from '@redux-offline/redux-offline';
+import offlineConfig from '@redux-offline/redux-offline/lib/defaults';
+import { RESET_STATE } from '@redux-offline/redux-offline/lib/constants';
+import { busy } from '@redux-offline/redux-offline/lib/actions';
+
+export { createOffline, offlineConfig, RESET_STATE, busy };