Skip to content

Commit fc69ee5

Browse files
anomiexmatticbot
authored andcommitted
Clean up boilerplate .gitattributes (#48802)
Add a lot of generic tooling `production-excludes` entries to the monorepo root `.gitattributes`, and remove them from project `.gitattributes`. Also, have the mirror build always generate a `.gitattributes` that sets `export-ignore` for `.git*` files, and additionally strip the setting of any `production-include` and `production-exclude` attributes in the mirror copy. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/25877340776 Upstream-Ref: Automattic/jetpack@bf1983d
1 parent 36a93f6 commit fc69ee5

3 files changed

Lines changed: 16 additions & 188 deletions

File tree

.gitattributes

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,2 @@
1-
# Files not needed to be distributed in the package.
2-
.gitattributes export-ignore
3-
.github/ export-ignore
4-
package.json export-ignore
5-
6-
# Files to include in the mirror repo, but excluded via gitignore
7-
# Remember to end all directories with `/**` to properly tag every file.
8-
# /src/js/example.min.js production-include
9-
/src/**/*.min.css production-include
10-
/src/**/*.rtl.css production-include
11-
dist/** production-include
12-
build/** production-include
13-
14-
# Files to exclude from the mirror repo, but included in the monorepo.
15-
# Remember to end all directories with `/**` to properly tag every file.
16-
.gitignore production-exclude
17-
babel.config* production-exclude
18-
changelog/** production-exclude
19-
.phpcs.dir.xml production-exclude
20-
tests/** production-exclude
21-
tools/** production-exclude
22-
.phpcsignore production-exclude
23-
/src/dashboard/**/*.js production-exclude
24-
/src/dashboard/**/*.scss production-exclude
25-
/src/blocks/**/*.js production-exclude
26-
/src/blocks/**/*.scss production-exclude
27-
tsconfig.json production-exclude
28-
declarations.d.ts production-exclude
29-
global.d.ts production-exclude
30-
blueprints/** production-exclude
1+
# Automatically generated rules.
2+
/.git* export-ignore

composer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55
"license": "GPL-2.0-or-later",
66
"require": {
77
"php": ">=7.2",
8-
"automattic/jetpack-blocks": "^3.3.1",
9-
"automattic/jetpack-assets": "^4.3.36",
10-
"automattic/jetpack-wp-build-polyfills": "^0.1.8",
11-
"automattic/jetpack-connection": "^8.3.5",
12-
"automattic/jetpack-device-detection": "^3.4.1",
8+
"automattic/jetpack-blocks": "^3.3.2-alpha",
9+
"automattic/jetpack-assets": "^4.3.37-alpha",
10+
"automattic/jetpack-wp-build-polyfills": "^0.1.9-alpha",
11+
"automattic/jetpack-connection": "^8.3.6-alpha",
12+
"automattic/jetpack-device-detection": "^3.4.2-alpha",
1313
"automattic/jetpack-external-connections": "^0.1.28-alpha",
14-
"automattic/jetpack-jwt": "^0.2.3",
15-
"automattic/jetpack-logo": "^3.0.6",
16-
"automattic/jetpack-plans": "^0.11.5",
17-
"automattic/jetpack-status": "^6.1.3",
18-
"automattic/jetpack-sync": "^4.38.1",
19-
"automattic/jetpack-admin-ui": "^0.8.4",
20-
"automattic/jetpack-wp-abilities": "^0.1.0"
14+
"automattic/jetpack-jwt": "^0.2.4-alpha",
15+
"automattic/jetpack-logo": "^3.0.7-alpha",
16+
"automattic/jetpack-plans": "^0.11.6-alpha",
17+
"automattic/jetpack-status": "^6.1.4-alpha",
18+
"automattic/jetpack-sync": "^4.38.2-alpha",
19+
"automattic/jetpack-admin-ui": "^0.8.5-alpha",
20+
"automattic/jetpack-wp-abilities": "^0.1.1-alpha"
2121
},
2222
"require-dev": {
2323
"yoast/phpunit-polyfills": "^4.0.0",
24-
"automattic/jetpack-connection": "^8.3.5",
24+
"automattic/jetpack-connection": "^8.3.6-alpha",
2525
"automattic/jetpack-test-environment": "@dev",
26-
"automattic/phpunit-select-config": "^1.0.5",
26+
"automattic/phpunit-select-config": "^1.0.6-alpha",
2727
"automattic/wp-feature-api": "@dev"
2828
},
2929
"suggest": {

package.json

Lines changed: 0 additions & 144 deletions
This file was deleted.

0 commit comments

Comments
 (0)