merge @wq/template into @wq/jquery-mobile

Makefile

@@ -23,12 +23,8 @@ js_wq: js_build
 	cp -p packages/material/dist/material.js* js/wq/
 	cp -p packages/model/dist/model.js* js/wq/
 	cp -p packages/outbox/dist/outbox.js* js/wq/
-	cp -p packages/app/dist/patterns.js* js/wq/
-	cp -p packages/app/dist/photos.js* js/wq/
 	cp -p packages/router/dist/router.js* js/wq/
-	cp -p packages/app/dist/spinner.js* js/wq/
 	cp -p packages/store/dist/store.js* js/wq/
-	cp -p packages/template/dist/template.js* js/wq/
 
 js_leaflet_draw:
 	echo "define(['leaflet'], function(L) {" > js/leaflet.draw.js
@@ -56,7 +52,7 @@ js_lib: js_build js_leaflet_draw js_regenerator_runtime
 	sed -i "s/'exports'/'exports', 'leaflet'/" js/leaflet.markercluster.js
 	cp -p packages/leaflet/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/template/node_modules/mustache/mustache.js js/mustache.js
+	cp -p packages/jquery-mobile/node_modules/mustache/mustache.js js/mustache.js
 	cp -p node_modules/requirejs/require.js js/require.js
 
 css: init

babel.config.js

@@ -1,7 +1,5 @@
 module.exports = {
-    plugins: [
-        '@babel/plugin-proposal-class-properties'
-    ],
+    plugins: ['@babel/plugin-proposal-class-properties'],
     presets: [
         ['@babel/preset-env', { targets: { node: 'current' } }],
         '@babel/preset-react'

packages/app/index.js

@@ -1,6 +1,3 @@
 import app from './src/app.js';
-import photos from './src/photos.js';
-import patterns from './src/patterns.js';
 
 export default app;
-export { app, photos, patterns };

packages/app/package.json

@@ -33,8 +33,7 @@
         "@wq/outbox": "^1.2.0",
         "@wq/router": "^1.2.0",
         "@wq/store": "^1.2.0",
-        "@wq/template": "^1.2.0",
-        "localforage": "^1.7.3"
+        "mustache": "^4.0.0"
     },
     "devDependencies": {
         "@wq/jquery-mobile": "^1.2.0",

packages/app/rollup.config.js

@@ -6,44 +6,17 @@ import {
     babelAMD,
     outputAMD
 } from '../../rollup-utils.js';
-const banners = {
-    app: makeBanner(pkg, 2012),
-    patterns: makeBanner(
-        {
-            name: pkg.name + '/patterns',
-            description:
-                'wq/app.js plugin to handle dynamically adding nested forms',
-            version: pkg.version
-        },
-        2016
-    ),
-    photos: makeBanner(
-        {
-            name: pkg.name + '/photos',
-            description: 'Helpers for working with Cordova photo library',
-            version: pkg.version
-        },
-        2012
-    ),
-    spinner: makeBanner(
-        {
-            name: pkg.name + '/spinner',
-            description: "Wrapper for jQuery Mobile's spinner",
-            version: pkg.version
-        },
-        2012
-    )
-};
+const banner = makeBanner(pkg, 2012);
 
 export default [
     // ESM
     {
         input: 'packages/app/index.js',
         plugins: [wqDeps('@wq'), babelNPM()],
-        external: ['localforage'],
+        external: ['mustache'],
         output: [
             {
-                banner: banners.app,
+                banner,
                 file: 'packages/app/dist/index.es.js',
                 format: 'esm'
             }
@@ -53,10 +26,10 @@ export default [
     {
         input: 'packages/app/index.js',
         plugins: [wqDeps('@wq'), babelNPM()],
-        external: ['localforage'],
+        external: ['mustache'],
         output: [
             {
-                banner: banners.app,
+                banner,
                 file: 'packages/app/dist/index.js',
                 format: 'cjs',
                 exports: 'named'
@@ -67,23 +40,7 @@ export default [
     {
         input: 'packages/app/src/app.js',
         plugins: [wqDeps(), babelAMD()],
-        external: ['./spinner'],
-        output: outputAMD('app', banners.app)
-    },
-    {
-        input: 'packages/app/src/patterns.js',
-        plugins: [wqDeps(), babelAMD()],
-        output: outputAMD('patterns', banners.patterns, 'app')
-    },
-    {
-        input: 'packages/app/src/photos.js',
-        plugins: [wqDeps(), babelAMD()],
-        external: ['localforage'],
-        output: outputAMD('photos', banners.photos, 'app')
-    },
-    {
-        input: 'packages/app/src/spinner.js',
-        plugins: [babelAMD()],
-        output: outputAMD('spinner', banners.spinner, 'app')
+        external: ['mustache'],
+        output: outputAMD('app', banner)
     }
 ];

packages/app/src/__tests__/app.js

@@ -3,12 +3,10 @@
  */
 
 import app from '../app';
-import patterns from '../patterns';
-import photos from '../photos';
 import router from '@wq/router';
 import routeConfig from './config.json';
 import templates from './templates.json';
-import jqmrenderer from '@wq/jquery-mobile';
+import jqmrenderer, { photos } from '@wq/jquery-mobile';
 import { encode } from '@wq/outbox/vendor/json-forms';
 import promiseFinally from 'promise.prototype.finally';
 
@@ -21,14 +19,12 @@ beforeAll(async () => {
         router: {
             base_url: '/tests'
         },
-        template: {
-            templates
-        },
         store: {
             service: 'http://localhost:8080/tests',
             defaults: { format: 'json' }
         },
         jqmrenderer: {
+            templates,
             noScroll: true
         },
         backgroundSync: -1,
@@ -42,7 +38,6 @@ beforeAll(async () => {
     };
 
     app.use(jqmrenderer);
-    app.use(patterns);
     app.use(photos);
     app.use({
         context(context, routeInfo) {

packages/app/src/app.js

@@ -1,9 +1,9 @@
 import ds from '@wq/store';
 import modelModule from '@wq/model';
 import outbox from '@wq/outbox';
-import tmpl from '@wq/template';
 import router from '@wq/router';
 import spinner from './spinner';
+import Mustache from 'mustache';
 
 var app = {
     OFFLINE: 'offline',
@@ -139,9 +139,6 @@ app.init = function(config) {
     outbox.app = app;
     app.router = router;
 
-    // Initialize wq/template.js
-    tmpl.init(config.template);
-
     // Option to submit forms in the background rather than wait for each post
     if (config.backgroundSync) {
         if (config.backgroundSync === -1) {
@@ -499,7 +496,7 @@ app.postsaveurl = function(item, alreadySynced) {
         } else {
             urlContext = { ...item.data, ...item.result };
         }
-        url = app.base_url + '/' + tmpl.render(postsave, urlContext);
+        url = app.base_url + '/' + Mustache.render(postsave, urlContext);
     } else if (!pconf.list) {
         url = app.base_url + '/' + pconf.url;
     } else {
@@ -1062,7 +1059,7 @@ app.submitForm = async function(kwargs) {
     if (conf) {
         options.modelConf = conf;
         if (conf.label_template) {
-            options.label = tmpl.render(conf.label_template, vals);
+            options.label = Mustache.render(conf.label_template, vals);
         }
     }
 
@@ -1499,7 +1496,7 @@ function _computeFilter(filter, context) {
         }
         values = values.map(function(value) {
             if (value && value.indexOf && value.indexOf('{{') > -1) {
-                value = tmpl.render(value, context);
+                value = Mustache.render(value, context);
                 if (value === '') {
                     return null;
                 } else if (value.match(/^\+\d+$/)) {