Merge pull request #18 from material-components/feature/543-build

Update build to ignore map files and include unminified files for theme

Author: emeaguiar

Gruntfile.js

@@ -31,7 +31,10 @@ module.exports = function( grunt ) {
 					'!plugin/**/._.DS_Store',
 					'!plugin/**/.DS_Store',
 					'!plugin/assets/css/src/**',
+					'!plugin/assets/css/*.map',
 					'!plugin/assets/js/.gitignore',
+					'!plugin/assets/js/*.css',
+					'!plugin/assets/js/*.map',
 					'!plugin/assets/src/**',
 					'!plugin/assets/images/png/**',
 					'!plugin/assets/images/jpg/**',
@@ -81,6 +84,7 @@ module.exports = function( grunt ) {
 					'!theme/assets/js/.gitignore',
 					'!theme/assets/js/*.php',
 					'!theme/assets/js/*.map',
+					'!theme/assets/js/editor*',
 					'!theme/assets/src/**',
 					'!theme/tests/**',
 					'!theme/wp-assets/**',
@@ -194,6 +198,7 @@ module.exports = function( grunt ) {
 				const iconArray = item.split( /\s/g );
 
 				icons.icons[ iconArray[ 1 ] ] = {
+					id: iconArray[ 1 ],
 					name: iconArray[ 0 ],
 				};
 			} );
@@ -208,7 +213,7 @@ module.exports = function( grunt ) {
 
 	grunt.registerTask( 'readme', [ 'shell:readme' ] );
 
-	grunt.registerTask( 'build', [ 'readme', 'copy', 'icon_mapping' ] );
+	grunt.registerTask( 'build', [ 'readme', 'icon_mapping', 'copy' ] );
 
 	grunt.registerTask( 'create-build-zip', [
 		'shell:create_plugin_zip',

package-lock.json

@@ -25,9 +25,9 @@
   "devDependencies": {
     "@babel/cli": "7.8.4",
     "@babel/core": "7.8.4",
-    "@babel/preset-env": "7.11.5",
     "@babel/plugin-proposal-optional-chaining": "7.8.3",
     "@babel/plugin-transform-react-jsx": "7.8.3",
+    "@babel/preset-env": "7.11.5",
     "@material/button": "5.1.0",
     "@material/card": "5.1.0",
     "@material/checkbox": "5.1.0",
@@ -44,8 +44,8 @@
     "@material/switch": "6.0.0",
     "@material/tab-bar": "5.1.0",
     "@material/textfield": "5.1.0",
-    "@material/top-app-bar": "5.1.0",
     "@material/tooltip": "8.0.0",
+    "@material/top-app-bar": "5.1.0",
     "@material/typography": "5.1.0",
     "@sheerun/mutationobserver-shim": "0.3.3",
     "@testing-library/dom": "7.2.2",
@@ -123,7 +123,7 @@
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "postcss-mixins": "6.2.3",
-    "postcss-nested": "4.2.1",
+    "postcss-nested": "4.2.3",
     "postcss-preset-env": "6.7.0",
     "postcss-simple-vars": "5.0.2",
     "prettier": "npm:[email protected]",
@@ -148,7 +148,7 @@
   "scripts": {
     "build": "npm-run-all build:*",
     "build:prepare": "grunt clean",
-    "build:js": "wp-scripts build",
+    "build:js": "NODE_ENV=dev wp-scripts build && wp-scripts build",
     "build:run": "grunt build",
     "build:zip": "grunt create-build-zip",
     "deploy": "npm run build && grunt deploy",

package.json

@@ -85,10 +85,11 @@ module.exports = {
 			stage: 0,
 			preserve: false, // Omit pre-polyfilled CSS.
 			features: {
-				'nesting-rules': false, // Uses postcss-nesting which doesn't behave like Sass.
+				'nesting-rules': true, // Uses postcss-nesting which doesn't behave like Sass.
 				'custom-properties': {
 					preserve: true, // Do not remove :root selector.
 				},
+				'custom-media-queries': true,
 			},
 			autoprefixer: {
 				grid: true,

plugin/assets/fonts/icons.json

@@ -22,6 +22,12 @@
 	& .mdc-top-app-bar__action-item,
 	& .mdc-top-app-bar__navigation-icon {
 		color: var(--mdc-theme-on-header, var(--mdc-theme-on-primary, #fff));
+
+		&:hover,
+		&:focus,
+		&:visited {
+			color: var(--mdc-theme-on-header, var(--mdc-theme-on-primary, #fff));
+		}
 	}
 
 	& .mdc-top-app-bar__section--align-start {

postcss.config.js

@@ -204,6 +204,7 @@ const getSharedConfig = packageType => {
 				// Remove the CleanWebpackPlugin and FixStyleWebpackPlugin plugins from `@wordpress/scripts` due to version conflicts.
 				...defaultConfig.plugins.filter(
 					plugin =>
+						packageType === 'plugin' &&
 						! [ 'CleanWebpackPlugin', 'FixStyleWebpackPlugin' ].includes(
 							plugin.constructor.name
 						)