Ryan, I was curious, had to try it myself :) Vojtech's suggestion of bumping up all your dependencies does the trick. Patch attached (there were some quirks -- hopefully this helps)
Greg On Fri, Feb 10, 2017 at 12:10 PM, Vojtech Szocs <[email protected]> wrote: > Ryan, try running webpack with --display-error-details parameter. > > Also, maybe this comment is related: https://github.com/webpack/ > webpack/issues/3242#issuecomment-260411104 > > AFAIK, Node.js v6 path APIs had some changes, which possibly broke some > webpack plugins. Since current Node.js active LTS == v6, I'd expect webpack > plugin authors to fix their issues, you'll need to bump some versions in > package.json probably. > > Vojtech > > > On Fri, Feb 10, 2017 at 6:05 PM, Greg Sheremeta <[email protected]> > wrote: > >> I'm clueless. Lol, actually I was just debugging the exact same thing >> when I saw your email that you were working on it. >> >> I was next going to look into https://github.com/babel/ >> grunt-babel/issues/56#issuecomment-154377457 and the comment after it. >> >> >> On Fri, Feb 10, 2017 at 12:02 PM, Ryan Barry <[email protected]> wrote: >> >>> Thanks Greg! >>> >>> I actually merged patches for it to work, but it's always nice to see >>> another approach, and in looking at your diff, I see that I also didn't >>> change "--with-npm-install", which I should. >>> >>> As long as we have you on the phone (so to speak), I'm actually curious >>> about ovirt-engine-nodejs. We've been having failures in CI since December, >>> give or take, but they're not tied to any particular patch. That is to say >>> that checking out an earlier commit still suddenly fails. This has been a >>> low-grade annoyance while we prep for 4.1, since everything still builds >>> and runs in build-artifacts without any problems, but getitng "-1 >>> Continuous Integration" on every patch isn't very helpful. >>> >>> Webpack complains "PATH should be a string, is undefined", but never >>> tells me where it's looking for this. We don't use path.resolve anywhere >>> and I've probably tried every suggestion on github/stackoverflow for making >>> this go away, without any success. There are a lot of reports that changing >>> the downgrading the NodeJS major version (from 6 -> 5, generally) resolves >>> this,b ut that's obviously not an option for us. >>> >>> Any ideas? >>> >>> On Fri, Feb 10, 2017 at 9:52 AM, Greg Sheremeta <[email protected]> >>> wrote: >>> >>>> I didn't realize Ryan was already doing this, so here was my take >>>> (attached). Maybe it helps. >>>> >>>> >>>> >>>> On Fri, Feb 10, 2017 at 11:33 AM, Vojtech Szocs <[email protected]> >>>> wrote: >>>> >>>>> >>>>> >>>>> On Fri, Feb 10, 2017 at 5:30 PM, Ryan Barry <[email protected]> wrote: >>>>> >>>>>> Nothing, but thanks. >>>>>> >>>>>> It is/was a question of time. I didn't expect the changes to >>>>>> ovirt-engine-modules to make it into master as quickly as they did (to be >>>>>> fair, it's been nearly a month since the initial meeting, but that month >>>>>> passed very quickly prepping for the beta release). >>>>>> >>>>>> I'm pushing patches to cockpit-ovirt and ovirt-engine-nodejs-modules >>>>>> to get cockpit-ovirt working on master again now. >>>>>> >>>>> >>>>> Please add Greg & me as reviewers :-) also, if there are any open >>>>> issues or questions, let us know. >>>>> >>>>> >>>>>> >>>>>> On Fri, Feb 10, 2017 at 6:56 AM, Greg Sheremeta <[email protected]> >>>>>> wrote: >>>>>> >>>>>>> I can assist too. What do you need? If it's easier, I'm available on >>>>>>> IRC. >>>>>>> >>>>>>> On Fri, Feb 10, 2017 at 8:00 AM, Sandro Bonazzola < >>>>>>> [email protected]> wrote: >>>>>>> >>>>>>>> Vojtech, can you please help Ryan and Marek with cockpit-ovirt? >>>>>>>> >>>>>>>> >>>>>>>> On Wed, Feb 8, 2017 at 3:29 PM, Vojtech Szocs <[email protected]> >>>>>>>> wrote: >>>>>>>> >>>>>>>>> Hello devs, >>>>>>>>> >>>>>>>>> following packages, intended as build-time dependencies of oVirt >>>>>>>>> JavaScript projects, have been updated: >>>>>>>>> >>>>>>>>> * ovirt-engine-nodejs >>>>>>>>> * ovirt-engine-nodejs-modules >>>>>>>>> * ovirt-engine-yarn >>>>>>>>> >>>>>>>>> If you use those packages, please read on to learn how to adapt >>>>>>>>> your >>>>>>>>> project. oVirt Dashboard (master) is already adapted and you can >>>>>>>>> use >>>>>>>>> it as your reference. >>>>>>>>> >>>>>>>>> == >>>>>>>>> >>>>>>>>> 1, move your project from npm to Yarn: >>>>>>>>> >>>>>>>>> - using nodejs-modules implies that your project moves from npm to >>>>>>>>> Yarn, please do this as your first step >>>>>>>>> - make sure to add yarn.lock file to source control: rm -rf >>>>>>>>> node_modules && yarn install # generates yarn.lock >>>>>>>>> - your automation/*.packages should contain something like this: >>>>>>>>> >>>>>>>>> ovirt-engine-nodejs-6.9.4 >>>>>>>>> ovirt-engine-nodejs-modules-1.0.3 >>>>>>>>> ovirt-engine-yarn-0.19.1 >>>>>>>>> >>>>>>>>> - since oVirt CI uses yum cache, always specify exact version of >>>>>>>>> nodejs-modules in your automation/*.packages >>>>>>>>> - in your RPM build script, make sure to set up Node.js env.: >>>>>>>>> source >>>>>>>>> /usr/share/ovirt-engine-nodejs-modules/setup-env.sh >>>>>>>>> >>>>>>>>> == >>>>>>>>> >>>>>>>>> 2a, dependency handling - 1st time: >>>>>>>>> >>>>>>>>> - clone nodejs-modules repo & update the projects.list file - add >>>>>>>>> URL(s) to your project's files (package.json + yarn.lock) >>>>>>>>> - bump .z in RPM Version and reset the RPM Release number, submit >>>>>>>>> patch to Gerrit >>>>>>>>> - in your project, update automation/*.packages to use the right >>>>>>>>> nodejs-modules version >>>>>>>>> >>>>>>>>> 2b, dependency handling - whenever your dependencies change: >>>>>>>>> >>>>>>>>> - clone nodejs-modules repo & bump RPM Release number, submit >>>>>>>>> patch to Gerrit >>>>>>>>> - in your project, update automation/*.packages to use the right >>>>>>>>> nodejs-modules version >>>>>>>>> >>>>>>>>> == >>>>>>>>> >>>>>>>>> Q: how does the new nodejs-modules work? >>>>>>>>> >>>>>>>>> A: instead of maintaining one big package.json file to specify all >>>>>>>>> dependencies of all projects (effectively forcing all projects to >>>>>>>>> use >>>>>>>>> single dependency tree), it contains the projects.list file with >>>>>>>>> URL(s) to specific project files. >>>>>>>>> >>>>>>>>> When building nodejs-modules RPM, it goes through the list of >>>>>>>>> URL(s), >>>>>>>>> downloading project's files (package.json + yarn.lock), then >>>>>>>>> downloading required dependencies (using Yarn) and collecting their >>>>>>>>> .tar.gz sources. The nodejs-modules RPM therefore contains a flat >>>>>>>>> list >>>>>>>>> of all .tar.gz sources of all dependencies of all projects. >>>>>>>>> >>>>>>>>> When you source the setup-env.sh script, it does, among other >>>>>>>>> things, >>>>>>>>> tell Yarn to use >>>>>>>>> /usr/share/ovirt-engine-nodejs-modules/yarn-offline-cache >>>>>>>>> containing >>>>>>>>> all .tar.gz sources. Then, it runs Yarn in offline mode to populate >>>>>>>>> your project's node_modules directory. >>>>>>>>> >>>>>>>>> == >>>>>>>>> >>>>>>>>> Hope this helps. >>>>>>>>> >>>>>>>>> Regards, >>>>>>>>> Vojtech >>>>>>>>> _______________________________________________ >>>>>>>>> Devel mailing list >>>>>>>>> [email protected] >>>>>>>>> http://lists.ovirt.org/mailman/listinfo/devel >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Sandro Bonazzola >>>>>>>> Better technology. Faster innovation. Powered by community >>>>>>>> collaboration. >>>>>>>> See how it works at redhat.com >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> Devel mailing list >>>>>>>> [email protected] >>>>>>>> http://lists.ovirt.org/mailman/listinfo/devel >>>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Greg Sheremeta, MBA >>>>>>> Red Hat, Inc. >>>>>>> Sr. Software Engineer >>>>>>> [email protected] >>>>>>> >>>>>> >>>>>> >>>>> >>>> >>>> >>>> -- >>>> Greg Sheremeta, MBA >>>> Red Hat, Inc. >>>> Sr. Software Engineer >>>> [email protected] >>>> >>> >>> >> >> >> -- >> Greg Sheremeta, MBA >> Red Hat, Inc. >> Sr. Software Engineer >> [email protected] >> > > -- Greg Sheremeta, MBA Red Hat, Inc. Sr. Software Engineer [email protected]
From e47651800bf99427fcb6b8a44750827515e770d0 Mon Sep 17 00:00:00 2001 From: Greg Sheremeta <[email protected]> Date: Fri, 10 Feb 2017 12:36:16 -0500 Subject: [PATCH] TEST --- dashboard/package.json.in | 28 ++++++++++++++-------------- dashboard/webpack.config.js | 4 ++-- vdsm/package.json.in | 20 ++++++++++---------- vdsm/src/hostvms.js | 2 +- vdsm/src/vmdetail.js | 3 ++- vdsm/webpack.config.js | 11 +++++------ 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dashboard/package.json.in b/dashboard/package.json.in index d61acd1..efcef90 100644 --- a/dashboard/package.json.in +++ b/dashboard/package.json.in @@ -21,35 +21,35 @@ ], "dependencies": { "classnames": "^2.2.3", - "history": "^2.0.1", - "react": "^0.14.8", - "react-addons-update": "^0.14.8", - "react-dom": "^0.14.8", - "react-router": "^2.0.1", + "history": "^4.5.1", + "react": "^15.4.2", + "react-addons-update": "^15.4.2", + "react-dom": "^15.4.2", + "react-router": "^3.0.2", "ini": "^1.3.4" }, "devDependencies": { "babel-core": "^6.4.5", - "babel-eslint": "^6.0.2", + "babel-eslint": "^7.1.1", "babel-loader": "^6.2.1", "babel-preset-es2015": "^6.5.0", "babel-preset-react": "^6.3.13", "bootstrap": "^3.3.6", "bower": "^1.7.7", "clean-webpack-plugin": "^0.1.8", - "copy-webpack-plugin": "^1.1.1", - "css-loader": "^0.23.1", - "eslint": "^2.2.0", - "eslint-config-standard": "^5.1.0", - "eslint-plugin-promise": "^1.0.8", - "eslint-plugin-standard": "^1.3.2", - "file-loader": "^0.8.5", + "copy-webpack-plugin": "^4.0.1", + "css-loader": "^0.26.1", + "eslint": "^3.15.0", + "eslint-config-standard": "^6.2.1", + "eslint-plugin-promise": "^3.4.1", + "eslint-plugin-standard": "^2.0.1", + "file-loader": "^0.10.0", "patternfly": "^3.2.0", "style-loader": "^0.13.0", "uglify": "^0.1.5", "url-loader": "^0.5.7", "vinyl-source-stream": "^1.1.0", - "webpack": "^1.12.14" + "webpack": "^2.2.1" }, "author": "ovirt.org", "license": "Apache-2.0", diff --git a/dashboard/webpack.config.js b/dashboard/webpack.config.js index cd8dad3..6df823e 100644 --- a/dashboard/webpack.config.js +++ b/dashboard/webpack.config.js @@ -26,7 +26,7 @@ module.exports = { } }, { test: /\.(png|jpg|jpeg|gif|svg)$/, - loader: 'url?limit=10000' + loader: 'url-loader?limit=10000' }, { test: /\.css$/, loader: "style-loader!css-loader" @@ -35,7 +35,7 @@ module.exports = { loader: 'file-loader' }, { test: /\.(ttf|eot|svg)(\?v=[0-9].[0-9].[0-9])?$/, - loader: 'file?name=[name].[ext]' + loader: 'file-loader?name=[name].[ext]' } ] }, diff --git a/vdsm/package.json.in b/vdsm/package.json.in index 0dbe1a4..f8904fe 100644 --- a/vdsm/package.json.in +++ b/vdsm/package.json.in @@ -30,29 +30,29 @@ "homepage": "https://github.com/mareklibra/cockpit-ovirt#readme";, "devDependencies": { "babel-core": "^6.4.5", - "babel-eslint": "^6.0.2", + "babel-eslint": "^7.1.1", "babel-loader": "^6.2.1", "babel-preset-es2015": "^6.5.0", "babel-preset-react": "^6.3.13", "bootstrap": "^3.3.6", "bower": "^1.7.7", "clean-webpack-plugin": "^0.1.8", - "copy-webpack-plugin": "^1.1.1", - "css-loader": "^0.23.1", - "eslint": "^2.2.0", - "eslint-config-standard": "^5.1.0", - "eslint-plugin-promise": "^1.0.8", - "eslint-plugin-standard": "^1.3.2", + "copy-webpack-plugin": "^4.0.1", + "css-loader": "^0.26.1", + "eslint": "^3.15.0", + "eslint-config-standard": "^6.2.1", + "eslint-plugin-promise": "^3.4.1", + "eslint-plugin-standard": "^2.0.1", "style-loader": "^0.13.0", - "file-loader": "^0.8.5", + "file-loader": "^0.10.0", "patternfly": "^3.2.0", "style-loader": "^0.13.0", "url-loader": "^0.5.7", "uglify": "^0.1.5", "vinyl-source-stream": "^1.1.0", - "webpack": "^1.12.14", + "webpack": "^2.2.1", "c3": "^0.4.10", - "d3": "^3.5.16", + "d3": "^4.5.0", "po2json": "^0.4.1" } } diff --git a/vdsm/src/hostvms.js b/vdsm/src/hostvms.js index 4260d65..787479a 100644 --- a/vdsm/src/hostvms.js +++ b/vdsm/src/hostvms.js @@ -370,7 +370,7 @@ function normalizePager (toBeNormalized, totalCount) { if (firstRecordToDisplay >= totalCount) { firstRecordToDisplay = totalCount - (totalCount % CONFIG.vmsList.pageLength) - firstRecordToDisplay = firstRecordToDisplay === totalCount ? firstRecordToDisplay - 1 : firstRecordToDisplay; + firstRecordToDisplay = firstRecordToDisplay === totalCount ? firstRecordToDisplay - 1 : firstRecordToDisplay } debugMsg(`normalizePager(${toBeNormalized}, total=${totalCount}) result: ${firstRecordToDisplay}`) diff --git a/vdsm/src/vmdetail.js b/vdsm/src/vmdetail.js index 55b4051..0b59e0c 100644 --- a/vdsm/src/vmdetail.js +++ b/vdsm/src/vmdetail.js @@ -146,7 +146,8 @@ function renderUsageDetailChart (chartDivId, timestamps, dsArray1, dsArray2) { 'timestamps': timestamps, 'dsArray1': dsArray1, 'dsArray2': dsArray2 - }) }, CONFIG.reload.delay_before_vmdetail_charts) + }) + }, CONFIG.reload.delay_before_vmdetail_charts) } $(document).on('renderSparklineChartEvent', diff --git a/vdsm/webpack.config.js b/vdsm/webpack.config.js index 21af4b6..2f6f425 100644 --- a/vdsm/webpack.config.js +++ b/vdsm/webpack.config.js @@ -25,16 +25,16 @@ var config = module.exports = { } }, { test: /\.css$/, - loader: 'style!css' + loader: 'style-loader!css-loader' }, { test: /\.(png|jpg|jpeg|gif|svg)$/, - loader: 'url?limit=10000' + loader: 'url-loader?limit=10000' }, { test: /\.woff(2)?(\?v=[0-9].[0-9].[0-9])?$/, - loader: 'url?mimetype=application/font-woff' + loader: 'url-loader?mimetype=application/font-woff' }, { test: /\.(ttf|eot|svg)(\?v=[0-9].[0-9].[0-9])?$/, - loader: 'file?name=[name].[ext]' + loader: 'file-loader?name=[name].[ext]' }] }, externals: { @@ -48,9 +48,8 @@ var config = module.exports = { new CleanWebpackPlugin(['dist']), new GenerateI18N(['dist/i18n/', 'po/LOCALES']), new CopyWebpackPlugin([ - {from: 'LICENSE'}, + {from: '../LICENSE'}, {from: 'README.md'}, - {from: 'static/manifest.json'}, {from: 'static/ovirt.html'}, {from: 'static/app.css'}, {from: 'static/vdsm', to: 'vdsm'}, -- 2.7.4
_______________________________________________ Devel mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/devel
