Merge pull request #68 from 10up/develop

10up-toolkit@1.0.6
10up · May 27, 2021 · f7febcd · f7febcd
2 parents 227bf0e + f3069b0
commit f7febcd
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 76 deletions.
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
 
+## 1.0.6
+- Fixed: webpack externals definitions [#67](https://github.com/10up/10up-toolkit/pull/67)
+
 ## 1.0.5
 - Fixed: Regex in asset/resources. [#63](https://github.com/10up/10up-toolkit/pull/63)
 - Fixed: Babel transpilation for publishing packages `["sourceType": "unambiguous"]`. [#63](https://github.com/10up/10up-toolkit/pull/63)

diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap
@@ -21,26 +21,10 @@ Object {
     },
   },
   "externals": Object {
-    "lodash": Object {
-      "amd": "lodash",
-      "commonjs": "lodash",
-      "commonjs2": "lodash",
-    },
-    "read-pkg": Object {
-      "amd": "read-pkg",
-      "commonjs": "read-pkg",
-      "commonjs2": "read-pkg",
-    },
-    "read-pkg-up": Object {
-      "amd": "read-pkg-up",
-      "commonjs": "read-pkg-up",
-      "commonjs2": "read-pkg-up",
-    },
-    "resolve-bin": Object {
-      "amd": "resolve-bin",
-      "commonjs": "resolve-bin",
-      "commonjs2": "resolve-bin",
-    },
+    "lodash": "commonjs2 lodash",
+    "read-pkg": "commonjs2 read-pkg",
+    "read-pkg-up": "commonjs2 read-pkg-up",
+    "resolve-bin": "commonjs2 resolve-bin",
   },
   "mode": "development",
   "module": Object {
@@ -376,21 +360,9 @@ Object {
     },
   },
   "externals": Object {
-    "read-pkg": Object {
-      "amd": "read-pkg",
-      "commonjs": "read-pkg",
-      "commonjs2": "read-pkg",
-    },
-    "read-pkg-up": Object {
-      "amd": "read-pkg-up",
-      "commonjs": "read-pkg-up",
-      "commonjs2": "read-pkg-up",
-    },
-    "resolve-bin": Object {
-      "amd": "resolve-bin",
-      "commonjs": "resolve-bin",
-      "commonjs2": "resolve-bin",
-    },
+    "read-pkg": "commonjs2 read-pkg",
+    "read-pkg-up": "commonjs2 read-pkg-up",
+    "resolve-bin": "commonjs2 resolve-bin",
   },
   "mode": "development",
   "module": Object {
@@ -576,21 +548,9 @@ Object {
     },
   },
   "externals": Object {
-    "read-pkg": Object {
-      "amd": "read-pkg",
-      "commonjs": "read-pkg",
-      "commonjs2": "read-pkg",
-    },
-    "read-pkg-up": Object {
-      "amd": "read-pkg-up",
-      "commonjs": "read-pkg-up",
-      "commonjs2": "read-pkg-up",
-    },
-    "resolve-bin": Object {
-      "amd": "resolve-bin",
-      "commonjs": "resolve-bin",
-      "commonjs2": "resolve-bin",
-    },
+    "read-pkg": "commonjs2 read-pkg",
+    "read-pkg-up": "commonjs2 read-pkg-up",
+    "resolve-bin": "commonjs2 resolve-bin",
   },
   "mode": "development",
   "module": Object {
@@ -784,26 +744,10 @@ Object {
     },
   },
   "externals": Object {
-    "lodash": Object {
-      "amd": "lodash",
-      "commonjs": "lodash",
-      "commonjs2": "lodash",
-    },
-    "read-pkg": Object {
-      "amd": "read-pkg",
-      "commonjs": "read-pkg",
-      "commonjs2": "read-pkg",
-    },
-    "read-pkg-up": Object {
-      "amd": "read-pkg-up",
-      "commonjs": "read-pkg-up",
-      "commonjs2": "read-pkg-up",
-    },
-    "resolve-bin": Object {
-      "amd": "resolve-bin",
-      "commonjs": "resolve-bin",
-      "commonjs2": "resolve-bin",
-    },
+    "lodash": "commonjs2 lodash",
+    "read-pkg": "commonjs2 read-pkg",
+    "read-pkg-up": "commonjs2 read-pkg-up",
+    "resolve-bin": "commonjs2 resolve-bin",
   },
   "mode": "development",
   "module": Object {

diff --git a/packages/toolkit/config/webpack/externals.js b/packages/toolkit/config/webpack/externals.js
@@ -1,7 +1,12 @@
-module.exports = ({ isPackage, packageConfig: { externals } }) => {
+module.exports = ({ isPackage, packageConfig: { externals, packageType } }) => {
 	if (isPackage) {
 		return externals.reduce((acc, current) => {
-			acc[current] = { commonjs: current, commonjs2: current, amd: current };
+			if (packageType === 'umd') {
+				acc[current] = { commonjs: current, commonjs2: current, amd: current };
+			} else {
+				acc[current] = `commonjs2 ${current}`;
+			}
+
 			return acc;
 		}, {});
 	}

diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/10up/10up-toolkit.git",
     "directory": "packages/toolkit"
   },
-  "version": "1.0.5",
+  "version": "1.0.6",
   "bin": {
     "10up-toolkit": "bin/10up-toolkit.js"
   },

diff --git a/projects/10up-theme/package.json b/projects/10up-theme/package.json
@@ -14,7 +14,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "10up-toolkit": "1.0.5"
+    "10up-toolkit": "1.0.6"
   },
   "dependencies": {
     "normalize.css": "^8.0.1",

diff --git a/projects/library-ts/package.json b/projects/library-ts/package.json
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/10up/component-accordion#readme",
   "devDependencies": {
-    "10up-toolkit": "1.0.5"
+    "10up-toolkit": "1.0.6"
   },
   "10up-toolkit": {
     "libraryName": "TenUpAccordion"

diff --git a/projects/library/package.json b/projects/library/package.json
@@ -27,7 +27,7 @@
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/user-event": "^12.6.3",
     "jest-axe": "^4.1.0",
-    "10up-toolkit": "1.0.5",
+    "10up-toolkit": "1.0.6",
     "concurrently": "^5.3.0"
   },
   "10up-toolkit": {