diff --git a/.gitignore b/.gitignore index 7c1d36d..ee24b3c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ node_modules/ dist/ /.vagrant -/webpack.inputs diff --git a/Makefile b/Makefile index 3b28abc..a4444ff 100644 --- a/Makefile +++ b/Makefile @@ -15,19 +15,10 @@ install-only: mkdir -p $(DESTDIR)/usr/share/metainfo/ cp org.cockpit-project.$(PACKAGE_NAME).metainfo.xml $(DESTDIR)/usr/share/metainfo/ -EXTRA_DIST = \ - README.md \ - org.cockpit-project.$(PACKAGE_NAME).metainfo.xml \ - package.json \ - .eslintrc.json \ - webpack.config.js \ - webpack-with-stats \ - Makefile - # when building a distribution tarball, call webpack with a 'production' environment dist-gzip: NODE_ENV=production dist-gzip: clean all - tar czf $(PACKAGE_NAME)-cockpit.tar.gz --transform 's,^,$(PACKAGE_NAME)-cockpit/,' $$(cat webpack.inputs) $(EXTRA_DIST) dist/ + tar czf $(PACKAGE_NAME)-cockpit.tar.gz --transform 's,^,$(PACKAGE_NAME)-cockpit/,' $$(git ls-files) dist/ srpm: dist-gzip rpmbuild -bs \ diff --git a/package.json b/package.json index 889fc2c..b3d5804 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "author": "", "license": "LGPL-2.1", "scripts": { - "build": "./webpack-with-stats" + "build": "webpack" }, "devDependencies": { "babel-core": "^6.25.0", diff --git a/webpack-with-stats b/webpack-with-stats deleted file mode 100755 index 6f19e30..0000000 --- a/webpack-with-stats +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env node - -var path = require('path'); -var fs = require('fs'); -var process = require('process'); -var webpack = require('webpack'); -var config = require('./webpack.config.js'); - -webpack(config, function (err, stats) { - if (err) { - console.log(JSON.stringify(err)); - process.exit(1); - return; - } - - var inputs = [ ]; - stats.compilation.fileDependencies.forEach(function(file) { - inputs.push(path.relative(process.cwd(), file)); - }); - fs.writeFileSync('webpack.inputs', inputs.join("\n") + "\n"); -});