diff --git a/bower.json b/bower.json index 4ed20a3fe..19db3026e 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "tests" ], "dependencies": { - "hyperjson": "~1.4.0", "chainpad-crypto": "^0.2.0", "chainpad-listmap": "^1.0.0", "chainpad": "^5.2.0", diff --git a/package-lock.json b/package-lock.json index 62c7f4129..0c31cee90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "ckeditor": "^4.12.1", "codemirror": "^5.19.0", "components-font-awesome": "^4.6.3", + "hyper-json": "~1.4.0", "jquery": "3.6.0", "jshint": "^2.13.4", "json.sortify": "~2.1.0", @@ -2142,6 +2143,12 @@ "npm": ">=1.3.7" } }, + "node_modules/hyper-json": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/hyper-json/-/hyper-json-1.4.0.tgz", + "integrity": "sha512-QQq/hSN8X7m+rirYZmJ3RxCanXEdKyC7iGXEnJcg3jJ6/qorDDywBJoP6tt9+LEfJvNHaXwoE2wjDAZtJVeLew==", + "dev": true + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -6445,6 +6452,12 @@ "sshpk": "^1.7.0" } }, + "hyper-json": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/hyper-json/-/hyper-json-1.4.0.tgz", + "integrity": "sha512-QQq/hSN8X7m+rirYZmJ3RxCanXEdKyC7iGXEnJcg3jJ6/qorDDywBJoP6tt9+LEfJvNHaXwoE2wjDAZtJVeLew==", + "dev": true + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", diff --git a/package.json b/package.json index 700ad304e..189edf659 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "ckeditor": "^4.12.1", "codemirror": "^5.19.0", "components-font-awesome": "^4.6.3", + "hyper-json": "~1.4.0", "jquery": "3.6.0", "jshint": "^2.13.4", "json.sortify": "~2.1.0", diff --git a/scripts/copy-components.js b/scripts/copy-components.js index bf8b1a894..e2769eb77 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -16,6 +16,7 @@ Fse.mkdirpSync(componentsPath); "requirejs", "requirejs-plugins", "json.sortify", + "hyper-json", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l); diff --git a/www/assert/main.js b/www/assert/main.js index 2ee294934..ea11d695a 100644 --- a/www/assert/main.js +++ b/www/assert/main.js @@ -1,6 +1,6 @@ define([ 'jquery', - '/bower_components/hyperjson/hyperjson.js', + '/components/hyper-json/hyperjson.js', 'json.sortify', '/drive/tests.js', //'/common/test.js', diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index e0564cf15..e811ac6c8 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -1,6 +1,6 @@ define([ 'jquery', - '/bower_components/hyperjson/hyperjson.js', + '/components/hyper-json/hyperjson.js', '/common/toolbar.js', 'json.sortify', '/bower_components/nthen/index.js', diff --git a/www/pad/export.js b/www/pad/export.js index 01ac27d7e..9a69ffc8e 100644 --- a/www/pad/export.js +++ b/www/pad/export.js @@ -3,7 +3,7 @@ define([ '/common/common-util.js', '/common/diffMarked.js', '/common/hyperscript.js', - '/bower_components/hyperjson/hyperjson.js', + '/components/hyper-json/hyperjson.js', '/bower_components/nthen/index.js', '/lib/turndown.browser.umd.js' ], function ($, Util, DiffMd, h, Hyperjson, nThen, Turndown) { diff --git a/www/pad/inner.js b/www/pad/inner.js index 21795a4d6..37f084edb 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -24,7 +24,7 @@ require(['/api/config'], function(ApiConfig) { }); define([ 'jquery', - '/bower_components/hyperjson/hyperjson.js', + '/components/hyper-json/hyperjson.js', '/common/sframe-app-framework.js', '/common/cursor.js', //'/common/TypingTests.js', diff --git a/www/poll/render.js b/www/poll/render.js index 9f5980731..c4aaf5702 100644 --- a/www/poll/render.js +++ b/www/poll/render.js @@ -1,6 +1,6 @@ define([ 'jquery', - '/bower_components/hyperjson/hyperjson.js', + '/components/hyper-json/hyperjson.js', '/common/text-cursor.js', '/bower_components/chainpad/chainpad.dist.js', '/common/common-util.js',