Merge branch 'release/1.0.0-beta.3'

studiometa · Oct 27, 2020 · dd8f0de · dd8f0de
2 parents f5dbc8c + c70f3a7
commit dd8f0de
Show file tree

Hide file tree

Showing 64 changed files with 66,968 additions and 7,164 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,12 +1,3 @@
 module.exports = {
-	extends: '@studiometa/eslint-config/prettier-es6',
-	overrides: [
-		{
-			files: ['gulpfile.js', 'webpack.config.js'],
-			rules: {
-				'global-require': 'off',
-				'import/no-extraneous-dependencies': 'off',
-			},
-		},
-	]
-};
+  extends: '@studiometa/eslint-config',
+};
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,7 @@
 *.sublime-projet
 *.sublime-workspace
 *.log
-node_modules/
+node_modules/
+
+# Template files
+template/package-lock.json
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1 +1,5 @@
-module.exports = require('@studiometa/prettier-config');
+module.exports = {
+  ...require('@studiometa/prettier-config'),
+  twigPrintWidth: 100,
+  twigAlwaysBreakObjects: false,
+};