Do not transpile JS packages twice (#44824)

* Re-introduce calypso:main * Adds missing resolver to jest config * Change composite-checkout's webpack config to support calypso:src * Bundle packages in the monorepo to * Simplify resolver * Delete redundant packagesInMonorepo
Automattic · Nov 3, 2020 · b20ddce · b20ddce
1 parent 503397e
commit b20ddce
Show file tree

Hide file tree

Showing 46 changed files with 110 additions and 27 deletions.
diff --git a/client/webpack.config.desktop.js b/client/webpack.config.desktop.js
@@ -84,6 +84,7 @@ module.exports = {
 	],
 	resolve: {
 		extensions: [ '.json', '.js', '.jsx', '.ts', '.tsx' ],
+		mainFields: [ 'calypso:src', 'module', 'main' ],
 		modules: [ __dirname, 'node_modules' ],
 		alias: {
 			config: 'server/config',

diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -256,6 +256,7 @@ const webpackConfig = {
 	},
 	resolve: {
 		extensions: [ '.json', '.js', '.jsx', '.ts', '.tsx' ],
+		mainFields: [ 'browser', 'calypso:src', 'module', 'main' ],
 		modules: [ __dirname, 'node_modules' ],
 		alias: Object.assign(
 			{

diff --git a/client/webpack.config.node.js b/client/webpack.config.node.js
@@ -59,6 +59,7 @@ function getMonorepoPackages() {
  *
  * @returns {Array} list of externals
  */
+
 function getExternals() {
 	return [
 		// Don't bundle any node_modules, both to avoid a massive bundle, and problems
@@ -144,6 +145,7 @@ const webpackConfig = {
 	},
 	resolve: {
 		extensions: [ '.json', '.js', '.jsx', '.ts', '.tsx' ],
+		mainFields: [ 'calypso:src', 'module', 'main' ],
 		modules: [ __dirname, path.join( __dirname, 'extensions' ), 'node_modules' ],
 		alias: {
 			'calypso/config': 'server/config',

diff --git a/packages/babel-plugin-transform-wpcalypso-async/jest.config.js b/packages/babel-plugin-transform-wpcalypso-async/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/calypso-analytics/jest.config.js b/packages/calypso-analytics/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/calypso-build/webpack.config.js b/packages/calypso-build/webpack.config.js
@@ -132,6 +132,7 @@ function getWebpackConfig(
 		},
 		resolve: {
 			extensions: [ '.json', '.js', '.jsx', '.ts', '.tsx' ],
+			mainFields: [ 'browser', 'calypso:src', 'module', 'main' ],
 			modules: [ 'node_modules' ],
 		},
 		node: false,

diff --git a/packages/calypso-codemods/jest.config.js b/packages/calypso-codemods/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
 	testMatch: [ '<rootDir>/tests/*/codemod.spec.js' ],
 	setupFiles: [ '<rootDir>/setup-tests.js' ],
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/components/jest.config.js b/packages/components/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/composite-checkout/jest.config.js b/packages/composite-checkout/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
 	testEnvironment: 'jsdom',
 	globals: { window: { navigator: { userAgent: 'jest' } } },
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/composite-checkout/webpack.config.demo.js b/packages/composite-checkout/webpack.config.demo.js
@@ -18,7 +18,10 @@ module.exports = {
 			},
 		],
 	},
-	resolve: { extensions: [ '*', '.js', '.jsx' ] },
+	resolve: {
+		extensions: [ '*', '.js', '.jsx' ],
+		mainFields: [ 'browser', 'calypso:src', 'module', 'main' ],
+	},
 	output: {
 		path: path.resolve( __dirname, '/dist/' ),
 		publicPath: '/dist/',

diff --git a/packages/composite-checkout/webpack.config.js b/packages/composite-checkout/webpack.config.js
@@ -27,7 +27,10 @@ module.exports = {
 			},
 		],
 	},
-	resolve: { extensions: [ '*', '.js', '.jsx' ] },
+	resolve: {
+		extensions: [ '*', '.js', '.jsx' ],
+		mainFields: [ 'browser', 'calypso:src', 'module', 'main' ],
+	},
 	output: {
 		path: path.resolve( __dirname, 'dist/' ),
 		publicPath: '/dist/',

diff --git a/packages/data-stores/jest.config.js b/packages/data-stores/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
 	rootDir: __dirname,
 	setupFiles: [ 'regenerator-runtime/runtime' ],
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/domain-picker/jest.config.js b/packages/domain-picker/jest.config.js
@@ -6,4 +6,5 @@ module.exports = {
 	globals: {
 		__i18n_text_domain__: 'default',
 	},
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/effective-module-tree/jest.config.js b/packages/effective-module-tree/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
 	// Node project, no need to transform anything
 	transformIgnorePatterns: [ '<rootDir>/', '/node_modules/' ],
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/eslint-config-wpcalypso/jest.config.js b/packages/eslint-config-wpcalypso/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/eslint-plugin-wpcalypso/jest.config.js b/packages/eslint-plugin-wpcalypso/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/format-currency/jest.config.js b/packages/format-currency/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/format-currency/package.json b/packages/format-currency/package.json
@@ -4,6 +4,7 @@
 	"description": "JavaScript library for formatting currency",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": false,
 	"repository": {
 		"type": "git",
@@ -29,8 +30,8 @@
 	},
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	},
 	"types": "types"
 }
diff --git a/packages/i18n-calypso-cli/jest.config.js b/packages/i18n-calypso-cli/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/i18n-calypso/jest.config.js b/packages/i18n-calypso/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/i18n-calypso/package.json b/packages/i18n-calypso/package.json
@@ -4,6 +4,7 @@
 	"description": "i18n JavaScript library on top of Tannin originally used in Calypso",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"types": "types/index.d.ts",
 	"sideEffects": false,
 	"repository": {
@@ -39,7 +40,7 @@
 	},
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	}
 }
diff --git a/packages/load-script/jest.config.js b/packages/load-script/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/load-script/package.json b/packages/load-script/package.json
@@ -4,6 +4,7 @@
 	"description": "Async Script Loader.",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"keywords": [
 		"wordpress"
 	],
@@ -28,7 +29,7 @@
 	},
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	}
 }
diff --git a/packages/media-library/jest.config.js b/packages/media-library/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/photon/jest.config.js b/packages/photon/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/photon/package.json b/packages/photon/package.json
@@ -4,6 +4,7 @@
 	"description": "JavaScript library for the WordPress.com Photon image manipulation service",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": false,
 	"repository": {
 		"type": "git",
@@ -38,7 +39,7 @@
 	},
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	}
 }
diff --git a/packages/popup-monitor/package.json b/packages/popup-monitor/package.json
@@ -4,6 +4,7 @@
 	"description": "Utility to facilitate the monitoring of a popup window close action.",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": false,
 	"keywords": [
 		"wordpress",
@@ -29,8 +30,8 @@
 	],
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	},
 	"dependencies": {
 		"lodash": "^4.17.15"

diff --git a/packages/request-external-access/jest.config.js b/packages/request-external-access/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/request-external-access/package.json b/packages/request-external-access/package.json
@@ -4,6 +4,7 @@
 	"description": "Utility for requesting authorization of sharing services.",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": false,
 	"keywords": [
 		"wordpress",
@@ -30,8 +31,8 @@
 	],
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	},
 	"dependencies": {
 		"@automattic/popup-monitor": "^1.0.0"

diff --git a/packages/social-previews/jest.config.js b/packages/social-previews/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/social-previews/package.json b/packages/social-previews/package.json
@@ -4,6 +4,7 @@
 	"description": "A suite of components to generate previews for a post for both social and search engines",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": [
 		"*.css",
 		"*.scss"
@@ -34,8 +35,8 @@
 	],
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile && copy-assets"
+		"build": "transpile && copy-assets",
+		"prepack": "yarn run clean && yarn run build"
 	},
 	"dependencies": {
 		"@babel/runtime": "^7.11.1",

diff --git a/packages/tree-select/jest.config.js b/packages/tree-select/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/tree-select/package.json b/packages/tree-select/package.json
@@ -11,6 +11,7 @@
 	"license": "GPL-2.0-or-later",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": false,
 	"repository": {
 		"type": "git",
@@ -29,7 +30,7 @@
 	],
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	}
 }
diff --git a/packages/viewport-react/jest.config.js b/packages/viewport-react/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/viewport-react/package.json b/packages/viewport-react/package.json
@@ -4,6 +4,7 @@
 	"description": "React helpers for tracking viewport changes",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": false,
 	"repository": {
 		"type": "git",
@@ -30,8 +31,8 @@
 	},
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/viewport/jest.config.js b/packages/viewport/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/viewport/package.json b/packages/viewport/package.json
@@ -4,6 +4,7 @@
 	"description": "Vanilla helpers for tracking viewport changes",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
+	"calypso:src": "src/index.js",
 	"sideEffects": false,
 	"repository": {
 		"type": "git",
@@ -18,8 +19,8 @@
 	"homepage": "https://github.com/Automattic/wp-calypso/tree/HEAD/packages/viewport#readme",
 	"scripts": {
 		"clean": "npx rimraf dist",
-		"prepublish": "yarn run clean",
-		"prepare": "transpile"
+		"build": "transpile",
+		"prepack": "yarn run clean && yarn run build"
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/webpack-config-flag-plugin/jest.config.js b/packages/webpack-config-flag-plugin/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/webpack-inline-constant-exports-plugin/jest.config.js b/packages/webpack-inline-constant-exports-plugin/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	preset: '@automattic/calypso-build',
 	rootDir: __dirname,
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };
diff --git a/packages/wp-babel-makepot/jest.config.js b/packages/wp-babel-makepot/jest.config.js
@@ -2,4 +2,5 @@ module.exports = {
 	rootDir: __dirname,
 	testMatch: [ '<rootDir>/**/test/*.[jt]s?(x)', '!**/.eslintrc.*', '!**/examples/**' ],
 	cacheDirectory: '<rootDir>/../../.cache/jest',
+	resolver: '<rootDir>/../../test/module-resolver.js',
 };