Merge branch 'develop' into remove/unnecessary-mixins

bacoords · Apr 11, 2024 · 0340f77 · 0340f77
2 parents 2a1e9f1 + 6b2ebdf
commit 0340f77
Show file tree

Hide file tree

Showing 153 changed files with 1,121 additions and 2,985 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,17 +23,17 @@ jobs:
       uses: thedoctor0/[email protected]
       with:
         type: 'zip'
-        filename: 'tangent.zip'
+        filename: 'block-theme.zip'
         exclusions: '*.git* /*node_modules/*'
 
     - name: Upload release artifact
       uses: actions/upload-artifact@v3
       with:
         name: release
-        path: tangent.zip
+        path: block-theme.zip
 
     - name: Upload Release
       uses: ncipollo/[email protected]
       with:
-        artifacts: "tangent.zip"
+        artifacts: "block-theme.zip"
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/wpcs.yml b/.github/workflows/wpcs.yml
@@ -10,3 +10,6 @@ jobs:
         - uses: actions/checkout@v3
         - name: WPCS check
           uses: 10up/wpcs-action@stable
+          with:
+            standard: 'WordPress'
+            use_local_config: 'true'
diff --git a/404.php b/404.php
diff --git a/archive.php b/archive.php
diff --git a/bin/jsonc-to-scss.js b/bin/jsonc-to-scss.js
diff --git a/bin/theme-json.js b/bin/theme-json.js
diff --git a/bin/webpack.config.js b/bin/webpack.config.js
@@ -27,45 +27,6 @@ var config = {
 			outputFolder: styleOutputFolder,
 			blockDir: true,
 		}),
-		"../src/scss/utils/breakpoints": path.resolve(
-			process.cwd(),
-			"src/theme-json/settings/custom",
-			"breakpoints.jsonc",
-		),
-		"../theme.json": path.resolve(
-			process.cwd(),
-			"src/theme-json",
-			"index.jsonc",
-		),
-	},
-	module: {
-		...defaultConfig.module,
-		rules: [
-			...defaultConfig.module.rules,
-			{
-				test: /\.jsonc$/,
-				exclude: /theme-json\/index\.jsonc$/,
-				type: "asset/resource",
-				generator: {
-					filename: "../src/scss/utils/[name].scss",
-				},
-				use: "jsonc-scss-loader",
-			},
-			{
-				test: /theme-json\/index\.jsonc$/,
-				type: "asset/resource",
-				generator: {
-					filename: "../theme.json",
-				},
-				use: "theme-json-loader",
-			},
-		],
-	},
-	resolveLoader: {
-		alias: {
-			"jsonc-scss-loader": path.resolve(process.cwd(), "bin/jsonc-to-scss.js"),
-			"theme-json-loader": path.resolve(process.cwd(), "bin/theme-json.js"),
-		},
 	},
 	output: {
 		...defaultConfig.output,
@@ -111,15 +72,15 @@ var config = {
 						folder: ".",
 						method: (absoluteItemPath) => {
 							return new RegExp(/(json\.js)(\.map)*$/, "m").test(
-								absoluteItemPath,
+								absoluteItemPath
 							);
 						},
 					},
 					{
 						folder: ".",
 						method: (absoluteItemPath) => {
 							return new RegExp(/theme\.json\.asset\.php$/, "m").test(
-								absoluteItemPath,
+								absoluteItemPath
 							);
 						},
 					},