From cc526ca352f1dfafa31fdbb9565a4a7d5a253a88 Mon Sep 17 00:00:00 2001 From: Marko Kungla Date: Sun, 14 May 2017 20:31:27 +0200 Subject: [PATCH] Update dependencies and aframe to 0.5.0 --- config/webpack.config.babel.js | 20 ++-- package.json | 147 +++++++++++++------------ postcss.config.js | 1 + src/js/a-project/core/API.js | 1 - src/js/a-project/core/Config.js | 1 - src/js/a-project/core/HTTPresponses.js | 4 - src/sass/vendor/aframevr/_aframe.scss | 6 + 7 files changed, 93 insertions(+), 87 deletions(-) create mode 100644 postcss.config.js diff --git a/config/webpack.config.babel.js b/config/webpack.config.babel.js index 042ba47..bf1abe8 100644 --- a/config/webpack.config.babel.js +++ b/config/webpack.config.babel.js @@ -41,10 +41,12 @@ const devPlugins = () => { } const generateHtml = () => { - const jsdom = require('jsdom'); - const document = jsdom.jsdom(fs.readFileSync(indexHTML, 'utf8').toString()); - document.head.insertAdjacentHTML('beforeend', ``); - return jsdom.serializeDocument(document); + const jsdom = require("jsdom"); + const { JSDOM } = jsdom; + + const dom = new JSDOM(fs.readFileSync(indexHTML, 'utf8').toString()); + dom.window.document.head.insertAdjacentHTML('beforeend', ``); + return '' + '\n' + dom.window.document.documentElement.outerHTML; }; clioutput.info('starting...'); return [ @@ -157,8 +159,8 @@ const cssRules = isHot ? [ src, path.resolve(process.cwd(), 'node_modules') ], - loader: ExtractTextPlugin.extract({ - fallbackLoader: 'style-loader', + use: ExtractTextPlugin.extract({ + fallback: 'style-loader', loader: ['css-loader?sourceMap', 'postcss-loader', 'resolve-url-loader'] }) }, @@ -168,8 +170,8 @@ const cssRules = isHot ? [ src, path.resolve(process.cwd(), 'node_modules') ], - loader: ExtractTextPlugin.extract({ - fallbackLoader: 'style-loader', + use: ExtractTextPlugin.extract({ + fallback: 'style-loader', loader: [ { loader: 'css-loader', query: { sourceMap: true } @@ -308,7 +310,7 @@ module.exports = { }, }), - new Webpack.NoErrorsPlugin(), + new Webpack.NoEmitOnErrorsPlugin(), new ExtractTextPlugin({ filename: path.join('css', (isProduction ? '[name].[chunkhash].css' : '[name].css')), diff --git a/package.json b/package.json index d6ef41f..ecb0198 100644 --- a/package.json +++ b/package.json @@ -50,81 +50,84 @@ "dev": "babel-node devel --env.devel --hot --port 9000" }, "dependencies": { - "aframe": "^0.4.0", - "babel-polyfill": "^6.20.0", - "whatwg-fetch": "^2.0.1" + "aframe": "^0.5.0", + "babel-polyfill": "^6.23.0", + "whatwg-fetch": "^2.0.3" }, "devDependencies": { - "autoprefixer": "6.6.1", - "babel-cli": "6.18.0", - "babel-core": "6.21.0", - "babel-eslint": "7.1.1", - "babel-loader": "6.2.10", - "babel-plugin-istanbul": "3.1.2", - "babel-preset-latest": "6.16.0", - "babel-preset-stage-0": "6.16.0", - "babel-register": "6.18.0", - "body-parser": "1.15.2", - "chai": "3.5.0", - "chai-shallow-deep-equal": "1.4.4", - "chalk": "1.1.3", - "compression": "1.6.2", - "connect-history-api-fallback": "1.3.0", - "copy-webpack-plugin": "4.0.1", - "css-loader": "0.26.1", - "eslint": "3.12.2", - "eslint-config-semistandard": "7.0.0", - "eslint-config-standard": "6.2.1", - "eslint-loader": "1.6.1", - "eslint-plugin-promise": "3.4.0", - "eslint-plugin-standard": "2.0.1", - "exports-loader": "0.6.3", - "express": "4.14.0", - "extract-text-webpack-plugin": "2.0.0-beta.4", - "file-loader": "0.9.0", - "handlebars-loader": "^1.4.0", - "html-loader": "0.4.4", - "html-webpack-plugin": "2.24.1", - "husky": "0.12.0", - "ignore-styles": "5.0.1", - "imports-loader": "0.7.0", - "ip": "1.1.4", - "istanbul": "1.1.0-alpha.1", - "jsdom": "9.9.1", - "json-loader": "0.5.4", - "karma": "1.3.0", + "autoprefixer": "^7.0.1", + "babel-cli": "^6.24.1", + "babel-core": "^6.24.1", + "babel-eslint": "^7.2.3", + "babel-loader": "^7.0.0", + "babel-plugin-istanbul": "^4.1.3", + "babel-preset-latest": "^6.24.1", + "babel-preset-stage-0": "^6.24.1", + "babel-register": "^6.24.1", + "body-parser": "^1.17.1", + "chai": "^3.5.0", + "chai-shallow-deep-equal": "^1.4.6", + "chalk": "^1.1.3", + "compression": "^1.6.2", + "connect-history-api-fallback": "^1.3.0", + "copy-webpack-plugin": "^4.0.1", + "css-loader": "^0.28.1", + "eslint": "^3.19.0", + "eslint-config-semistandard": "^11.0.0", + "eslint-config-standard": "^10.2.1", + "eslint-loader": "^1.7.1", + "eslint-plugin-import": "^2.2.0", + "eslint-plugin-node": "^4.2.2", + "eslint-plugin-promise": "^3.5.0", + "eslint-plugin-standard": "^3.0.1", + "exports-loader": "^0.6.4", + "express": "^4.15.2", + "extract-text-webpack-plugin": "^2.1.0", + "file-loader": "^0.11.1", + "handlebars-loader": "^1.5.0", + "html-loader": "^0.4.5", + "html-webpack-plugin": "^2.28.0", + "husky": "^0.13.3", + "ignore-styles": "^5.0.1", + "imports-loader": "^0.7.1", + "ip": "^1.1.5", + "istanbul": "^0.4.5", + "jsdom": "^10.1.0", + "json-loader": "^0.5.4", + "karma": "^1.7.0", "karma-chai-shallow-deep-equal": "0.0.4", - "karma-chrome-launcher": "2.0.0", - "karma-coverage": "1.1.1", - "karma-env-preprocessor": "0.1.1", - "karma-firefox-launcher": "1.0.0", - "karma-mocha": "1.3.0", - "karma-mocha-reporter": "2.2.1", - "karma-remap-istanbul": "0.4.0", - "karma-sinon-chai": "1.2.4", - "karma-sourcemap-loader": "0.3.7", - "karma-webpack": "1.8.1", - "mocha": "3.2.0", - "node-sass": "4.1.1", - "npm-run-all": "4.0.0", - "postcss-loader": "1.2.1", - "precss": "1.4.0", - "raw-loader": "0.5.1", - "resolve-url-loader": "1.6.1", - "rimraf": "2.5.4", - "sass-loader": "4.1.1", - "sinon": "1.17.7", - "sinon-chai": "2.8.0", - "sourcemap-istanbul-instrumenter-loader": "0.2.0", - "style-loader": "0.13.1", - "stylelint": "7.7.1", - "stylelint-config-standard": "15.0.1", - "stylelint-webpack-plugin": "0.4.2", - "url-loader": "0.5.7", - "webpack": "2.2.0-rc.3", - "webpack-bundle-size-analyzer": "2.2.0", - "webpack-dev-middleware": "1.9.0", - "webpack-hot-middleware": "2.15.0" + "karma-chrome-launcher": "^2.1.1", + "karma-coverage": "^1.1.1", + "karma-env-preprocessor": "^0.1.1", + "karma-firefox-launcher": "^1.0.1", + "karma-mocha": "^1.3.0", + "karma-mocha-reporter": "^2.2.3", + "karma-remap-istanbul": "^0.6.0", + "karma-sinon-chai": "^1.3.1", + "karma-sourcemap-loader": "^0.3.7", + "karma-webpack": "^2.0.3", + "mocha": "^3.3.0", + "node-sass": "^4.5.2", + "npm-run-all": "^4.0.2", + "postcss-load-config": "^1.2.0", + "postcss-loader": "^2.0.5", + "precss": "^1.4.0", + "raw-loader": "^0.5.1", + "resolve-url-loader": "^2.0.2", + "rimraf": "^2.6.1", + "sass-loader": "^6.0.5", + "sinon": "^2.2.0", + "sinon-chai": "^2.10.0", + "sourcemap-istanbul-instrumenter-loader": "^0.2.0", + "style-loader": "^0.17.0", + "stylelint": "^7.10.1", + "stylelint-config-standard": "^16.0.0", + "stylelint-webpack-plugin": "^0.7.0", + "url-loader": "^0.5.8", + "webpack": "^2.5.1", + "webpack-bundle-size-analyzer": "^2.6.0", + "webpack-dev-middleware": "^1.10.2", + "webpack-hot-middleware": "^2.18.0" }, "engineStrict": true, "engines": { diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 0000000..f053ebf --- /dev/null +++ b/postcss.config.js @@ -0,0 +1 @@ +module.exports = {}; diff --git a/src/js/a-project/core/API.js b/src/js/a-project/core/API.js index 2143061..41e279a 100644 --- a/src/js/a-project/core/API.js +++ b/src/js/a-project/core/API.js @@ -7,7 +7,6 @@ import 'whatwg-fetch'; * A-Frame SERVER API */ class API { - /** * API * diff --git a/src/js/a-project/core/Config.js b/src/js/a-project/core/Config.js index 358d424..5dd96d8 100644 --- a/src/js/a-project/core/Config.js +++ b/src/js/a-project/core/Config.js @@ -1,7 +1,6 @@ 'use strict'; class Config { - /** * Config */ diff --git a/src/js/a-project/core/HTTPresponses.js b/src/js/a-project/core/HTTPresponses.js index 4b7b323..c0357b6 100644 --- a/src/js/a-project/core/HTTPresponses.js +++ b/src/js/a-project/core/HTTPresponses.js @@ -1,7 +1,6 @@ 'use strict'; class HttpError extends Error { - /** * HTTP Status constructor * @@ -62,7 +61,6 @@ class HttpError extends Error { } class ResponseError extends HttpError { - /** * Response error * @@ -78,7 +76,6 @@ class ResponseError extends HttpError { } class NotFoundError extends HttpError { - /** * Not found error * @@ -94,4 +91,3 @@ class NotFoundError extends HttpError { } export {HttpError, ResponseError, NotFoundError}; - diff --git a/src/sass/vendor/aframevr/_aframe.scss b/src/sass/vendor/aframevr/_aframe.scss index 8343bf5..5ed061d 100644 --- a/src/sass/vendor/aframevr/_aframe.scss +++ b/src/sass/vendor/aframevr/_aframe.scss @@ -78,6 +78,7 @@ from { opacity: 0; } + 25% { opacity: 1; } @@ -86,6 +87,7 @@ from { opacity: 0; } + 50% { opacity: 1; } @@ -94,6 +96,7 @@ from { opacity: 0; } + 75% { opacity: 1; } @@ -102,6 +105,7 @@ from { opacity: 0; } + 25% { opacity: 1; } @@ -110,6 +114,7 @@ from { opacity: 0; } + 50% { opacity: 1; } @@ -118,6 +123,7 @@ from { opacity: 0; } + 75% { opacity: 1; }