Skip to content

Commit b5967ae

Browse files
authored
Merge pull request #5 from michaelbragg/rename-assets-directory
Rename assets directory
2 parents c677d43 + 5548010 commit b5967ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+18
-16
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ before_script:
4949
# Setup WordPress
5050
- mysql -e "CREATE DATABASE wordpress;" -uroot
5151
# Install composer packages before trying to activate themes or plugins
52-
- composer require thoughtsideas/ti-wpcs:*
53-
- vendor/bin/phpcs --config-set installed_paths ../../../vendor/wp-coding-standards/wpcs,../../../vendor/frenck/php-compatibility,../../../vendor/thoughtsideas/ti-wpcs
52+
- composer require thoughtsideas/ti-wpcs:dev-develop
5453
- vendor/bin/phpcs --config-set default_standard TI-WPCS
5554

5655
script:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

composer.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,28 @@
2323
"repositories": [],
2424
"require": {},
2525
"require-dev": {
26-
"thoughtsideas/ti-wpcs" : "1.1.0"
27-
},
28-
"autoload": {
26+
"thoughtsideas/ti-wpcs": "dev-develop"
2927
},
28+
"autoload": {},
3029
"scripts": {
3130
"config-ti-wpcs": [
32-
"\"vendor/bin/phpcs\" --config-set default_standard TI-WPCS",
33-
"\"vendor/bin/phpcs\" --config-set colors 1",
34-
"\"vendor/bin/phpcs\" --config-set show_progress 1"
31+
"\"vendor/bin/phpcs\" --config-set default_standard TI-WPCS"
3532
],
3633
"post-install-cmd": "composer config-ti-wpcs",
3734
"post-update-cmd": "composer config-ti-wpcs",
3835
"test-phpcbf": "./vendor/bin/phpcbf ./ --standard=vendor/thoughtsideas/TI-WPCS/ti-wpcs/ruleset.xml",
3936
"test-phpcs": "./vendor/bin/phpcs ./ --standard=vendor/thoughtsideas/TI-WPCS/ti-wpcs/ruleset.xml",
4037
"test-phpmd": "./vendor/bin/phpmd ./ text ./vendor/thoughtsideas/ti-wpcs/TI-WPMD/ruleset.xml",
38+
"test-phpcpd": "./vendor/bin/phpcpd ./ --regexps-exclude=#vendor/#,#node_modules/# --progress",
39+
"test-phpsc": "./vendor/bin/security-checker security:check composer.lock",
40+
"test-phpmnd": "./vendor/bin/phpmnd ./ --ignore-funcs=round,sleep --exclude=./vendor/ --progress",
4141
"test": [
4242
"composer run test-phpcbf",
4343
"composer run test-phpcs",
44-
"composer run test-phpmd"
44+
"composer run test-phpmd",
45+
"composer run test-phpcpd",
46+
"composer run test-phpsc",
47+
"composer run test-phpmnd"
4548
]
4649
}
4750
}

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@
4444
"build": "npm-run-all -s styles images",
4545
"build:watch": "npm-run-all --parallel styles:watch",
4646
"styles": "npm run sass && npm run postcss",
47-
"styles:watch": "watch 'npm run styles -- --source-map' ./_assets/ui/",
48-
"sass": "node-sass ./_assets/ui/style.scss style.css --indent-type tab",
47+
"styles:watch": "watch 'npm run styles -- --source-map' ./assets/ui/",
48+
"sass": "node-sass ./assets/ui/style.scss style.css --indent-type tab",
4949
"postcss": "postcss style.css --output style.css --use autoprefixer cssnano",
5050
"images": "npm run raster-images && npm run svg",
51-
"raster-images": "imagemin ./_assets/ui/**/*.{png,jpg,gif} --out-dir ./ui",
51+
"raster-images": "imagemin ./assets/ui/**/*.{png,jpg,gif} --out-dir ./ui",
5252
"svg": "npm-run-all --parallel svg:icons svg:logos",
53-
"svg:watch": "watch 'npm run svg ./_assets/ui/'",
54-
"svg:icons": "svgstore -o ./ui/icons.svg -p icon- ./_assets/gui/svg-icons/*.svg --inline",
55-
"svg:logos": "svgstore -o ./ui/logos.svg -p logo- ./_assets/gui/svg-logos/*.svg --inline",
53+
"svg:watch": "watch 'npm run svg ./assets/ui/'",
54+
"svg:icons": "svgstore -o ./ui/icons.svg -p icon- ./assets/gui/svg-icons/*.svg --inline",
55+
"svg:logos": "svgstore -o ./ui/logos.svg -p logo- ./assets/gui/svg-logos/*.svg --inline",
5656
"test": "npm run stylelint",
57-
"stylelint": "stylelint ./_assets/ui/**/*.scss --syntax scss"
57+
"stylelint": "stylelint ./assets/ui/**/*.scss --syntax scss"
5858
},
5959
"stylelint": {
6060
"extends": "./_tests/stylelint.config.js"

0 commit comments

Comments
 (0)