Chore: Move camelCaseDash to the package where it is consumed (#21736)

WordPress · Apr 20, 2020 · dd9f454 · dd9f454
1 parent 56ae122
commit dd9f454
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 49 deletions.
diff --git a/packages/dependency-extraction-webpack-plugin/test/util.js b/packages/dependency-extraction-webpack-plugin/test/util.js
@@ -2,10 +2,30 @@
  * Internal dependencies
  */
 const {
+	camelCaseDash,
 	defaultRequestToExternal,
 	defaultRequestToHandle,
 } = require( '../util' );
 
+describe( 'camelCaseDash', () => {
+	test( 'does not change a single word', () => {
+		expect( camelCaseDash( 'blocks' ) ).toBe( 'blocks' );
+		expect( camelCaseDash( 'dom' ) ).toBe( 'dom' );
+	} );
+
+	test( 'does not capitalize letters following numbers', () => {
+		expect( camelCaseDash( 'a11y' ) ).toBe( 'a11y' );
+		expect( camelCaseDash( 'i18n' ) ).toBe( 'i18n' );
+	} );
+
+	test( 'converts dashes into camel case', () => {
+		expect( camelCaseDash( 'api-fetch' ) ).toBe( 'apiFetch' );
+		expect( camelCaseDash( 'list-reusable-blocks' ) ).toBe(
+			'listReusableBlocks'
+		);
+	} );
+} );
+
 describe( 'defaultRequestToExternal', () => {
 	test( 'Returns undefined on unrecognized request', () => {
 		expect( defaultRequestToExternal( 'unknown-request' ) ).toBeUndefined();

diff --git a/packages/dependency-extraction-webpack-plugin/util.js b/packages/dependency-extraction-webpack-plugin/util.js
@@ -79,8 +79,6 @@ function defaultRequestToHandle( request ) {
  * converting to uppercase, where Lodash will also capitalize letters
  * following numbers.
  *
- * Temporarily duplicated from @wordpress/scripts/utils.
- *
  * @param {string} string Input dash-delimited string.
  *
  * @return {string} Camel-cased string.
@@ -92,6 +90,7 @@ function camelCaseDash( string ) {
 }
 
 module.exports = {
+	camelCaseDash,
 	defaultRequestToExternal,
 	defaultRequestToHandle,
 };
diff --git a/packages/scripts/utils/index.js b/packages/scripts/utils/index.js
@@ -22,11 +22,9 @@ const {
 } = require( './env' );
 const { fromProjectRoot, fromConfigRoot, hasProjectFile } = require( './file' );
 const { hasPackageProp } = require( './package' );
-const { camelCaseDash } = require( './string' );
 
 module.exports = {
 	buildWordPress,
-	camelCaseDash,
 	fromProjectRoot,
 	fromConfigRoot,
 	getArgFromCLI,

diff --git a/packages/scripts/utils/string.js b/packages/scripts/utils/string.js
diff --git a/packages/scripts/utils/test/string.js b/packages/scripts/utils/test/string.js
diff --git a/webpack.config.js b/webpack.config.js
@@ -13,7 +13,9 @@ const { basename, sep } = require( 'path' );
 const CustomTemplatedPathPlugin = require( '@wordpress/custom-templated-path-webpack-plugin' );
 const LibraryExportDefaultPlugin = require( '@wordpress/library-export-default-webpack-plugin' );
 const DependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
-const { camelCaseDash } = require( '@wordpress/scripts/utils' );
+const {
+	camelCaseDash,
+} = require( '@wordpress/dependency-extraction-webpack-plugin/util' );
 
 /**
  * Internal dependencies