Skip to content

Commit

Permalink
Merge pull request #77 from creative-commoners/pulls/2.0/webpack
Browse files Browse the repository at this point in the history
ENHANCEMENT: Convert UI to be managed by webpack.
  • Loading branch information
robbieaverill authored Jan 31, 2018
2 parents de1d770 + c8ce070 commit 2791b5f
Show file tree
Hide file tree
Showing 46 changed files with 5,504 additions and 52 deletions.
7 changes: 6 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# please see the EditorConfig documentation:
# http://editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
Expand All @@ -10,8 +12,11 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{*.yml,package.json}]
[{*.{yml,js,jsx,json,css,scss,eslintrc}}]
indent_size = 2

# The indent size used in the package.json file cannot be changed:
# https://github.com/npm/npm/pull/3180#issuecomment-16336516

[composer.json]
indent_size = 4
8 changes: 8 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Ignore dist files
client/dist/

# Ignore vendor
node_modules/

# Ignore language files (auto-generated)
client/lang/
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('@silverstripe/webpack-config/.eslintrc');
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 2 additions & 0 deletions client/dist/js/main.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions client/dist/js/main.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/dist/styles/error-page.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions client/dist/styles/error-page.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client/dist/styles/share-component.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions client/dist/styles/share-component.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2791b5f

Please sign in to comment.