Fix appstore builds

Signed-off-by: William Brawner <me@wbrawner.com>
This commit is contained in:
William Brawner 2020-03-24 18:18:40 -07:00
parent 1da4bd2638
commit dc97ed2dc3
3 changed files with 26 additions and 28 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
node_modules/ node_modules/
js/ js/
build/

View file

@ -115,41 +115,44 @@ dist:
source: source:
rm -rf $(source_build_directory) rm -rf $(source_build_directory)
mkdir -p $(source_build_directory) mkdir -p $(source_build_directory)
tar cvzf $(source_package_name).tar.gz ../$(app_name) \ tar cvzf $(source_package_name).tar.gz -C .. \
--exclude-vcs \ --exclude-vcs \
--exclude="../$(app_name)/build" \ --exclude="../$(app_name)/build" \
--exclude="../$(app_name)/js/node_modules" \ --exclude="../$(app_name)/js/node_modules" \
--exclude="../$(app_name)/node_modules" \ --exclude="../$(app_name)/node_modules" \
--exclude="../$(app_name)/*.log" \ --exclude="../$(app_name)/*.log" \
--exclude="../$(app_name)/js/*.log" \ --exclude="../$(app_name)/js/*.log" \
$(app_name)
# Builds the source package for the app store, ignores php and js tests # Builds the source package for the app store, ignores php and js tests
.PHONY: appstore .PHONY: appstore
appstore: appstore:
rm -rf $(appstore_build_directory) rm -rf $(appstore_build_directory)
mkdir -p $(appstore_build_directory) mkdir -p $(appstore_build_directory)
tar cvzf $(appstore_package_name).tar.gz ../$(app_name) \ echo "Tarred $(app_name)"
tar -cvzf $(appstore_package_name).tar.gz -C .. \
--exclude-vcs \ --exclude-vcs \
--exclude="../$(app_name)/build" \ --exclude="$(app_name)/build" \
--exclude="../$(app_name)/tests" \ --exclude="$(app_name)/tests" \
--exclude="../$(app_name)/Makefile" \ --exclude="$(app_name)/Makefile" \
--exclude="../$(app_name)/*.log" \ --exclude="$(app_name)/*.log" \
--exclude="../$(app_name)/phpunit*xml" \ --exclude="$(app_name)/phpunit*xml" \
--exclude="../$(app_name)/composer.*" \ --exclude="$(app_name)/composer.*" \
--exclude="../$(app_name)/js/node_modules" \ --exclude="$(app_name)/js/node_modules" \
--exclude="../$(app_name)/js/tests" \ --exclude="$(app_name)/js/tests" \
--exclude="../$(app_name)/js/test" \ --exclude="$(app_name)/js/test" \
--exclude="../$(app_name)/js/*.log" \ --exclude="$(app_name)/js/*.log" \
--exclude="../$(app_name)/js/package.json" \ --exclude="$(app_name)/js/package.json" \
--exclude="../$(app_name)/js/bower.json" \ --exclude="$(app_name)/js/bower.json" \
--exclude="../$(app_name)/js/karma.*" \ --exclude="$(app_name)/js/karma.*" \
--exclude="../$(app_name)/js/protractor.*" \ --exclude="$(app_name)/js/protractor.*" \
--exclude="../$(app_name)/package.json" \ --exclude="$(app_name)/package.json" \
--exclude="../$(app_name)/bower.json" \ --exclude="$(app_name)/bower.json" \
--exclude="../$(app_name)/karma.*" \ --exclude="$(app_name)/karma.*" \
--exclude="../$(app_name)/protractor\.*" \ --exclude="$(app_name)/protractor\.*" \
--exclude="../$(app_name)/.*" \ --exclude="$(app_name)/.*" \
--exclude="../$(app_name)/js/.*" \ --exclude="$(app_name)/js/.*" \
$(app_name)
.PHONY: test .PHONY: test
test: composer test: composer

View file

@ -1,6 +1,5 @@
const path = require('path') const path = require('path')
const { VueLoaderPlugin } = require('vue-loader') const { VueLoaderPlugin } = require('vue-loader')
const StyleLintPlugin = require('stylelint-webpack-plugin')
const BundleAnalyzerPlugin = require('@bundle-analyzer/webpack-plugin') const BundleAnalyzerPlugin = require('@bundle-analyzer/webpack-plugin')
const config = { const config = {
@ -17,10 +16,6 @@ const config = {
test: /\.css$/, test: /\.css$/,
use: ['vue-style-loader', 'css-loader'], use: ['vue-style-loader', 'css-loader'],
}, },
{
test: /\.scss$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader'],
},
{ {
test: /\.(js|vue)$/, test: /\.(js|vue)$/,
use: 'eslint-loader', use: 'eslint-loader',
@ -41,7 +36,6 @@ const config = {
}, },
plugins: [ plugins: [
new VueLoaderPlugin(), new VueLoaderPlugin(),
new StyleLintPlugin(),
], ],
resolve: { resolve: {
extensions: ['*', '.js', '.vue'], extensions: ['*', '.js', '.vue'],