Merge branch 'release/3.7.0'

craftcms · Jul 13, 2021 · 6948a8a · 6948a8a
2 parents 357c5ab + 47e3955
commit 6948a8a
Show file tree

Hide file tree

Showing 462 changed files with 23,291 additions and 7,474 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,14 +7,15 @@
 /.lando.yml export-ignore
 /.travis.yml export-ignore
 /CHANGELOG.md export-ignore
+/README.md export-ignore
+/SECURITY.md export-ignore
 /codeception.yml export-ignore
 /composer.lock export-ignore
 /crowdin.yml export-ignore
 /gulpfile.js export-ignore
-/package.json export-ignore
 /package-lock.json export-ignore
-/README.md export-ignore
-/SECURITY.md export-ignore
+/package.json export-ignore
+/packages/ export-ignore
 /src/translations/a*/app.php linguist-generated=true
 /src/translations/c*/app.php linguist-generated=true
 /src/translations/d*/app.php linguist-generated=true

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/cms",
   "description": "Craft CMS",
-  "version": "3.6.18",
+  "version": "3.7.0",
   "keywords": [
     "cms",
     "craftcms",

diff --git a/gulpfile.js b/gulpfile.js
@@ -36,8 +36,9 @@ const cpSassGlob = [
 const cpGlobalJsGlob = [
     `${cpGlobalAssetPath}/src/js/Craft.js`,
     `${cpGlobalAssetPath}/src/js/Base*.js`,
+    `${cpGlobalAssetPath}/src/js/Tabs.js`,
     `${cpGlobalAssetPath}/src/js/*.js`,
-    `!(${cpGlobalAssetPath}/src/js/Craft.js|${cpGlobalAssetPath}/src/js/Base*.js)`,
+    `!(${cpGlobalAssetPath}/src/js/Craft.js|${cpGlobalAssetPath}/src/js/Base*.js|${cpGlobalAssetPath}/src/js/Tabs.js)`,
     `!${graphiqlAssetPath}/**/*.js`,
     `!${psAssetPath}/**/*.js`,
     `!${atAssetPath}/**/*.js`

diff --git a/lerna.json b/lerna.json
@@ -0,0 +1,6 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0"
+}
diff --git a/lib/garnishjs/garnish.js b/lib/garnishjs/garnish.js
diff --git a/lib/garnishjs/garnish.js.map b/lib/garnishjs/garnish.js.map
diff --git a/lib/vue/vue.js b/lib/vue/vue.js