Skip to content

Commit c8a88dd

Browse files
beefchimibeefchimi
authored
Merge branch 'master' into fix/add-over-container-property
2 parents 3b50536 + 8f8d607 commit c8a88dd

Some content is hidden

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

62 files changed

+6778
-4424
lines changed

‎examples/.babelrc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"presets": [
3-
["shopify/web", {
4-
"shopify/web": {
5-
"modules": false
3+
[
4+
"babel-preset-shopify/web",
5+
{
6+
"babel-preset-shopify/web": {
7+
"modules": false,
8+
"useBuiltIns": "entry"
9+
}
610
}
7-
}]
11+
]
812
]
913
}

‎examples/.editorconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_size = 2
7+
indent_style = space
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
# Markdown syntax specifies that trailing whitespaces can be meaningful,
12+
# so let’s not trim those. e.g. 2 trailing spaces = linebreak (<br />)
13+
# See https://daringfireball.net/projects/markdown/syntax#p
14+
[*.md]
15+
trim_trailing_whitespace = false
16+
17+
# Disable trailing whitespace removal in diff files,
18+
# where whitespace is meaningful
19+
[*.diff]
20+
trim_trailing_whitespace = false

‎examples/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
node_modules
2+
packages
23
dist
34
scrap
45
src/scripts/vendor

‎examples/.eslintrc.js

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
1+
/* eslint-env node */
12
module.exports = {
2-
extends: [
3-
'plugin:shopify/esnext',
4-
'plugin:shopify/prettier',
5-
],
3+
extends: ['plugin:shopify/esnext', 'plugin:shopify/webpack', 'plugin:shopify/prettier'],
64
globals: {},
75
rules: {
8-
'line-comment-position': 0,
6+
'shopify/jsx-no-complex-expressions': 'off',
7+
'eslint-comments/no-unlimited-disable': 0,
8+
// 'import/no-default-export': ['error'],
9+
'lines-around-comment': [
10+
'error',
11+
{
12+
beforeBlockComment: false,
13+
allowBlockStart: false,
14+
},
15+
],
916
'no-console': 0,
17+
'no-negated-condition': 'off',
18+
// We are intentionally keeping `TODO` comments until a stable release
19+
'no-warning-comments': 'off',
20+
'import/no-cycle': 'off',
21+
// TODO: Disabling for now, but we will want to re-enable in the future.
22+
'import/no-default-export': 'off',
1023
},
1124
env: {
1225
browser: true,
1326
},
27+
// Required, else eslint will look at the parent config
28+
root: true,
1429
};

‎examples/.gitignore

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,50 @@
1-
# Ignore OS Specific files
1+
# OS files
22
.DS_Store
33

4-
# Ignore the SASS cache
4+
# Caches
5+
.cache
6+
.eslintcache
57
.sass-cache
8+
.npm
9+
*.tsbuildinfo
610

7-
# Logs
8-
logs
9-
*.log
10-
11-
# Ignore dev
11+
# Dev
1212
.dev
1313

14-
# Ignore secrets.json
15-
secrets.json
14+
# Environment
15+
.env
16+
.env.test
1617

17-
# Ignore scrap and distribution folders
18-
scrap
18+
# Build
1919
dist
20+
scrap
21+
packages
2022

21-
# Ignore generated reports and manifests
23+
# Secrets
24+
secrets.json
25+
26+
# Reports
2227
assets-manifest.json
2328
bundle-report.html
2429

25-
# Dependency directory
30+
# Node/yarn
2631
node_modules
27-
packages
32+
.yarn-integrity
33+
34+
# Coverage
35+
coverage
36+
lib-cov
37+
*.lcov
38+
39+
# Logs
40+
logs
41+
*.log
42+
npm-debug.log*
43+
yarn-debug.log*
44+
yarn-error.log*
45+
46+
# Runtime data
47+
pids
48+
*.pid
49+
*.seed
50+
*.pid.lock

‎examples/.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v10.4.0
1+
v12.16.0

‎examples/.prettierignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
node_modules
2+
packages
3+
/.github
4+
/assets-manifest.json
5+
/bundle-report.html
6+
/dist
7+
/package.json

‎examples/.prettierrc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2-
"printWidth": 120,
3-
"singleQuote": true
2+
"arrowParens": "always",
3+
"bracketSpacing": false,
4+
"printWidth": 100,
5+
"singleQuote": true,
6+
"trailingComma": "all"
47
}

‎examples/.stylelintignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
node_modules
2+
packages
3+
/.github
4+
/assets-manifest.json
5+
/bundle-report.html
6+
/dist
7+
/package.json

‎examples/.stylelintrc

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,30 @@
33
"stylelint-config-shopify/prettier"
44
],
55
"rules": {
6+
"shopify/content-no-strings": true,
7+
"scss/at-if-no-null": null,
8+
"scss/partial-no-import": null,
69
"color-no-hex": null,
710
"comment-empty-line-before": null,
811
"scss/double-slash-comment-empty-line-before": null,
12+
"declaration-block-no-redundant-longhand-properties": [
13+
true,
14+
{
15+
ignoreShorthands: ["/^grid.*/"],
16+
},
17+
],
918
"declaration-property-value-blacklist": null,
1019
"font-weight-notation": null,
1120
"function-url-scheme-whitelist": null,
12-
"max-nesting-depth": 4,
13-
"no-duplicate-selectors": null,
1421
"no-unknown-animations": null,
1522
"selector-class-pattern": null,
1623
"selector-id-pattern": null,
17-
"selector-max-class": 5,
24+
"selector-max-class": 4,
1825
"selector-max-id": 1,
1926
"selector-max-type": 2,
2027
"selector-max-combinators": 3,
2128
"selector-max-compound-selectors": 4,
2229
"selector-max-specificity": "1,5,1",
23-
"selector-no-qualifying-type": null,
24-
"scss/partial-no-import": null
30+
"selector-no-qualifying-type": null
2531
}
2632
}

0 commit comments

Comments
 (0)