Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Gulp in Favor of NPM CLI #1141

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
64cceb4
Add npm script replacement for gulp style tasks
esjay Aug 11, 2020
3455c88
Remove unused build features object
esjay Aug 11, 2020
d5ed25a
add style cleanup phase
esjay Aug 11, 2020
df693b2
Use cli for stylelint
esjay Oct 20, 2020
cef0343
generate svg sprites via cli
esjay Oct 20, 2020
281100a
Use cli for building svgs
esjay Oct 20, 2020
3c3dbdb
Copy all images via cli
esjay Oct 20, 2020
682b024
Use jshint via CLI
esjay Oct 27, 2020
aa73fc9
Use CLI for concat + uglify
esjay Oct 27, 2020
22e4ea8
Use optimize-js via CLI
esjay Oct 27, 2020
c078e0f
Update script references to only use main.min.js
esjay Oct 27, 2020
6b164dd
Remove unused email link processing
esjay Oct 27, 2020
cd98084
Load main.js sychronously to prevent race condition
esjay Oct 27, 2020
584dbd9
Update build script
esjay Oct 27, 2020
ce8a6d1
Make npm script names consistent
esjay Oct 27, 2020
b071251
Perform serve and watch via CLI
esjay Oct 27, 2020
48ebe48
Remove gulp
esjay Oct 27, 2020
a1e8660
Re-add purgecss after removing gulp
esjay Nov 10, 2020
86c85c0
Reload Browsersync on changes to CSS and JS files
esjay Nov 17, 2020
8cf91f0
copy js/css to dist upon publish
esjay Nov 17, 2020
e961f7a
Merge branch 'main' into feature/replace-gulp
esjay Nov 24, 2020
7b92688
Update package-lock
esjay Nov 24, 2020
2b3ec14
upgrade node version to allow use of template strings
esjay Nov 24, 2020
1ed4cc9
Resolve merge conflicts
nchan0154 Oct 3, 2023
15339f9
Migrate sass, build commands now all working
nchan0154 Oct 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .eleventy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const pluginRss = require("@11ty/eleventy-plugin-rss");
const eleventyNavigationPlugin = require("@11ty/eleventy-navigation");
const pluginSyntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight");
const eleventyPluginTOC = require("eleventy-plugin-nesting-toc");

const slugify = require("slugify");
const htmlmin = require("html-minifier");

Expand All @@ -25,7 +24,7 @@ module.exports = function (eleventyConfig) {

/**
* Returns a human-readable date
E.g. May 31, 2019
E.g. May 31, 2019f
*/

eleventyConfig.addFilter("dateReadable", (value) => {
Expand Down Expand Up @@ -122,6 +121,10 @@ module.exports = function (eleventyConfig) {

// Directories
eleventyConfig.addPassthroughCopy("./src/fonts");
eleventyConfig.addPassthroughCopy({
"./tmp/_dist/css": "css",
"./tmp/_dist/js": "js",
});

// Social Media
eleventyConfig.addPassthroughCopy("./src/apple-touch-icon.png");
Expand Down Expand Up @@ -169,6 +172,8 @@ module.exports = function (eleventyConfig) {
return content;
});

eleventyConfig.setUseGitIgnore(false);

return {
templateFormats: ["md", "njk", "html", "liquid"],

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Project-specific files and folders
dist/

tmp/

# Generic files to ignore
*~
Expand Down
96 changes: 21 additions & 75 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
{
"extends": "stylelint-config-standard-scss",
"reporters": [{ "formatter": "string", "console": true }],
"rules": {
"scss/dollar-variable-pattern": null,
"scss/dollar-variable-empty-line-before": null,
"scss/comment-no-empty": null,
"scss/no-global-function-names": null,
"scss/at-mixin-argumentless-call-parentheses": null,
"scss/double-slash-comment-empty-line-before": null,
"scss/at-rule-conditional-no-parentheses": null,
"selector-class-pattern": "^[a-z]([-]?[a-z0-9]+)*(__[a-z0-9]([-]?[a-z0-9]+)*)*?(--[a-z0-9]([-]?[a-z0-9]+)*)?$",
"no-descending-specificity": null,
"declaration-empty-line-before": null,
"color-no-invalid-hex": true,
"font-family-no-missing-generic-family-keyword": true,
"function-calc-no-unspaced-operator": true,
Expand Down Expand Up @@ -36,104 +48,38 @@
]
}
],
"comment-no-empty": true,
"comment-no-empty": null,
"comment-empty-line-before": null,
"no-duplicate-selectors": true,
"no-extra-semicolons": true,
"color-named": [
"never",
{
"ignore": [
"inside-function"
]
}
],
"color-named": ["never", { "ignore": ["inside-function"] }],
"function-url-no-scheme-relative": true,
"shorthand-property-no-redundant-values": true,
"value-no-vendor-prefix": true,
"property-no-vendor-prefix": true,
"declaration-block-no-redundant-longhand-properties": [
true,
{
"ignoreShorthands": [
"/grid/"
]
}
{ "ignoreShorthands": ["/grid/"] }
],
"selector-max-id": 0,
"selector-no-vendor-prefix": true,
"at-rule-no-vendor-prefix": true,
"no-unknown-animations": true,
"color-hex-case": "lower",
"color-hex-length": "long",
"font-family-name-quotes": "always-where-recommended",
"function-comma-newline-after": "never-multi-line",
"function-comma-newline-before": "never-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never-single-line",
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-newline-inside": "never-multi-line",
"function-parentheses-space-inside": "never",
"function-url-quotes": "always",
"function-whitespace-after": "always",
"number-leading-zero": "always",
"number-no-trailing-zeros": true,
"string-quotes": "double",
"unit-case": "lower",
"value-keyword-case": "lower",
"value-list-comma-newline-before": "never-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never-single-line",
"value-list-comma-newline-after": "always-multi-line",
"value-list-max-empty-lines": 0,
"property-case": "lower",
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-colon-newline-after": "always-multi-line",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-block-semicolon-newline-after": "always",
"declaration-block-semicolon-space-before": "never",
"declaration-block-trailing-semicolon": "always",
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"value-keyword-case": ["lower", { "camelCaseSvgKeywords": true }],
"selector-attribute-quotes": "always",
"selector-combinator-space-before": "always",
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-colon-notation": "double",
"selector-type-case": "lower",
"selector-combinator-space-after": "always",
"selector-list-comma-newline-after": "always",
"selector-list-comma-newline-before": "never-multi-line",
"at-rule-empty-line-before": [
"always",
{
"ignore": [
"after-comment",
"first-nested",
"inside-block"
],
"except": [
"blockless-after-same-name-blockless"
]
"ignore": ["after-comment", "first-nested", "inside-block"],
"except": ["blockless-after-same-name-blockless"]
}
],
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-name-case": "lower",
"media-feature-parentheses-space-inside": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-semicolon-newline-after": "always",
"at-rule-semicolon-space-before": "never",
"comment-whitespace-inside": "always",
"max-empty-lines": 2
"media-feature-range-notation": "prefix",
"comment-whitespace-inside": "always"
}
}
25 changes: 5 additions & 20 deletions .tours/code-tour.tour
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
{
"file": "package.json",
"line": 25,
"description": "These are the scripts you can run in your command line application. `npm start` will use Eleventy and Gulp to stitch everything together, open the site in your default browser, and then update when you make changes to anything in the `src/` directory."
"line": 17,
"description": "These are the scripts you can runn in your command line application. `npm start` will use Eleventy and Gulp to stitch everything together, open the site in your default browser, and then update when you make changes to anything in the `src/` directory."
},
{
"file": "package.json",
Expand All @@ -44,22 +44,7 @@
{
"file": "TECHNOLOGY.md",
"line": 1,
"description": "This document outlines the technology choices we have made. What we have elected to use is just as important as what we've dliberately chosen not to use."
},
{
"file": "gulpfile.js",
"line": 1,
"description": "This is a Gulp file. It stores a series of instructions to automate repetitive tasks. Gulp allows your computer to watch the code you instruct it to, and then will execute these tasks automatically for you."
},
{
"file": "gulpfile.js",
"line": 297,
"description": "This is how you instruct Gulp to execute what tasks in which order."
},
{
"file": "gulpfile.js",
"line": 105,
"description": "These are the tasks. The previous code is configuration options for it."
"description": "This document outlines the technology choices we have made. What we have elected to use is just as important as what we've deliberately chosen not to use."
},
{
"directory": "src",
Expand Down Expand Up @@ -88,7 +73,7 @@
{
"file": "src/css/screen.scss",
"line": 1,
"description": "This is how the website's CSS is generated. This file imports various Sass partials for Gulp to stitch together into the stylesheet the website will use.\n\nThe `//` comments are for kss-node, which uses structured comment blocks to make a living styleguide."
"description": "This is how the website's CSS is generated. This file imports various Sass partials for other scripts to stitch together into the stylesheet the website will use.\n\nThe `//` comments are for kss-node, which uses structured comment blocks to make a living styleguide."
},
{
"file": "src/css/homepage.md",
Expand Down Expand Up @@ -131,4 +116,4 @@
"description": "This concludes a high-level explanation of this project's code! If you have any feedback or suggestions, please file an Issue or Pull Request.\n\nThank you for helping to make The A11Y Project better!"
}
]
}
}
1 change: 0 additions & 1 deletion TECHNOLOGY.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Technology decisions for The A11Y Project.
The A11Y Project uses the following technology:

- [Eleventy](https://www.11ty.dev/).
- [gulp.js](https://gulpjs.com/).
- JavaScript.
- JSON.
- Markdown.
Expand Down
Loading