diff --git a/Gruntfile.js b/Gruntfile.js index 8b0942e4..23b3d742 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -24,7 +24,7 @@ module.exports = function(grunt) { name: "scribe", paths: { 'lodash-amd': '../bower_components/lodash-amd', - 'immutable': '../bower_components/immutable/dist/immutable' + 'immutable': '../node_modules/immutable/dist/immutable' }, optimize: optimize, preserveLicenseComments: false, diff --git a/Plumbing.js b/Plumbing.js index ee29e43c..4954a843 100644 --- a/Plumbing.js +++ b/Plumbing.js @@ -17,7 +17,7 @@ module.exports = function (pipelines) { preserveLicenseComments: false, paths: { 'lodash-amd': '../bower_components/lodash-amd', - 'immutable': '../bower_components/immutable/dist/immutable' + 'immutable': '../node_modules/immutable/dist/immutable' } }); diff --git a/bower.json b/bower.json index ae79ab7d..a25aa7a9 100644 --- a/bower.json +++ b/bower.json @@ -1,8 +1,5 @@ { "name": "scribe", - "dependencies": { - "immutable" : "3.8.1" - }, "devDependencies": { "requirejs": "~2.1.9", "scribe-plugin-blockquote-command": "guardian/scribe-plugin-blockquote-command#master", diff --git a/examples/amd-inline.html b/examples/amd-inline.html index 3348d285..75396411 100644 --- a/examples/amd-inline.html +++ b/examples/amd-inline.html @@ -39,7 +39,7 @@ 'scribe-common': '../bower_components/scribe-common', 'lodash-amd': '../bower_components/lodash-amd', 'html-janitor': '../bower_components/html-janitor/html-janitor', - 'immutable': '../bower_components/immutable/dist/immutable' + 'immutable': '../node_modules/immutable/dist/immutable' } }, [ '../src/scribe', diff --git a/examples/amd.html b/examples/amd.html index f3f46c93..c80302c7 100644 --- a/examples/amd.html +++ b/examples/amd.html @@ -41,7 +41,7 @@ 'scribe-common': '../bower_components/scribe-common', 'lodash-amd': '../bower_components/lodash-amd', 'html-janitor': '../bower_components/html-janitor/html-janitor', - 'immutable': '../bower_components/immutable/dist/immutable' + 'immutable': '../node_modules/immutable/dist/immutable' } }, [ '../src/scribe', diff --git a/examples/build-cjs.sh b/examples/build-cjs.sh index 4c818ebe..73670f54 100755 --- a/examples/build-cjs.sh +++ b/examples/build-cjs.sh @@ -5,7 +5,7 @@ bower install npm install deamdify npm install scribe-plugin-toolbar browserify -g deamdify \ --r ./bower_components/immutable/dist/immutable.js:immutable \ +-r ./node_modules/immutable/dist/immutable.js:immutable \ -r ./bower_components/lodash-amd/modern/object/assign.js:lodash-amd/modern/object/assign \ -r ./bower_components/lodash-amd/modern/object/defaults.js:lodash-amd/modern/object/defaults \ -r ./bower_components/lodash-amd/modern/string/escape.js:lodash-amd/modern/string/escape \ diff --git a/examples/build.html b/examples/build.html index 6eb62301..a2c0ff85 100644 --- a/examples/build.html +++ b/examples/build.html @@ -40,7 +40,7 @@ 'scribe-common': '../bower_components/scribe-common', 'lodash-amd': '../bower_components/lodash-amd', 'html-janitor': '../bower_components/html-janitor/html-janitor', - 'immutable': '../bower_components/immutable/dist/immutable', + 'immutable': '../node_modules/immutable/dist/immutable', 'scribe': '../build/scribe' } }, [ diff --git a/examples/no-undo-manager.html b/examples/no-undo-manager.html index 9fde4779..22868fcc 100644 --- a/examples/no-undo-manager.html +++ b/examples/no-undo-manager.html @@ -39,7 +39,7 @@ 'scribe-common': '../bower_components/scribe-common', 'lodash-amd': '../bower_components/lodash-amd', 'html-janitor': '../bower_components/html-janitor/html-janitor', - 'immutable': '../bower_components/immutable/dist/immutable' + 'immutable': '../node_modules/immutable/dist/immutable' } }, [ '../src/scribe', diff --git a/examples/raw-inline.html b/examples/raw-inline.html index 225a68aa..08c25a4d 100644 --- a/examples/raw-inline.html +++ b/examples/raw-inline.html @@ -43,7 +43,7 @@ require({ paths: { 'lodash-amd': '../bower_components/lodash-amd', - 'immutable': '../bower_components/immutable/dist/immutable' + 'immutable': '../node_modules/immutable/dist/immutable' } }, [ '../src/scribe', diff --git a/examples/raw.html b/examples/raw.html index f3f9f6bf..c17cf5f3 100644 --- a/examples/raw.html +++ b/examples/raw.html @@ -43,7 +43,7 @@ require({ paths: { 'lodash-amd': '../bower_components/lodash-amd', - 'immutable': '../bower_components/immutable/dist/immutable' + 'immutable': '../node_modules/immutable/dist/immutable' } }, [ '../src/scribe', diff --git a/package.json b/package.json index b840319c..75ef3a46 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "main": "src/scribe.js", "dependencies": { - "immutable": "~3.8.1" + "immutable": "^4.3.9" }, "devDependencies": { "chai": "~1.9.1", @@ -30,7 +30,7 @@ "url": "git://github.com/guardian/scribe.git" }, "resolutions": { - "immutable": "3.8.3", + "immutable": "4.3.9", "form-data": "2.5.4", "lodash": "4.17.12", "minimist": "0.2.4",