diff --git a/.gitignore b/.gitignore index 88ca803..6b43f53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules/ js/ +build/ diff --git a/Makefile b/Makefile index ada504f..27d99ab 100644 --- a/Makefile +++ b/Makefile @@ -115,41 +115,44 @@ dist: source: rm -rf $(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="../$(app_name)/build" \ --exclude="../$(app_name)/js/node_modules" \ --exclude="../$(app_name)/node_modules" \ --exclude="../$(app_name)/*.log" \ --exclude="../$(app_name)/js/*.log" \ + $(app_name) # Builds the source package for the app store, ignores php and js tests .PHONY: appstore appstore: rm -rf $(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="../$(app_name)/build" \ - --exclude="../$(app_name)/tests" \ - --exclude="../$(app_name)/Makefile" \ - --exclude="../$(app_name)/*.log" \ - --exclude="../$(app_name)/phpunit*xml" \ - --exclude="../$(app_name)/composer.*" \ - --exclude="../$(app_name)/js/node_modules" \ - --exclude="../$(app_name)/js/tests" \ - --exclude="../$(app_name)/js/test" \ - --exclude="../$(app_name)/js/*.log" \ - --exclude="../$(app_name)/js/package.json" \ - --exclude="../$(app_name)/js/bower.json" \ - --exclude="../$(app_name)/js/karma.*" \ - --exclude="../$(app_name)/js/protractor.*" \ - --exclude="../$(app_name)/package.json" \ - --exclude="../$(app_name)/bower.json" \ - --exclude="../$(app_name)/karma.*" \ - --exclude="../$(app_name)/protractor\.*" \ - --exclude="../$(app_name)/.*" \ - --exclude="../$(app_name)/js/.*" \ + --exclude="$(app_name)/build" \ + --exclude="$(app_name)/tests" \ + --exclude="$(app_name)/Makefile" \ + --exclude="$(app_name)/*.log" \ + --exclude="$(app_name)/phpunit*xml" \ + --exclude="$(app_name)/composer.*" \ + --exclude="$(app_name)/js/node_modules" \ + --exclude="$(app_name)/js/tests" \ + --exclude="$(app_name)/js/test" \ + --exclude="$(app_name)/js/*.log" \ + --exclude="$(app_name)/js/package.json" \ + --exclude="$(app_name)/js/bower.json" \ + --exclude="$(app_name)/js/karma.*" \ + --exclude="$(app_name)/js/protractor.*" \ + --exclude="$(app_name)/package.json" \ + --exclude="$(app_name)/bower.json" \ + --exclude="$(app_name)/karma.*" \ + --exclude="$(app_name)/protractor\.*" \ + --exclude="$(app_name)/.*" \ + --exclude="$(app_name)/js/.*" \ + $(app_name) .PHONY: test test: composer diff --git a/webpack.common.js b/webpack.common.js index 0d546c6..f0bb7a3 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -1,6 +1,5 @@ const path = require('path') const { VueLoaderPlugin } = require('vue-loader') -const StyleLintPlugin = require('stylelint-webpack-plugin') const BundleAnalyzerPlugin = require('@bundle-analyzer/webpack-plugin') const config = { @@ -17,10 +16,6 @@ const config = { test: /\.css$/, use: ['vue-style-loader', 'css-loader'], }, - { - test: /\.scss$/, - use: ['vue-style-loader', 'css-loader', 'sass-loader'], - }, { test: /\.(js|vue)$/, use: 'eslint-loader', @@ -41,7 +36,6 @@ const config = { }, plugins: [ new VueLoaderPlugin(), - new StyleLintPlugin(), ], resolve: { extensions: ['*', '.js', '.vue'],