From 8b7d549c79768c16cb2ae30c240b40b1c6caf18f Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Sun, 12 Jul 2020 23:38:47 +0800 Subject: [PATCH] - npm: Work on `submodules-update` script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 47c4881a..6c9e150a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "add-new-release": "npm run add-release && cross-var git config --file=.gitmodules submodule.releases/latest.branch \"release-v$npm_package_version\"", "submodules": "run-s submodules-init submodules-update", "submodules-init": "echo \"Performing non-recursive init as don't want submodules to have their own releases!\" && git submodule update --init", - "submodules-update": "echo \"Performing non-recursive fetch as don't want submodules to have their own releases!\" git submodule foreach git fetch && git submodule update --remote", + "submodules-update": "echo \"Performing non-recursive fetch as don't want submodules to have their own releases!\" && git submodule foreach git fetch && git submodule update --remote && git submodule foreach git merge origin master", "start-allow-origin": "static -p 8001 -H '{\"Access-Control-Allow-Origin\": \"*\"}'", "start-embedded": "run-p start start-allow-origin", "start": "echo \"Open file, e.g., to http://localhost:8000/editor/svg-editor-es.html\" && static -p 8000",