Skip to content

Commit

Permalink
Merge branch 'wet-boew:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ipaksc committed Oct 27, 2023
2 parents de1e7c7 + 9f6a068 commit f6fbb34
Show file tree
Hide file tree
Showing 156 changed files with 10,734 additions and 1,669 deletions.
107 changes: 22 additions & 85 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ module.exports = (grunt) ->
"Only needed when the repo is first cloned"
[
# "modernizr"
"wget:jqueryOldIE"
]
)

Expand Down Expand Up @@ -148,6 +147,7 @@ module.exports = (grunt) ->
"INTERNAL: Compiles Sass and copies third party CSS to the dist folder"
[
"sass"
"concat:supports"
"postcss"
"stylelint:unmin"
"usebanner:css"
Expand All @@ -159,8 +159,6 @@ module.exports = (grunt) ->
"INTERNAL: Minify the CSS files"
[
"cssmin:dist"
"cssmin:distIE8"
"cssmin_ie8_clean"
]
)

Expand Down Expand Up @@ -311,7 +309,6 @@ module.exports = (grunt) ->
coreDist: "dist/wet-boew"
themeDist: "dist/theme-wet-boew"
jqueryVersion: "<%= pkg.dependencies.jquery %>"
jqueryOldIEVersion: "1.12.4"
banner: "/*!\n * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)\n * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html\n" +
" * v<%= pkg.version %> - " + "<%= grunt.template.today('yyyy-mm-dd') %>\n *\n */"
modernizrBanner: "/*! Modernizr (Custom Build) | MIT & BSD */\n"
Expand Down Expand Up @@ -352,17 +349,6 @@ module.exports = (grunt) ->
src: "https://docs.google.com/spreadsheets/d/<%= i18nGDocsID %>/export?gid=<%= i18nGDocsSheet %>&format=csv"
dest: "src/i18n/i18n.csv"

jqueryOldIE:
options:
baseUrl: "https://ajax.googleapis.com/ajax/libs/jquery/<%= jqueryOldIEVersion %>/"
overwrite: true
src: [
"jquery.js"
"jquery.min.js"
"jquery.min.map"
]
dest: "lib/jquery-oldIE"

concat:
options:
banner: "<%= banner %><%= modernizrBanner %>"
Expand All @@ -387,17 +373,10 @@ module.exports = (grunt) ->

coreIE8:
options:
banner: "<%= banner %>"
stripBanners: false
src: [
"dep/modernizr-custom.js"
"lib/excanvas/excanvas.js"
"node_modules/html5shiv/dist/html5shiv-printshiv.js"
"node_modules/es5-shim/es5-shim.js"
"src/core/wb.js"
"!src/plugins/**/test.js"
"!src/plugins/**/assets/*.js"
"!src/plugins/**/demo/*.js"
"!src/plugins/**/deps/*.*"
"src/core/ie8-wet-boew.js"
]
dest: "<%= coreDist %>/js/ie8-wet-boew.js"

Expand All @@ -406,12 +385,7 @@ module.exports = (grunt) ->
banner: "<%= banner %>"
stripBanners: false
src: [
"src/core/helpers.js"
"src/plugins/**/*.js"
"!src/plugins/**/test.js"
"!src/plugins/**/assets/*.js"
"!src/plugins/**/demo/*.js"
"!src/plugins/**/deps/*.*"
"src/core/ie8-wet-boew2.js"
]
dest: "<%= coreDist %>/js/ie8-wet-boew2.js"

Expand Down Expand Up @@ -457,6 +431,15 @@ module.exports = (grunt) ->
dest: "<%= coreDist %>/js/i18n"
expand: true

supports:
options:
stripBanners: false
src: [
"<%= themeDist %>/css/theme.css"
"src/polyfills/supports/*.css"
]
dest: "<%= themeDist %>/css/theme.css"

usebanner:
css:
options:
Expand All @@ -481,14 +464,17 @@ module.exports = (grunt) ->
helpers: "site/helpers/helper{,s}-*.js"
partials: [
"site/includes/**/*.hbs"
"src/other/archived/demo/archived.scss"
"src/plugins/eqht-css/demo/eqht-css.scss"
"src/plugins/equalheight/demo/equalheight.scss"
"src/plugins/share/demo/share.scss"
"src/polyfills/datalist/demo/datalist_dynamic.js"
]
layoutdir: "site/layouts"
layout: "default.hbs"
environment:
root: "/v4.0-ci/unmin"
jqueryVersion: "<%= jqueryVersion %>"
jqueryOldIEVersion: "<%= jqueryOldIEVersion %>"
assets: "dist/unmin"

theme:
Expand Down Expand Up @@ -680,7 +666,6 @@ module.exports = (grunt) ->
src: [
"**/*.scss"
"!**/*-base.scss"
"!**/*-ie8.scss"
"!**/*-noscript.scss"
"!**/demo/*.scss"
]
Expand Down Expand Up @@ -714,7 +699,7 @@ module.exports = (grunt) ->
]

postcss:
# Only vendor prefixing and no IE8
# Only vendor prefixing
modern:
options:
processors: [
Expand All @@ -725,7 +710,6 @@ module.exports = (grunt) ->
cwd: "<%= coreDist %>/css"
src: [
"*.css"
"!ie8*.css"
]
dest: "<%= coreDist %>/css"
expand: true
Expand All @@ -735,14 +719,13 @@ module.exports = (grunt) ->
cwd: "<%= themeDist %>/css"
src: [
"**/*.css"
"!ie8*.css"
]
dest: "<%= themeDist %>/css"
expand: true
}
]

# Needs both IE8 and vendor prefixing
# Mixed vendor prefixing
mixed:
options:
processors: [
Expand All @@ -765,23 +748,6 @@ module.exports = (grunt) ->
expand: true
]

# Only IE8 support
oldIE:
options:
processors: [
require("autoprefixer")(
overrideBrowserslist: [
"ie 8"
]
)
]
cwd: "dist"
src: [
"**/ie8*.css"
]
dest: "dist/"
expand: true

stylelint:
options:
configFile: ".stylelintrc.yml"
Expand Down Expand Up @@ -831,7 +797,6 @@ module.exports = (grunt) ->
cwd: "<%= coreDist %>/js/"
src: [
"*wet-boew*.js"
"!ie*.js"
"!*.min.js"
]
dest: "<%= coreDist %>/js/"
Expand All @@ -842,8 +807,6 @@ module.exports = (grunt) ->
options:
beautify:
beautify: false
quote_keys: true
ascii_only: true
cwd: "<%= coreDist %>/js/"
src: [
"ie8*.js"
Expand Down Expand Up @@ -888,20 +851,6 @@ module.exports = (grunt) ->
src: [
"<%= coreDist %>/**/*.css"
"<%= themeDist %>/**/*.css"
"!**/ie8*.css"
"!**/*.min.css"
]
ext: ".min.css"

distIE8:
options:
banner: ""
compatibility: "ie8"
noAdvanced: true
expand: true
src: [
"<%= coreDist %>/**/ie8*.css"
"<%= themeDist %>/**/ie8*.css"
"!**/*.min.css"
]
ext: ".min.css"
Expand Down Expand Up @@ -964,6 +913,8 @@ module.exports = (grunt) ->
src: [
"dist/unmin/demos/**/ajax/**/*.html"
"dist/unmin/assets/*.html"
"!dist/unmin/demos/data-ajax/ajax/data-ajax-template-fr.html"
"!dist/unmin/demos/data-ajax/ajax/data-ajax-template-en.html"
]

lightbox:
Expand Down Expand Up @@ -1006,6 +957,7 @@ module.exports = (grunt) ->
"The “contentinfo” role is unnecessary for element “footer”."
"The “navigation” role is unnecessary for element “nav”."
"The “banner” role is unnecessary for element “header”."
"Attribute “href” without an explicit value seen. The attribute may be dropped by IE7."
]
src: [
"dist/unmin/**/*.html"
Expand All @@ -1026,7 +978,6 @@ module.exports = (grunt) ->
stoponwarning: true
showallerrors: true
relaxerror: [
# We recommend handling this through the server headers so it never appears in the markup
"W002" # `<head>` is missing X-UA-Compatible `<meta>` tag that disables old IE compatibility modes
"W005" # Unable to locate jQuery, which is required for Bootstrap's JavaScript plugins to work; however, you might not be using Bootstrap's JavaScript
# Opinionated exclusions
Expand All @@ -1048,14 +999,6 @@ module.exports = (grunt) ->
"!dist/**/ajax/*.html"
]

cssmin_ie8_clean:
min:
expand: true
src: [
"<%= coreDist %>/**/ie8*.min.css"
"<%= themeDist %>/**/ie8*.min.css"
]

# Remove modernizr temp
# modernizr:
# dist:
Expand Down Expand Up @@ -1119,7 +1062,6 @@ module.exports = (grunt) ->
"mocha/mocha.css"
"expect.js/index.js"
"sinon/pkg/sinon.js"
"sinon/pkg/sinon-ie.js"
]
dest: "dist/unmin/test"
expand: true
Expand Down Expand Up @@ -1176,11 +1118,6 @@ module.exports = (grunt) ->
src: "*.*"
dest: "<%= coreDist %>/js/jquery/<%= jqueryVersion %>"
expand: true
,
cwd: "lib/jquery-oldIE/dist"
src: "*.*"
dest: "<%= coreDist %>/js/jquery/<%= jqueryOldIEVersion %>"
expand: true
,
cwd: "src"
src: [
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
### Interoperability

* [HTML5](https://www.w3.org/TR/html5/)-first approach (leveraging native HTML5 support and filling support gaps with “polyfills”)
* Supporting a wide variety of browsers (IE, Firefox, Chrome, Safari, Opera)
* Supporting a wide variety of browsers (Edge, Firefox, Chrome, Safari, Opera)
* Building support for HTML data ([RDFa 1.1 Lite](https://www.w3.org/TR/rdfa-lite/), [Schema.org](https://www.schema.org/))

### Mobile friendly responsive design
Expand Down Expand Up @@ -157,7 +157,7 @@ The Canada wordmark and related graphics associated with this distribution are p
### Interopérabilité

* Approche centrée sur le [HTML5](https://www.w3.org/TR/html5/) (s'appuyant sur le soutien HTML5 natif et puis les &laquo;correctifs&raquo; pour résoudre les problèmes de soutien)
* Soutien pour plusieurs navigateurs (IE, Firefox, Chrome, Safari, Opera)
* Soutien pour plusieurs navigateurs (Edge, Firefox, Chrome, Safari, Opera)
* Soutien en développement pour les données HTML ([RDFa 1.1 Lite](https://www.w3.org/TR/rdfa-lite/), [Schema.org](https://www.schema.org/))

### Conception optimisée pour les appareils mobiles et réactive
Expand Down
Loading

0 comments on commit f6fbb34

Please sign in to comment.