Downstreamed changes from @embroider/[email protected] (#122)

* chore: Updated comments to match those from documentation * chore: Replaced Babel plugins with decorator-transforms * chore: Reconfigured TypeScript and Glint * chore: Added changeset --------- Co-authored-by: ijlee2 <[email protected]>
ijlee2 · Dec 20, 2023 · a965de5 · a965de5
1 parent 63f57c8
commit a965de5
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 20 deletions.
diff --git a/.changeset/beige-timers-roll.md b/.changeset/beige-timers-roll.md
@@ -0,0 +1,7 @@
+---
+"embroider-css-modules": patch
+"my-v1-addon": patch
+"my-app": patch
+---
+
+Downstreamed changes from @embroider/addon-blueprint@2.11.0
diff --git a/docs/my-app/ember-cli-build.js b/docs/my-app/ember-cli-build.js
@@ -30,10 +30,6 @@ module.exports = function (defaults) {
             ? '[sha512:hash:base64:5]'
             : '[path][name]__[local]',
           mode: (resourcePath) => {
-            // The host app and active child addons are moved into a shared
-            // temporary directory (`options.workspaceDir`) before css-loader
-            // processes them.
-            //
             // We want to enable the local mode only for our own host app.
             // All other addons should be loaded in the global mode.
             const hostAppLocation =

diff --git a/docs/my-v1-addon/types/dummy/index.d.ts b/docs/my-v1-addon/types/dummy/index.d.ts
@@ -1,4 +1,5 @@
 import '@glint/environment-ember-loose';
+import '@glint/environment-ember-template-imports';
 import 'ember-source/types';
 import 'ember-source/types/preview';
 

diff --git a/packages/embroider-css-modules/babel.config.json b/packages/embroider-css-modules/babel.config.json
@@ -9,15 +9,20 @@
       }
     ],
     "@embroider/addon-dev/template-colocation-plugin",
-    "@babel/plugin-transform-class-static-block",
     [
       "babel-plugin-ember-template-compilation",
       {
         "targetFormat": "hbs",
         "transforms": []
       }
     ],
-    ["@babel/plugin-proposal-decorators", { "version": "legacy" }],
-    "@babel/plugin-transform-class-properties"
+    [
+      "module:decorator-transforms",
+      {
+        "runtime": {
+          "import": "decorator-transforms/runtime"
+        }
+      }
+    ]
   ]
 }
diff --git a/packages/embroider-css-modules/package.json b/packages/embroider-css-modules/package.json
@@ -62,18 +62,17 @@
     "test": "echo 'A v2 addon does not have tests, run tests in tests/embroider-css-modules'"
   },
   "dependencies": {
-    "@embroider/addon-shim": "^1.8.7"
+    "@embroider/addon-shim": "^1.8.7",
+    "decorator-transforms": "^1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.23.6",
-    "@babel/plugin-proposal-decorators": "^7.23.6",
-    "@babel/plugin-transform-class-properties": "^7.23.3",
-    "@babel/plugin-transform-class-static-block": "^7.23.4",
     "@babel/plugin-transform-typescript": "^7.23.6",
     "@babel/runtime": "^7.23.6",
     "@embroider/addon-dev": "^4.1.3",
     "@glint/core": "^1.2.1",
     "@glint/environment-ember-loose": "^1.2.1",
+    "@glint/environment-ember-template-imports": "^1.2.1",
     "@glint/template": "^1.2.1",
     "@rollup/plugin-babel": "^6.0.4",
     "@shared-configs/ember-template-lint": "workspace:*",

diff --git a/packages/embroider-css-modules/tsconfig.json b/packages/embroider-css-modules/tsconfig.json
@@ -4,6 +4,7 @@
     "allowImportingTsExtensions": true,
     "allowJs": true,
     "declarationDir": "declarations",
+    "rootDir": "./src",
     "skipLibCheck": true
   },
   "include": [

diff --git a/packages/embroider-css-modules/unpublished-development-types/index.d.ts b/packages/embroider-css-modules/unpublished-development-types/index.d.ts
@@ -2,6 +2,7 @@
 // These will *not* be published as part of your addon, so be careful that your published code does not rely on them!
 
 import '@glint/environment-ember-loose';
+import '@glint/environment-ember-template-imports';
 
 import type EmbroiderCssModulesRegistry from '../src/template-registry.ts';
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml