From 3cc7d841508102dc3425f2b416377f4d82a5028e Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 27 Dec 2016 09:31:34 -0200 Subject: Removes all unecessary node modules references from package.json --- web-ui/package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 2a0056e4..7075862e 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -24,22 +24,22 @@ "watch": "0.19.1" }, "scripts": { - "test": "npm run jshint --silent && npm run build --silent && node_modules/karma/bin/karma start --single-run $GRUNT_OPTS", - "debug": "npm run build && node_modules/karma/bin/karma start --browsers Chrome $GRUNT_OPTS", + "test": "npm run jshint --silent && npm run build --silent && karma start --single-run $GRUNT_OPTS", + "debug": "npm run build && karma start --browsers Chrome $GRUNT_OPTS", "watch": "npm run compass-watch & npm run handlebars-watch", - "watch-test": "node_modules/karma/bin/karma start", - "handlebars": "mkdir -p app/js/generated/hbs/ && node_modules/handlebars/bin/handlebars app/templates/**/*.hbs > app/js/generated/hbs/templates.js --namespace=window.Pixelated --root .", - "handlebars-watch": "node_modules/.bin/watch 'npm run handlebars' app/templates", + "watch-test": "karma start", + "handlebars": "mkdir -p app/js/generated/hbs/ && handlebars app/templates/**/*.hbs > app/js/generated/hbs/templates.js --namespace=window.Pixelated --root .", + "handlebars-watch": "watch 'npm run handlebars' app/templates", "compass": "compass compile", "compass-watch": "compass watch", "build": "npm run clean && npm run handlebars && npm run add_git_version && npm run compass", - "jshint": "node_modules/jshint/bin/jshint --config=.jshintrc app test", + "jshint": "jshint --config=.jshintrc app test", "clean": "rm -rf .tmp/ 'dist/*' app/js/generated/hbs/* app/css/*", "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", "package": "/bin/bash config/package.sh", "imagemin": "node config/imagemin.js", - "minify_html": "node_modules/.bin/html-minifier app/index.html --collapse-whitespace | sed 's|.*||' > dist/index.html", - "minify_sandbox": "node_modules/.bin/html-minifier app/sandbox.html --collapse-whitespace | sed 's|.*||' > dist/sandbox.html", + "minify_html": "html-minifier app/index.html --collapse-whitespace | sed 's|.*||' > dist/index.html", + "minify_sandbox": "html-minifier app/sandbox.html --collapse-whitespace | sed 's|.*||' > dist/sandbox.html", "add_git_version": "/bin/bash config/add_git_version.sh" } } -- cgit v1.2.3 From c1a3714ad0b4bd8105c5f4fca49017e956543eac Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 27 Dec 2016 10:09:30 -0200 Subject: Move all bower dependencies to npm --- web-ui/package.json | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 7075862e..528fd095 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -5,22 +5,42 @@ "repository": "https://github.com/pixelated-project/pixelated-user-agent", "private": true, "devDependencies": { + "almond": "^0.3.3", "bower": "1.7.9", - "handlebars": "4.0.5", + "dompurify": "^0.8.4", + "flight": "0.0.2", + "font-awesome": "^4.7.0", + "foundation": "^4.2.1-1", + "handlebars": "^4.0.5", + "he": "^1.1.0", "html-minifier": "2.1.6", + "i18next": "^4.1.4", + "i18next-browser-languagedetector": "^1.0.1", + "i18next-xhr-backend": "^1.2.1", + "iframe-resizer": "^3.5.7", "imagemin": "5.2.1", + "jasmine-flight": "^4.0.0", + "jasmine-jquery": "^2.1.1", + "jquery": "^3.1.1", + "jquery-file-upload": "^4.0.5", + "jquery-ui": "^1.12.1", "jshint": "2.9.2", "karma": "0.13.19", "karma-chrome-launcher": "0.2.2", + "karma-coverage": "0.2.7", "karma-firefox-launcher": "0.1.7", "karma-jasmine": "0.2.2", "karma-jasmine-ajax": "0.1.13", "karma-junit-reporter": "0.2.2", "karma-phantomjs-launcher": "1.0.1", "karma-requirejs": "1.0.0", - "karma-coverage": "0.2.7", + "lodash": "^4.17.3", "minify": "2.0.9", + "modernizr": "^3.3.1", + "quoted-printable": "^1.0.1", "requirejs": "2.2.0", + "typeahead.js": "^0.11.1", + "utf8": "^2.1.2", "watch": "0.19.1" }, "scripts": { -- cgit v1.2.3 From 3a1dc6f2bfc70a99a6dcf761b7d62bf0d2b45345 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 27 Dec 2016 10:39:08 -0200 Subject: Removes almond from package.json as it will not be needed with webpack --- web-ui/package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 528fd095..5739dc29 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -5,7 +5,6 @@ "repository": "https://github.com/pixelated-project/pixelated-user-agent", "private": true, "devDependencies": { - "almond": "^0.3.3", "bower": "1.7.9", "dompurify": "^0.8.4", "flight": "0.0.2", -- cgit v1.2.3 From cb4522fa47d5e46312d53a62654f58c4a53c8cc2 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 27 Dec 2016 15:15:39 -0200 Subject: Add webpack compilation to build, fix aliases, and add babel --- web-ui/package.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 5739dc29..8453d7e1 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -5,9 +5,13 @@ "repository": "https://github.com/pixelated-project/pixelated-user-agent", "private": true, "devDependencies": { + "babel": "^6.5.2", + "babel-core": "^6.21.0", + "babel-loader": "^6.2.10", + "babel-preset-es2015": "^6.18.0", "bower": "1.7.9", "dompurify": "^0.8.4", - "flight": "0.0.2", + "flightjs": "^1.5.1", "font-awesome": "^4.7.0", "foundation": "^4.2.1-1", "handlebars": "^4.0.5", @@ -40,7 +44,8 @@ "requirejs": "2.2.0", "typeahead.js": "^0.11.1", "utf8": "^2.1.2", - "watch": "0.19.1" + "watch": "0.19.1", + "webpack": "^1.14.0" }, "scripts": { "test": "npm run jshint --silent && npm run build --silent && karma start --single-run $GRUNT_OPTS", @@ -51,7 +56,7 @@ "handlebars-watch": "watch 'npm run handlebars' app/templates", "compass": "compass compile", "compass-watch": "compass watch", - "build": "npm run clean && npm run handlebars && npm run add_git_version && npm run compass", + "build": "npm run clean && npm run handlebars && webpack --colors --progress && npm run add_git_version && npm run compass", "jshint": "jshint --config=.jshintrc app test", "clean": "rm -rf .tmp/ 'dist/*' app/js/generated/hbs/* app/css/*", "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", -- cgit v1.2.3 From 0a64456b53b2b7d3ea67005892332416f6b2c5ba Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 27 Dec 2016 15:38:37 -0200 Subject: Clarifies how js files are compiled by creating separate npm task --- web-ui/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 8453d7e1..24c4e91f 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -56,7 +56,8 @@ "handlebars-watch": "watch 'npm run handlebars' app/templates", "compass": "compass compile", "compass-watch": "compass watch", - "build": "npm run clean && npm run handlebars && webpack --colors --progress && npm run add_git_version && npm run compass", + "build": "npm run clean && npm run handlebars && npm run build-js && npm run add_git_version && npm run compass", + "build-js": "webpack --colors --progress", "jshint": "jshint --config=.jshintrc app test", "clean": "rm -rf .tmp/ 'dist/*' app/js/generated/hbs/* app/css/*", "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", -- cgit v1.2.3 From d83a6d27b7f92752a91a8d733353a38714e44951 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 15:55:53 -0200 Subject: Update package script to use webpack files --- web-ui/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 24c4e91f..3dab5f80 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -13,7 +13,6 @@ "dompurify": "^0.8.4", "flightjs": "^1.5.1", "font-awesome": "^4.7.0", - "foundation": "^4.2.1-1", "handlebars": "^4.0.5", "he": "^1.1.0", "html-minifier": "2.1.6", @@ -37,8 +36,6 @@ "karma-junit-reporter": "0.2.2", "karma-phantomjs-launcher": "1.0.1", "karma-requirejs": "1.0.0", - "lodash": "^4.17.3", - "minify": "2.0.9", "modernizr": "^3.3.1", "quoted-printable": "^1.0.1", "requirejs": "2.2.0", @@ -59,7 +56,7 @@ "build": "npm run clean && npm run handlebars && npm run build-js && npm run add_git_version && npm run compass", "build-js": "webpack --colors --progress", "jshint": "jshint --config=.jshintrc app test", - "clean": "rm -rf .tmp/ 'dist/*' app/js/generated/hbs/* app/css/*", + "clean": "rm -rf 'dist/*' app/js/generated/hbs/* app/css/*", "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", "package": "/bin/bash config/package.sh", "imagemin": "node config/imagemin.js", -- cgit v1.2.3 From b0eef380feab59153fbaa9b11084bd4def91ec5b Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 16:16:56 -0200 Subject: Move foundation from bower to npm and package them with webpack --- web-ui/package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 3dab5f80..267841f2 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -13,6 +13,7 @@ "dompurify": "^0.8.4", "flightjs": "^1.5.1", "font-awesome": "^4.7.0", + "foundation-sites": "^6.3.0", "handlebars": "^4.0.5", "he": "^1.1.0", "html-minifier": "2.1.6", -- cgit v1.2.3 From 93cec7cbc6c03b2bd95b1e031e894327bdaa65b4 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 17:18:45 -0200 Subject: Use minified files for dependencies and copy them to dist folder with webpack --- web-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 267841f2..728699e6 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -11,7 +11,7 @@ "babel-preset-es2015": "^6.18.0", "bower": "1.7.9", "dompurify": "^0.8.4", - "flightjs": "^1.5.1", + "flightjs": "1.3.0", "font-awesome": "^4.7.0", "foundation-sites": "^6.3.0", "handlebars": "^4.0.5", -- cgit v1.2.3 From ee97dee72ec1673ad18fe86855b1e1aceabba674 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 17:51:54 -0200 Subject: Use webpack files for packaging --- web-ui/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 728699e6..6405102b 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -37,6 +37,7 @@ "karma-junit-reporter": "0.2.2", "karma-phantomjs-launcher": "1.0.1", "karma-requirejs": "1.0.0", + "minify": "^2.0.13", "modernizr": "^3.3.1", "quoted-printable": "^1.0.1", "requirejs": "2.2.0", @@ -54,14 +55,15 @@ "handlebars-watch": "watch 'npm run handlebars' app/templates", "compass": "compass compile", "compass-watch": "compass watch", - "build": "npm run clean && npm run handlebars && npm run build-js && npm run add_git_version && npm run compass", + "build": "npm run build-statics && npm run build-js", + "build-statics": "npm run clean && npm run handlebars && npm run add_git_version && npm run compass", + "build-prod": "npm run build-statics && webpack -p --config ./webpack.production.config.js", "build-js": "webpack --colors --progress", "jshint": "jshint --config=.jshintrc app test", "clean": "rm -rf 'dist/*' app/js/generated/hbs/* app/css/*", "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", "package": "/bin/bash config/package.sh", "imagemin": "node config/imagemin.js", - "minify_html": "html-minifier app/index.html --collapse-whitespace | sed 's|.*||' > dist/index.html", "minify_sandbox": "html-minifier app/sandbox.html --collapse-whitespace | sed 's|.*||' > dist/sandbox.html", "add_git_version": "/bin/bash config/add_git_version.sh" } -- cgit v1.2.3 From bba4d81629d0a7519a02f719f14d10a7996c9063 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 17:53:34 -0200 Subject: Remove requirejs compilation taks and options --- web-ui/package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 6405102b..de6759fb 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -61,7 +61,6 @@ "build-js": "webpack --colors --progress", "jshint": "jshint --config=.jshintrc app test", "clean": "rm -rf 'dist/*' app/js/generated/hbs/* app/css/*", - "buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js", "package": "/bin/bash config/package.sh", "imagemin": "node config/imagemin.js", "minify_sandbox": "html-minifier app/sandbox.html --collapse-whitespace | sed 's|.*||' > dist/sandbox.html", -- cgit v1.2.3 From 86e464682533e6d21f7f5c69dc091532df4c6dbc Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 28 Dec 2016 19:02:50 -0200 Subject: Fixes offcanvas menu by moving foundation back to index.html --- web-ui/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index de6759fb..de80bded 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -10,10 +10,9 @@ "babel-loader": "^6.2.10", "babel-preset-es2015": "^6.18.0", "bower": "1.7.9", + "copy-webpack-plugin": "^4.0.1", "dompurify": "^0.8.4", - "flightjs": "1.3.0", "font-awesome": "^4.7.0", - "foundation-sites": "^6.3.0", "handlebars": "^4.0.5", "he": "^1.1.0", "html-minifier": "2.1.6", -- cgit v1.2.3 From 639430167b646de6fdbb0f275386dae2856b7e72 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 29 Dec 2016 10:54:12 -0200 Subject: Compile sandbox files through webpack as well --- web-ui/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index de80bded..0d64a5df 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -59,10 +59,9 @@ "build-prod": "npm run build-statics && webpack -p --config ./webpack.production.config.js", "build-js": "webpack --colors --progress", "jshint": "jshint --config=.jshintrc app test", - "clean": "rm -rf 'dist/*' app/js/generated/hbs/* app/css/*", + "clean": "rm -rf dist/ app/js/generated/hbs/* app/css/*", "package": "/bin/bash config/package.sh", "imagemin": "node config/imagemin.js", - "minify_sandbox": "html-minifier app/sandbox.html --collapse-whitespace | sed 's|.*||' > dist/sandbox.html", "add_git_version": "/bin/bash config/add_git_version.sh" } } -- cgit v1.2.3 From 7dae7aaced98aba6a832faa11e61fc2e7443c88b Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 29 Dec 2016 11:39:47 -0200 Subject: Move package script to npm --- web-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/package.json') diff --git a/web-ui/package.json b/web-ui/package.json index 0d64a5df..3d1720e1 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -60,7 +60,7 @@ "build-js": "webpack --colors --progress", "jshint": "jshint --config=.jshintrc app test", "clean": "rm -rf dist/ app/js/generated/hbs/* app/css/*", - "package": "/bin/bash config/package.sh", + "package": "PIXELATED_BUILD='package' npm run build-prod && npm run imagemin", "imagemin": "node config/imagemin.js", "add_git_version": "/bin/bash config/add_git_version.sh" } -- cgit v1.2.3