From 75ad3a788188595eb8ee8ce370507dc5e39e794a Mon Sep 17 00:00:00 2001 From: Star Bist Date: Fri, 12 Jan 2018 11:46:08 +0100 Subject: [PATCH] Package 1.1.5 - Fixing copy commands and file structure. --- config.json | 2 +- copy/.editorconfig | 12 ++ copy/.eslintignore | 4 + copy/.eslintrc.json | 13 ++ copy/.gitignore | 7 + copy/.htmllintrc | 52 ++++++ copy/.jshintrc | 72 ++++++++ copy/.stylelintrc | 6 + copy/config.json | 379 ++++++++++++++++++++++++++++++++++++++++++ copy/faviconData.json | 1 + copy/gulpfile.js | 4 + gulpfile.copy.js | 5 - package.json | 7 +- 13 files changed, 555 insertions(+), 9 deletions(-) create mode 100644 copy/.editorconfig create mode 100644 copy/.eslintignore create mode 100644 copy/.eslintrc.json create mode 100644 copy/.gitignore create mode 100644 copy/.htmllintrc create mode 100644 copy/.jshintrc create mode 100644 copy/.stylelintrc create mode 100644 copy/config.json create mode 100644 copy/faviconData.json create mode 100644 copy/gulpfile.js delete mode 100644 gulpfile.copy.js diff --git a/config.json b/config.json index f6a8227..94dbe3e 100644 --- a/config.json +++ b/config.json @@ -374,6 +374,6 @@ } }, "gulp": { - "src": "gulp/" + "src": "node_modules/starter-project/gulp/" } } diff --git a/copy/.editorconfig b/copy/.editorconfig new file mode 100644 index 0000000..c24cb32 --- /dev/null +++ b/copy/.editorconfig @@ -0,0 +1,12 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true diff --git a/copy/.eslintignore b/copy/.eslintignore new file mode 100644 index 0000000..5897119 --- /dev/null +++ b/copy/.eslintignore @@ -0,0 +1,4 @@ +**/*.min.js +**/vendor/* +**/dist/* +**/node_modules/* diff --git a/copy/.eslintrc.json b/copy/.eslintrc.json new file mode 100644 index 0000000..118a43b --- /dev/null +++ b/copy/.eslintrc.json @@ -0,0 +1,13 @@ +{ + "extends": ["airbnb-base", "standard"], + "globals": { + "requestAnimationFrame": true, + "sessionStorage": true + }, + "env": { + "browser": true, + "es6": true, + "amd": true, + "commonjs": true + } +} diff --git a/copy/.gitignore b/copy/.gitignore new file mode 100644 index 0000000..8876900 --- /dev/null +++ b/copy/.gitignore @@ -0,0 +1,7 @@ +/dev/ +/dist/ +/node_modules/ +/bower_packages/ +/vendor/ +.DS_Store +yarn.lock diff --git a/copy/.htmllintrc b/copy/.htmllintrc new file mode 100644 index 0000000..500b07a --- /dev/null +++ b/copy/.htmllintrc @@ -0,0 +1,52 @@ +{ + "attr-bans": false, + "attr-name-ignore-regex": false, + "attr-name-style": "dash", + "attr-new-line": false, + "attr-no-dup": true, + "attr-no-unsafe-char": true, + "attr-order": false, + "attr-quote-style": "double", + "attr-req-value": true, + "attr-validate": false, + "class-no-dup": true, + "class-style": "dash", + "doctype-first": "smart", + "doctype-html5": true, + "fig-req-figcaption": false, + "focusable-tabindex-style": false, + "head-req-title": true, + "head-valid-content-model": true, + "href-style": false, + "html-req-lang": true, + "html-valid-content-model": true, + "id-class-ignore-regex": false, + "id-class-no-ad": true, + "id-class-style": "camel", + "id-no-dup": true, + "img-req-alt": true, + "img-req-src": true, + "indent-style": "nonmixed", + "indent-width": false, + "indent-width-cont": false, + "input-radio-req-name": true, + "input-req-label": false, + "label-req-for": true, + "lang-style": "case", + "line-end-style": false, + "line-max-len": false, + "line-max-len-ignore-regex": false, + "maxerr": false, + "raw-ignore-regex": false, + "spec-char-escape": false, + "table-req-caption": false, + "table-req-header": true, + "tag-bans": false, + "tag-close": true, + "tag-name-lowercase": true, + "tag-name-match": true, + "tag-self-close": false, + "text-ignore-regex": false, + "title-max-len": 60, + "title-no-dup": true +} diff --git a/copy/.jshintrc b/copy/.jshintrc new file mode 100644 index 0000000..d5e1c3a --- /dev/null +++ b/copy/.jshintrc @@ -0,0 +1,72 @@ +{ + "maxerr": 50, + "bitwise": false, + "camelcase": true, + "curly": true, + "eqeqeq": true, + "forin": true, + "freeze": true, + "immed": false, + "latedef": false, + "newcap": false, + "noarg": true, + "noempty": true, + "nonbsp": true, + "nonew": false, + "plusplus": false, + "quotmark": "single", + "undef": true, + "unused": true, + "strict": true, + "maxparams": false, + "maxdepth": false, + "maxstatements": false, + "maxcomplexity": false, + "maxlen": false, + "varstmt": false, + "asi": false, + "boss": false, + "debug": true, + "eqnull": false, + "esversion": 6, + "moz": false, + "evil": false, + "expr": false, + "funcscope": false, + "globalstrict": true, + "iterator": false, + "lastsemic": false, + "laxbreak": false, + "laxcomma": false, + "loopfunc": false, + "multistr": true, + "noyield": false, + "notypeof": false, + "proto": false, + "scripturl": false, + "shadow": false, + "sub": false, + "supernew": false, + "validthis": false, + "browser": true, + "browserify": false, + "couch": false, + "devel": true, + "dojo": false, + "jasmine": false, + "jquery": false, + "mocha": false, + "mootools": false, + "node": true, + "nonstandard": false, + "phantom": false, + "prototypejs": false, + "qunit": false, + "rhino": false, + "shelljs": false, + "typed": false, + "worker": false, + "wsh": false, + "yui": false, + "globals": {} +} diff --git a/copy/.stylelintrc b/copy/.stylelintrc new file mode 100644 index 0000000..3df8ba1 --- /dev/null +++ b/copy/.stylelintrc @@ -0,0 +1,6 @@ +{ + "plugins": [ + "stylelint-scss" + ], + "extends": "stylelint-config-sass-guidelines" +} diff --git a/copy/config.json b/copy/config.json new file mode 100644 index 0000000..94dbe3e --- /dev/null +++ b/copy/config.json @@ -0,0 +1,379 @@ +{ + "root": "./", + "src": "src/", + "dest": "dist/", + "bump": { + "src": "package.json", + "minorConfig": { + "type": "minor" + }, + "majorConfig": { + "type": "major" + } + }, + "css": { + "run": true, + "src": "scss/", + "dest": "css/", + "styleLintConfig": { + "reporters": [{ + "formatter": "string", + "console": true + }] + }, + "sassConfig": { + "includePaths": ["./node_modules/modularscale-sass/stylesheets", "./src/scss/", "./src/scss/components"] + }, + "autoprefixedConfig": { + "browsers": ["last 5 versions"], + "cascade": false + }, + "renameConfig": { + "suffix": ".min" + } + }, + "fonts": { + "run": true, + "src": "fonts/", + "dest": "fonts/" + }, + "gfx": { + "run": true, + "src": "gfx/", + "dest": "gfx/", + "gifsicleConfig": { + "interlaced": true + }, + "imageminMozjpegConfig": { + "quality": 90, + "progressive": true + }, + "imageminPngquantConfig": { + "quality": 90 + }, + "svgoConfig": { + "plugins": [{ + "cleanupAttrs": true + }, + { + "removeDoctype": true + }, + { + "removeComments": true + }, + { + "removeXMLProcInst": true + }, + { + "removeMetadata": true + }, + { + "removeTitle": false + }, + { + "removeDesc": false + }, + { + "removeUselessDefs": true + }, + { + "removeXMLNS": true + }, + { + "removeEditorsNSData": true + }, + { + "removeEmptyAttrs": true + }, + { + "removeHiddenElems": true + }, + { + "removeEditorsNSData": true + }, + { + "removeEmptyText": true + }, + { + "removeEmptyContainers": true + }, + { + "removeViewBox": false + }, + { + "cleanupEnableBackground": true + }, + { + "convertStyleToAttrs": true + }, + { + "convertColors": true + }, + { + "convertPathData": true + }, + { + "convertTransform": true + }, + { + "removeUnknownsAndDefaults": true + }, + { + "removeNonInheritableGroupAttrs": true + }, + { + "removeUselessStrokeAndFill": true + }, + { + "removeUnusedNS": true + }, + { + "cleanupIDs": false + }, + { + "cleanupNumericValues": true + }, + { + "cleanupListOfValues": true + }, + { + "moveElemsAttrsToGroup": true + }, + { + "moveGroupAttrsToElems": false + }, + { + "collapseGroups": true + }, + { + "removeRasterImages": true + }, + { + "mergePaths": true + }, + { + "convertShapeToPath": false + }, + { + "sortAttrs": true + }, + { + "removeDimensions": true + }, + { + "removeAttrs": false + }, + { + "removeElementsByAttr": false + }, + { + "addClassesToSVGElement": false + }, + { + "addAttributesToSVGElement": false + }, + { + "removeStyleElement": false + }, + { + "removeScriptElement": false + }, + { + "removeDimensions": false + } + ] + } + }, + "favicon": { + "run": true, + "src": "html/partials/favicon.pug", + "dest": "html/partials", + "realFaviconConfig": { + "masterPicture": "./src/gfx/svg/starter-project.svg", + "dest": "./dist/favicon/", + "iconsPath": "/favicon/", + "design": { + "ios": { + "pictureAspect": "backgroundAndMargin", + "backgroundColor": "#1ebada", + "margin": "18%", + "assets": { + "ios6AndPriorIcons": true, + "ios7AndLaterIcons": true, + "precomposedIcons": true, + "declareOnlyDefaultIcon": true + }, + "appName": "Starter Project" + }, + "desktopBrowser": {}, + "windows": { + "pictureAspect": "noChange", + "backgroundColor": "#1ebada", + "onConflict": "override", + "assets": { + "windows80Ie10Tile": true, + "windows10Ie11EdgeTiles": { + "small": true, + "medium": true, + "big": true, + "rectangle": true + } + }, + "appName": "Starter Project" + }, + "androidChrome": { + "pictureAspect": "noChange", + "themeColor": "#1ebada", + "manifest": { + "name": "Starter Project", + "display": "standalone", + "orientation": "notSet", + "onConflict": "override", + "declared": true + }, + "assets": { + "legacyIcon": true, + "lowResolutionIcons": false + } + }, + "safariPinnedTab": { + "pictureAspect": "blackAndWhite", + "threshold": 42.5, + "themeColor": "#1ebada" + } + }, + "settings": { + "compression": 2, + "scalingAlgorithm": "Cubic", + "errorOnImageTooSmall": false + }, + "markupFile": "./faviconData.json" + } + }, + "html": { + "run": true, + "src": "html/", + "renameConfig": { + "extname": ".html" + }, + "pugConfig": { + "pretty": true + }, + "htmllintConfig": ".htmllintrc", + "htmlminConfig": { + "collapseWhitespace": true + }, + "inlineSourcePath": "dist" + }, + "penthouse": { + "run": true, + "src": "style.css", + "criticalCssConfig": { + "out": "./dist/css/style.critical.css", + "url": "http://localhost:3000", + "width": 1366, + "height": 768, + "keepLargerMediaQueries": true, + "strict": false, + "blockJSRequests": false + } + }, + "js": { + "run": true, + "src": "js/", + "dest": "js/", + "eslintConfig": { + "configFile": "./.eslintrc.json", + "fix": true, + "quiet": true + }, + "includeConfig": { + "includePaths": [ + "./node_modules" + ] + }, + "babelConfig": { + "presets": ["env"] + }, + "standardConfig": { + "breakOnError": false, + "showRuleNames": true, + "standard": { + "globals": ["requestAnimationFrame", "sessionStorage"] + } + }, + "renameConfig": { + "suffix": ".min" + } + }, + "sassdoc": { + "run": true, + "sassdocConfig": { + "dest": "./dist/docs/sass/", + "package": { + "title": "Starter project", + "name": "starter-project", + "description": "Gulp; .editorconfig; .jshintrc; .gitignore; SCSS: reset, locks, system fonts;", + "license": "MIT", + "homepage": "https://github.com/maliMirkec/starter-project" + }, + "autofill": true, + "verbose": true, + "display": { + "access": ["public", "private"], + "alias": true, + "watermark": true + }, + "groups": { + "undefined": "Misc" + }, + "basePath": "http://localhost:3000/docs/sass/" + } + }, + "kss": { + "run": true, + "dest": "styleguide/", + "kssConfig": { + "title": "Starter Project", + "source": "./src/scss/", + "destination": "./dist/docs/styleguide/", + "css": [ + "/css/style.css", + "/css/foft.css" + ], + "js": [ + "/js/foftFontLoading.js" + ] + } + }, + "jsdoc": { + "run": true, + "src": ["README.md", "./src/js/"], + "jsdocConfig": { + "tags": { + "allowUnknownTags": true + }, + "opts": { + "destination": "./dist/docs/js/" + }, + "plugins": [ + "plugins/markdown" + ], + "templates": { + "cleverLinks": true, + "monospaceLinks": false, + "default": { + "outputSourceFiles": true + }, + "path": "ink-docstrap", + "theme": "simplex", + "navType": "vertical", + "linenums": true, + "dateFormat": "MMMM Do YYYY, h:mm:ss a" + } + } + }, + "gulp": { + "src": "node_modules/starter-project/gulp/" + } +} diff --git a/copy/faviconData.json b/copy/faviconData.json new file mode 100644 index 0000000..455d9f6 --- /dev/null +++ b/copy/faviconData.json @@ -0,0 +1 @@ +{"result":{"status":"success"},"favicon":{"package_url":"https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/favicons.zip","files_urls":["https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/android-chrome-192x192.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/android-chrome-512x512.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-114x114-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-114x114.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-120x120-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-120x120.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-144x144-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-144x144.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-152x152-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-152x152.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-180x180-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-180x180.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-57x57-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-57x57.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-60x60-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-60x60.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-72x72-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-72x72.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-76x76-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-76x76.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon-precomposed.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/apple-touch-icon.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/browserconfig.xml","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/favicon-16x16.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/favicon-32x32.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/favicon.ico","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/manifest.json","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/mstile-144x144.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/mstile-150x150.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/mstile-310x150.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/mstile-310x310.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/mstile-70x70.png","https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/package_files/safari-pinned-tab.svg"],"html_code":"\n\n\n\n\n\n\n\n\n\n\n\n","compression":"true","overlapping_markups":["link[rel=\"apple-touch-icon\"]","meta[name=\"apple-mobile-web-app-title\"]","link[rel=\"shortcut\"]","link[rel=\"shortcut icon\"]","link[rel=\"icon\",sizes=\"16x16\"]","link[rel=\"icon\",sizes=\"32x32\"]","meta[name=\"msapplication-TileColor\"]","meta[name=\"msapplication-TileImage\"]","meta[name=\"msapplication-config\"]","meta[name=\"application-name\"]","link[rel=\"manifest\"]","meta[name=\"theme-color\"]","link[rel=\"icon\",sizes=\"192x192\"]","link[rel=\"mask-icon\"]"]},"files_location":{"type":"path","path":"/favicon/"},"preview_picture_url":"https://realfavicongenerator.net/files/591ad21ae212e468ec7e184071a9a8a6142db6a3/favicon_preview.png","version":"0.15"} \ No newline at end of file diff --git a/copy/gulpfile.js b/copy/gulpfile.js new file mode 100644 index 0000000..94a04ac --- /dev/null +++ b/copy/gulpfile.js @@ -0,0 +1,4 @@ +const requireDir = require('require-dir') +const config = require('./config.json') + +requireDir(config.root + config.gulp.src) diff --git a/gulpfile.copy.js b/gulpfile.copy.js deleted file mode 100644 index b75694b..0000000 --- a/gulpfile.copy.js +++ /dev/null @@ -1,5 +0,0 @@ -const gulp = require('gulp') -const requireDir = require('require-dir') -const config = require('./node_modules/starter-project/config.json') - -requireDir(config.root + config.gulp.src) diff --git a/package.json b/package.json index e59e45e..0107ca9 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "name": "starter-project", - "version": "1.1.4", + "version": "1.1.5", "description": "Gulp; .editorconfig; .jshintrc; .gitignore; SCSS: reset, locks, system fonts;", "main": "index.html", "scripts": { "build": "gulp", - "copy_gulpfile": "cp gulpfile.copy.js ../../gulpfile.js", - "postinstall": "npm run copy_gulpfile" + "copy_config": "cp copy/* ../../", + "copy_src": "cp src ../../new_src", + "postinstall": "npm run copy_config && npm run copy_src" }, "repository": { "type": "git",