diff --git a/package-lock.json b/package-lock.json
index 9e25b416d8..6beceaaea7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@rollup/plugin-commonjs": "^22.0.0",
         "@rollup/plugin-inject": "^5.0.2",
-        "@rollup/plugin-node-resolve": "^13.2.1",
+        "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-replace": "^5.0.2",
         "@rollup/plugin-virtual": "^2.1.0",
         "@types/chai": "^4.3.1",
@@ -4183,30 +4183,50 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "13.3.0",
+      "version": "15.2.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
+      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@rollup/pluginutils": "^3.1.0",
-        "@types/resolve": "1.17.1",
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
         "deepmerge": "^4.2.2",
-        "is-builtin-module": "^3.1.0",
+        "is-builtin-module": "^3.2.1",
         "is-module": "^1.0.0",
-        "resolve": "^1.19.0"
+        "resolve": "^1.22.1"
       },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^2.42.0"
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@rollup/plugin-node-resolve/node_modules/@types/resolve": {
-      "version": "1.17.1",
+    "node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
+      "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
       }
     },
     "node_modules/@rollup/plugin-replace": {
@@ -5976,51 +5996,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/@web/dev-server-rollup/node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.2.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@rollup/pluginutils": "^5.0.1",
-        "@types/resolve": "1.20.2",
-        "deepmerge": "^4.2.2",
-        "is-builtin-module": "^3.2.1",
-        "is-module": "^1.0.0",
-        "resolve": "^1.22.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^2.78.0||^3.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@web/dev-server-rollup/node_modules/@rollup/pluginutils": {
-      "version": "5.0.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-walker": "^2.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@web/dev-server-rollup/node_modules/@web/dev-server-core": {
       "version": "0.5.2",
       "dev": true,
@@ -6126,6 +6101,35 @@
         "node": ">=12"
       }
     },
+    "node_modules/@web/dev-server/node_modules/@rollup/plugin-node-resolve": {
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz",
+      "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.1.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.42.0"
+      }
+    },
+    "node_modules/@web/dev-server/node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@web/dev-server/node_modules/@web/dev-server-rollup": {
       "version": "0.3.21",
       "dev": true,
@@ -27693,6 +27697,35 @@
         "rollup-plugin-terser": "^7.0.2"
       }
     },
+    "packages/lit-starter-js/node_modules/@rollup/plugin-node-resolve": {
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz",
+      "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.1.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.42.0"
+      }
+    },
+    "packages/lit-starter-js/node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "packages/lit-starter-ts": {
       "name": "@lit/lit-starter-ts",
       "version": "2.0.0",
@@ -27724,6 +27757,35 @@
         "typescript": "~5.2.0"
       }
     },
+    "packages/lit-starter-ts/node_modules/@rollup/plugin-node-resolve": {
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz",
+      "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.1.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.42.0"
+      }
+    },
+    "packages/lit-starter-ts/node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "packages/lit-starter-ts/node_modules/@types/semver": {
       "version": "7.5.0",
       "dev": true,
@@ -28090,6 +28152,35 @@
         "typescript": "~5.2.0"
       }
     },
+    "packages/localize/node_modules/@rollup/plugin-node-resolve": {
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz",
+      "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.1.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.42.0"
+      }
+    },
+    "packages/localize/node_modules/@types/resolve": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "packages/react": {
       "name": "@lit/react",
       "version": "1.0.2",
diff --git a/package.json b/package.json
index b8a0eaefa7..bbe5c88e65 100644
--- a/package.json
+++ b/package.json
@@ -252,7 +252,7 @@
     "@esm-bundle/chai": "^4.3.4-fix.0",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-inject": "^5.0.2",
-    "@rollup/plugin-node-resolve": "^13.2.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-virtual": "^2.1.0",
     "@types/chai": "^4.3.1",
diff --git a/packages/lit-element/package.json b/packages/lit-element/package.json
index bc9267c59b..e2c69d220f 100644
--- a/packages/lit-element/package.json
+++ b/packages/lit-element/package.json
@@ -28,50 +28,10 @@
       "development": "./development/decorators.js",
       "default": "./decorators.js"
     },
-    "./decorators/custom-element.js": {
-      "types": "./development/decorators/custom-element.d.ts",
-      "development": "./development/decorators/custom-element.js",
-      "default": "./decorators/custom-element.js"
-    },
-    "./decorators/event-options.js": {
-      "types": "./development/decorators/event-options.d.ts",
-      "development": "./development/decorators/event-options.js",
-      "default": "./decorators/event-options.js"
-    },
-    "./decorators/property.js": {
-      "types": "./development/decorators/property.d.ts",
-      "development": "./development/decorators/property.js",
-      "default": "./decorators/property.js"
-    },
-    "./decorators/query-all.js": {
-      "types": "./development/decorators/query-all.d.ts",
-      "development": "./development/decorators/query-all.js",
-      "default": "./decorators/query-all.js"
-    },
-    "./decorators/query-assigned-elements.js": {
-      "types": "./development/decorators/query-assigned-elements.d.ts",
-      "development": "./development/decorators/query-assigned-elements.js",
-      "default": "./decorators/query-assigned-elements.js"
-    },
-    "./decorators/query-assigned-nodes.js": {
-      "types": "./development/decorators/query-assigned-nodes.d.ts",
-      "development": "./development/decorators/query-assigned-nodes.js",
-      "default": "./decorators/query-assigned-nodes.js"
-    },
-    "./decorators/query-async.js": {
-      "types": "./development/decorators/query-async.d.ts",
-      "development": "./development/decorators/query-async.js",
-      "default": "./decorators/query-async.js"
-    },
-    "./decorators/query.js": {
-      "types": "./development/decorators/query.d.ts",
-      "development": "./development/decorators/query.js",
-      "default": "./decorators/query.js"
-    },
-    "./decorators/state.js": {
-      "types": "./development/decorators/state.d.ts",
-      "development": "./development/decorators/state.js",
-      "default": "./decorators/state.js"
+    "./decorators/*.js": {
+      "types": "./development/decorators/*.d.ts",
+      "development": "./development/decorators/*.js",
+      "default": "./decorators/*.js"
     },
     "./lit-element.js": {
       "types": "./development/lit-element.d.ts",
diff --git a/packages/lit-html/package.json b/packages/lit-html/package.json
index ae8558fc40..6e3418d1aa 100644
--- a/packages/lit-html/package.json
+++ b/packages/lit-html/package.json
@@ -49,185 +49,14 @@
       "development": "./development/directive.js",
       "default": "./directive.js"
     },
-    "./directives/async-append.js": {
-      "types": "./development/directives/async-append.d.ts",
+    "./directives/*.js": {
+      "types": "./development/directives/*.d.ts",
       "node": {
-        "development": "./node/development/directives/async-append.js",
-        "default": "./node/directives/async-append.js"
+        "development": "./node/development/directives/*.js",
+        "default": "./node/directives/*.js"
       },
-      "development": "./development/directives/async-append.js",
-      "default": "./directives/async-append.js"
-    },
-    "./directives/async-replace.js": {
-      "types": "./development/directives/async-replace.d.ts",
-      "node": {
-        "development": "./node/development/directives/async-replace.js",
-        "default": "./node/directives/async-replace.js"
-      },
-      "development": "./development/directives/async-replace.js",
-      "default": "./directives/async-replace.js"
-    },
-    "./directives/cache.js": {
-      "types": "./development/directives/cache.d.ts",
-      "node": {
-        "development": "./node/development/directives/cache.js",
-        "default": "./node/directives/cache.js"
-      },
-      "development": "./development/directives/cache.js",
-      "default": "./directives/cache.js"
-    },
-    "./directives/choose.js": {
-      "types": "./development/directives/choose.d.ts",
-      "node": {
-        "development": "./node/development/directives/choose.js",
-        "default": "./node/directives/choose.js"
-      },
-      "development": "./development/directives/choose.js",
-      "default": "./directives/choose.js"
-    },
-    "./directives/class-map.js": {
-      "types": "./development/directives/class-map.d.ts",
-      "node": {
-        "development": "./node/development/directives/class-map.js",
-        "default": "./node/directives/class-map.js"
-      },
-      "development": "./development/directives/class-map.js",
-      "default": "./directives/class-map.js"
-    },
-    "./directives/guard.js": {
-      "types": "./development/directives/guard.d.ts",
-      "node": {
-        "development": "./node/development/directives/guard.js",
-        "default": "./node/directives/guard.js"
-      },
-      "development": "./development/directives/guard.js",
-      "default": "./directives/guard.js"
-    },
-    "./directives/if-defined.js": {
-      "types": "./development/directives/if-defined.d.ts",
-      "node": {
-        "development": "./node/development/directives/if-defined.js",
-        "default": "./node/directives/if-defined.js"
-      },
-      "development": "./development/directives/if-defined.js",
-      "default": "./directives/if-defined.js"
-    },
-    "./directives/join.js": {
-      "types": "./development/directives/join.d.ts",
-      "node": {
-        "development": "./node/development/directives/join.js",
-        "default": "./node/directives/join.js"
-      },
-      "development": "./development/directives/join.js",
-      "default": "./directives/join.js"
-    },
-    "./directives/keyed.js": {
-      "types": "./development/directives/keyed.d.ts",
-      "node": {
-        "development": "./node/development/directives/keyed.js",
-        "default": "./node/directives/keyed.js"
-      },
-      "development": "./development/directives/keyed.js",
-      "default": "./directives/keyed.js"
-    },
-    "./directives/live.js": {
-      "types": "./development/directives/live.d.ts",
-      "node": {
-        "development": "./node/development/directives/live.js",
-        "default": "./node/directives/live.js"
-      },
-      "development": "./development/directives/live.js",
-      "default": "./directives/live.js"
-    },
-    "./directives/map.js": {
-      "types": "./development/directives/map.d.ts",
-      "node": {
-        "development": "./node/development/directives/map.js",
-        "default": "./node/directives/map.js"
-      },
-      "development": "./development/directives/map.js",
-      "default": "./directives/map.js"
-    },
-    "./directives/range.js": {
-      "types": "./development/directives/range.d.ts",
-      "node": {
-        "development": "./node/development/directives/range.js",
-        "default": "./node/directives/range.js"
-      },
-      "development": "./development/directives/range.js",
-      "default": "./directives/range.js"
-    },
-    "./directives/ref.js": {
-      "types": "./development/directives/ref.d.ts",
-      "node": {
-        "development": "./node/development/directives/ref.js",
-        "default": "./node/directives/ref.js"
-      },
-      "development": "./development/directives/ref.js",
-      "default": "./directives/ref.js"
-    },
-    "./directives/repeat.js": {
-      "types": "./development/directives/repeat.d.ts",
-      "node": {
-        "development": "./node/development/directives/repeat.js",
-        "default": "./node/directives/repeat.js"
-      },
-      "development": "./development/directives/repeat.js",
-      "default": "./directives/repeat.js"
-    },
-    "./directives/style-map.js": {
-      "types": "./development/directives/style-map.d.ts",
-      "node": {
-        "development": "./node/development/directives/style-map.js",
-        "default": "./node/directives/style-map.js"
-      },
-      "development": "./development/directives/style-map.js",
-      "default": "./directives/style-map.js"
-    },
-    "./directives/template-content.js": {
-      "types": "./development/directives/template-content.d.ts",
-      "node": {
-        "development": "./node/development/directives/template-content.js",
-        "default": "./node/directives/template-content.js"
-      },
-      "development": "./development/directives/template-content.js",
-      "default": "./directives/template-content.js"
-    },
-    "./directives/unsafe-html.js": {
-      "types": "./development/directives/unsafe-html.d.ts",
-      "node": {
-        "development": "./node/development/directives/unsafe-html.js",
-        "default": "./node/directives/unsafe-html.js"
-      },
-      "development": "./development/directives/unsafe-html.js",
-      "default": "./directives/unsafe-html.js"
-    },
-    "./directives/unsafe-svg.js": {
-      "types": "./development/directives/unsafe-svg.d.ts",
-      "node": {
-        "development": "./node/development/directives/unsafe-svg.js",
-        "default": "./node/directives/unsafe-svg.js"
-      },
-      "development": "./development/directives/unsafe-svg.js",
-      "default": "./directives/unsafe-svg.js"
-    },
-    "./directives/until.js": {
-      "types": "./development/directives/until.d.ts",
-      "node": {
-        "development": "./node/development/directives/until.js",
-        "default": "./node/directives/until.js"
-      },
-      "development": "./development/directives/until.js",
-      "default": "./directives/until.js"
-    },
-    "./directives/when.js": {
-      "types": "./development/directives/when.d.ts",
-      "node": {
-        "development": "./node/development/directives/when.js",
-        "default": "./node/directives/when.js"
-      },
-      "development": "./development/directives/when.js",
-      "default": "./directives/when.js"
+      "development": "./development/directives/*.js",
+      "default": "./directives/*.js"
     },
     "./polyfill-support.js": {
       "types": "./development/polyfill-support.d.ts",
diff --git a/packages/lit/package.json b/packages/lit/package.json
index 519d7d0ef1..5cf35dfbeb 100644
--- a/packages/lit/package.json
+++ b/packages/lit/package.json
@@ -29,41 +29,9 @@
       "types": "./development/decorators.d.ts",
       "default": "./decorators.js"
     },
-    "./decorators/custom-element.js": {
-      "types": "./development/decorators/custom-element.d.ts",
-      "default": "./decorators/custom-element.js"
-    },
-    "./decorators/event-options.js": {
-      "types": "./development/decorators/event-options.d.ts",
-      "default": "./decorators/event-options.js"
-    },
-    "./decorators/property.js": {
-      "types": "./development/decorators/property.d.ts",
-      "default": "./decorators/property.js"
-    },
-    "./decorators/query-all.js": {
-      "types": "./development/decorators/query-all.d.ts",
-      "default": "./decorators/query-all.js"
-    },
-    "./decorators/query-assigned-elements.js": {
-      "types": "./development/decorators/query-assigned-elements.d.ts",
-      "default": "./decorators/query-assigned-elements.js"
-    },
-    "./decorators/query-assigned-nodes.js": {
-      "types": "./development/decorators/query-assigned-nodes.d.ts",
-      "default": "./decorators/query-assigned-nodes.js"
-    },
-    "./decorators/query-async.js": {
-      "types": "./development/decorators/query-async.d.ts",
-      "default": "./decorators/query-async.js"
-    },
-    "./decorators/query.js": {
-      "types": "./development/decorators/query.d.ts",
-      "default": "./decorators/query.js"
-    },
-    "./decorators/state.js": {
-      "types": "./development/decorators/state.d.ts",
-      "default": "./decorators/state.js"
+    "./decorators/*.js": {
+      "types": "./development/decorators/*.d.ts",
+      "default": "./decorators/*.js"
     },
     "./directive-helpers.js": {
       "types": "./development/directive-helpers.d.ts",
@@ -73,85 +41,9 @@
       "types": "./development/directive.d.ts",
       "default": "./directive.js"
     },
-    "./directives/async-append.js": {
-      "types": "./development/directives/async-append.d.ts",
-      "default": "./directives/async-append.js"
-    },
-    "./directives/async-replace.js": {
-      "types": "./development/directives/async-replace.d.ts",
-      "default": "./directives/async-replace.js"
-    },
-    "./directives/cache.js": {
-      "types": "./development/directives/cache.d.ts",
-      "default": "./directives/cache.js"
-    },
-    "./directives/choose.js": {
-      "types": "./development/directives/choose.d.ts",
-      "default": "./directives/choose.js"
-    },
-    "./directives/class-map.js": {
-      "types": "./development/directives/class-map.d.ts",
-      "default": "./directives/class-map.js"
-    },
-    "./directives/guard.js": {
-      "types": "./development/directives/guard.d.ts",
-      "default": "./directives/guard.js"
-    },
-    "./directives/if-defined.js": {
-      "types": "./development/directives/if-defined.d.ts",
-      "default": "./directives/if-defined.js"
-    },
-    "./directives/join.js": {
-      "types": "./development/directives/join.d.ts",
-      "default": "./directives/join.js"
-    },
-    "./directives/keyed.js": {
-      "types": "./development/directives/keyed.d.ts",
-      "default": "./directives/keyed.js"
-    },
-    "./directives/live.js": {
-      "types": "./development/directives/live.d.ts",
-      "default": "./directives/live.js"
-    },
-    "./directives/map.js": {
-      "types": "./development/directives/map.d.ts",
-      "default": "./directives/map.js"
-    },
-    "./directives/range.js": {
-      "types": "./development/directives/range.d.ts",
-      "default": "./directives/range.js"
-    },
-    "./directives/ref.js": {
-      "types": "./development/directives/ref.d.ts",
-      "default": "./directives/ref.js"
-    },
-    "./directives/repeat.js": {
-      "types": "./development/directives/repeat.d.ts",
-      "default": "./directives/repeat.js"
-    },
-    "./directives/style-map.js": {
-      "types": "./development/directives/style-map.d.ts",
-      "default": "./directives/style-map.js"
-    },
-    "./directives/template-content.js": {
-      "types": "./development/directives/template-content.d.ts",
-      "default": "./directives/template-content.js"
-    },
-    "./directives/unsafe-html.js": {
-      "types": "./development/directives/unsafe-html.d.ts",
-      "default": "./directives/unsafe-html.js"
-    },
-    "./directives/unsafe-svg.js": {
-      "types": "./development/directives/unsafe-svg.d.ts",
-      "default": "./directives/unsafe-svg.js"
-    },
-    "./directives/until.js": {
-      "types": "./development/directives/until.d.ts",
-      "default": "./directives/until.js"
-    },
-    "./directives/when.js": {
-      "types": "./development/directives/when.d.ts",
-      "default": "./directives/when.js"
+    "./directives/*.js": {
+      "types": "./development/directives/*.d.ts",
+      "default": "./directives/*.js"
     },
     "./html.js": {
       "types": "./development/html.d.ts",
diff --git a/packages/reactive-element/package.json b/packages/reactive-element/package.json
index 36ee269138..f19656ea76 100644
--- a/packages/reactive-element/package.json
+++ b/packages/reactive-element/package.json
@@ -44,95 +44,14 @@
       "development": "./development/decorators.js",
       "default": "./decorators.js"
     },
-    "./decorators/base.js": {
-      "types": "./development/decorators/base.d.ts",
+    "./decorators/*.js": {
+      "types": "./development/decorators/*.d.ts",
       "node": {
-        "development": "./node/development/decorators/base.js",
-        "default": "./node/decorators/base.js"
+        "development": "./node/development/decorators/*.js",
+        "default": "./node/decorators/*.js"
       },
-      "development": "./development/decorators/base.js",
-      "default": "./decorators/base.js"
-    },
-    "./decorators/custom-element.js": {
-      "types": "./development/decorators/custom-element.d.ts",
-      "node": {
-        "development": "./node/development/decorators/custom-element.js",
-        "default": "./node/decorators/custom-element.js"
-      },
-      "development": "./development/decorators/custom-element.js",
-      "default": "./decorators/custom-element.js"
-    },
-    "./decorators/event-options.js": {
-      "types": "./development/decorators/event-options.d.ts",
-      "node": {
-        "development": "./node/development/decorators/event-options.js",
-        "default": "./node/decorators/event-options.js"
-      },
-      "development": "./development/decorators/event-options.js",
-      "default": "./decorators/event-options.js"
-    },
-    "./decorators/property.js": {
-      "types": "./development/decorators/property.d.ts",
-      "node": {
-        "development": "./node/development/decorators/property.js",
-        "default": "./node/decorators/property.js"
-      },
-      "development": "./development/decorators/property.js",
-      "default": "./decorators/property.js"
-    },
-    "./decorators/query-all.js": {
-      "types": "./development/decorators/query-all.d.ts",
-      "node": {
-        "development": "./node/development/decorators/query-all.js",
-        "default": "./node/decorators/query-all.js"
-      },
-      "development": "./development/decorators/query-all.js",
-      "default": "./decorators/query-all.js"
-    },
-    "./decorators/query-assigned-elements.js": {
-      "types": "./development/decorators/query-assigned-elements.d.ts",
-      "node": {
-        "development": "./node/development/decorators/query-assigned-elements.js",
-        "default": "./node/decorators/query-assigned-elements.js"
-      },
-      "development": "./development/decorators/query-assigned-elements.js",
-      "default": "./decorators/query-assigned-elements.js"
-    },
-    "./decorators/query-assigned-nodes.js": {
-      "types": "./development/decorators/query-assigned-nodes.d.ts",
-      "node": {
-        "development": "./node/development/decorators/query-assigned-nodes.js",
-        "default": "./node/decorators/query-assigned-nodes.js"
-      },
-      "development": "./development/decorators/query-assigned-nodes.js",
-      "default": "./decorators/query-assigned-nodes.js"
-    },
-    "./decorators/query-async.js": {
-      "types": "./development/decorators/query-async.d.ts",
-      "node": {
-        "development": "./node/development/decorators/query-async.js",
-        "default": "./node/decorators/query-async.js"
-      },
-      "development": "./development/decorators/query-async.js",
-      "default": "./decorators/query-async.js"
-    },
-    "./decorators/query.js": {
-      "types": "./development/decorators/query.d.ts",
-      "node": {
-        "development": "./node/development/decorators/query.js",
-        "default": "./node/decorators/query.js"
-      },
-      "development": "./development/decorators/query.js",
-      "default": "./decorators/query.js"
-    },
-    "./decorators/state.js": {
-      "types": "./development/decorators/state.d.ts",
-      "node": {
-        "development": "./node/development/decorators/state.js",
-        "default": "./node/decorators/state.js"
-      },
-      "development": "./development/decorators/state.js",
-      "default": "./decorators/state.js"
+      "development": "./development/decorators/*.js",
+      "default": "./decorators/*.js"
     },
     "./polyfill-support.js": {
       "types": "./development/polyfill-support.d.ts",