From e0f31417489b5cb86a2ec17912cd19bbec565e84 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 14 Aug 2015 11:22:20 -0700 Subject: [PATCH] Magic r.js stuff --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dd4e2eb76..31b662686 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,15 @@ "scripts": { "clean": "npm run clean:js && npm run clean:css", "clean:css": "rimraf notebook/static/style/ipython.min.css && rimraf notebook/static/style/style.min.css", - "clean:js": "rimraf notebook/static/notebook/js/main.bundle.js && rimraf notebook/static/services/contents.bundle.js && rimraf notebook/static/edit/js/main.bundle.js && rimraf notebook/static/tree/js/main.bundle.js && rimraf notebook/static/auth/js/main.bundle.js && rimraf notebook/static/terminal/js/main.bundle.js", + "clean:js": "rimraf notebook/static/auth/js && rimraf notebook/static/base/js && rimraf notebook/static/edit/js && rimraf notebook/static/notebook/js && rimraf notebook/static/terminal/js && rimraf notebook/static/tree/js && rimraf notebook/static/services", "postinstall": "npm run bower", "bower": "bower install --allow-root --config.interactive=false", "build": "npm run build:css && npm run build:js", "build:css": "concurrent \"npm run build:css:ipython\" \"npm run build:css:style\"", "build:css:ipython": "lessc --source-map --include-path=./notebook/static/ ./notebook/static/style/ipython.less ./notebook/static/style/ipython.min.css", "build:css:style": "lessc --source-map --include-path=./notebook/static/ ./notebook/static/style/style.less ./notebook/static/style/style.min.css", - "build:js": "concurrent \"npm run build:js:tree\" \"npm run build:js:terminal\" \"npm run build:js:notebook\" \"npm run build:js:edit\" \"npm run build:js:auth\" \"npm run build:js:contents\"", + "build:js": "concurrent \"npm run build:js:amd\" \"npm run build:js:tree\" \"npm run build:js:terminal\" \"npm run build:js:notebook\" \"npm run build:js:edit\" \"npm run build:js:auth\" \"npm run build:js:contents\"", + "build:amd": "r.js -convert ./notebook/static-src ./notebook/static", "build:js:notebook": "node ./notebook/build.js notebook/js/main.js notebook/js/main.bundle.js", "build:js:contents": "node ./notebook/build.js services/contents.js services/contents.bundle.js", "build:js:edit": "node ./notebook/build.js edit/js/main.js edit/js/main.bundle.js", @@ -38,6 +39,7 @@ "less": "~2", "marked": "~0.3", "moment": "~2.8.4", + "requirejs": "^2.1.20", "rimraf": "^2.4.2", "term.js": "~0.0.4", "text-encoding": "~0.1",