From 90cad8c945cf7e0fb9ec9a45e1b797e38907abaf Mon Sep 17 00:00:00 2001 From: Paul Sealock Date: Thu, 8 Oct 2020 07:40:21 +1300 Subject: [PATCH] update starter pack (https://github.com/woocommerce/woocommerce-admin/pull/5254) --- .../bin/starter-pack/._eslintrc | 3 ++ .../bin/starter-pack/_main.php | 4 +- .../bin/starter-pack/_package.json | 47 ++++++++++--------- .../bin/starter-pack/_webpack.config.js | 29 ++---------- .../bin/starter-pack/starter-pack.js | 1 + 5 files changed, 35 insertions(+), 49 deletions(-) create mode 100644 plugins/woocommerce-admin/bin/starter-pack/._eslintrc diff --git a/plugins/woocommerce-admin/bin/starter-pack/._eslintrc b/plugins/woocommerce-admin/bin/starter-pack/._eslintrc new file mode 100644 index 00000000000..d66099e534c --- /dev/null +++ b/plugins/woocommerce-admin/bin/starter-pack/._eslintrc @@ -0,0 +1,3 @@ +{ + "extends": [ "plugin:@woocommerce/eslint-plugin/recommended" ] +} diff --git a/plugins/woocommerce-admin/bin/starter-pack/_main.php b/plugins/woocommerce-admin/bin/starter-pack/_main.php index 0cce7b828e9..3d7dc9586b2 100644 --- a/plugins/woocommerce-admin/bin/starter-pack/_main.php +++ b/plugins/woocommerce-admin/bin/starter-pack/_main.php @@ -31,10 +31,10 @@ function add_extension_register_script() { wp_register_style( '{{extension_slug}}', - plugins_url( '/build/style.css', __FILE__ ), + plugins_url( '/build/index.css', __FILE__ ), // Add any dependencies styles may have, such as wp-components. array(), - filemtime( dirname( __FILE__ ) . '/build/style.css' ) + filemtime( dirname( __FILE__ ) . '/build/index.css' ) ); wp_enqueue_script( '{{extension_slug}}' ); diff --git a/plugins/woocommerce-admin/bin/starter-pack/_package.json b/plugins/woocommerce-admin/bin/starter-pack/_package.json index 0b18d33f705..4e4027b9585 100644 --- a/plugins/woocommerce-admin/bin/starter-pack/_package.json +++ b/plugins/woocommerce-admin/bin/starter-pack/_package.json @@ -1,25 +1,26 @@ { - "name": "{{extension_slug}}", - "title": "{{extension_name}}", - "license": "GPL-3.0-or-later", - "version": "0.1.0", - "description": "{{extension_name}}", - "scripts": { - "build": "wp-scripts build", - "check-engines": "wp-scripts check-engines", - "check-licenses": "wp-scripts check-licenses", - "lint:css": "wp-scripts lint-style", - "lint:js": "wp-scripts lint-js", - "lint:pkg-json": "wp-scripts lint-pkg-json", - "start": "wp-scripts start", - "test:e2e": "wp-scripts test-e2e", - "test:unit": "wp-scripts test-unit-js" - }, - "devDependencies": { - "@wordpress/scripts": "^6.0.0", - "mini-css-extract-plugin": "^0.8.0", - "sass-loader": "7.3.1", - "css-loader": "3.3.0", - "node-sass": "4.13.0" - } + "name": "{{extension_slug}}", + "title": "{{extension_name}}", + "license": "GPL-3.0-or-later", + "version": "0.1.0", + "description": "{{extension_name}}", + "scripts": { + "build": "wp-scripts build", + "check-engines": "wp-scripts check-engines", + "check-licenses": "wp-scripts check-licenses", + "format:js": "wp-scripts format-js", + "lint:css": "wp-scripts lint-style", + "lint:js": "wp-scripts lint-js", + "lint:md:docs": "wp-scripts lint-md-docs", + "lint:md:js": "wp-scripts lint-md-js", + "lint:pkg-json": "wp-scripts lint-pkg-json", + "packages-update": "wp-scripts packages-update", + "start": "wp-scripts start", + "test:e2e": "wp-scripts test-e2e", + "test:unit": "wp-scripts test-unit-js" + }, + "devDependencies": { + "@wordpress/scripts": "^12.2.1", + "@woocommerce/eslint-plugin": "1.0.0-beta.0" + } } diff --git a/plugins/woocommerce-admin/bin/starter-pack/_webpack.config.js b/plugins/woocommerce-admin/bin/starter-pack/_webpack.config.js index 5b25d47f541..36dd92a9429 100644 --- a/plugins/woocommerce-admin/bin/starter-pack/_webpack.config.js +++ b/plugins/woocommerce-admin/bin/starter-pack/_webpack.config.js @@ -1,8 +1,7 @@ -const defaultConfig = require( "@wordpress/scripts/config/webpack.config" ); +const defaultConfig = require( '@wordpress/scripts/config/webpack.config' ); const DependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' ); -const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' ); -const requestToExternal = request => { +const requestToExternal = ( request ) => { const wcDepMap = { '@woocommerce/components': [ 'window', 'wc', 'components' ], '@woocommerce/csv-export': [ 'window', 'wc', 'csvExport' ], @@ -19,7 +18,7 @@ const requestToExternal = request => { } }; -const requestToHandle = request => { +const requestToHandle = ( request ) => { const wcHandleMap = { '@woocommerce/components': 'wc-components', '@woocommerce/csv-export': 'wc-csv', @@ -40,31 +39,13 @@ module.exports = { ...defaultConfig, plugins: [ ...defaultConfig.plugins.filter( - plugin => plugin.constructor.name !== 'DependencyExtractionWebpackPlugin', + ( plugin ) => + plugin.constructor.name !== 'DependencyExtractionWebpackPlugin' ), new DependencyExtractionWebpackPlugin( { injectPolyfill: true, requestToExternal, requestToHandle, } ), - new MiniCssExtractPlugin( { - filename: 'style.css', - } ), ], - module: { - ...defaultConfig.module, - rules: [ - ...defaultConfig.module.rules, - { - test: /\.(sa|sc|c)ss$/, - use: [ - { - loader: MiniCssExtractPlugin.loader, - }, - 'css-loader', - 'sass-loader', - ], - }, - ], - }, }; diff --git a/plugins/woocommerce-admin/bin/starter-pack/starter-pack.js b/plugins/woocommerce-admin/bin/starter-pack/starter-pack.js index 9deb9d0082e..95d55597ff0 100644 --- a/plugins/woocommerce-admin/bin/starter-pack/starter-pack.js +++ b/plugins/woocommerce-admin/bin/starter-pack/starter-pack.js @@ -9,6 +9,7 @@ const files = [ '_webpack.config.js', '_main.php', '_package.json', + '._eslintrc', ]; const maybeThrowError = ( error ) => { if ( error ) throw error;