Downstreamed @embroider/addon-blueprint@3.2.0

ijlee2 · Jan 14, 2025 · de8103e · de8103e
1 parent 7acda0c
commit de8103e
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blueprints-v2-addon",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "private": true,
   "description": "Blueprints for v2 addons",
   "keywords": [
@@ -25,8 +25,8 @@
   ],
   "scripts": {
     "build": "./build.sh --production",
-    "lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
-    "lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
+    "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "lint:types": "tsc --noEmit",

diff --git a/src/blueprints/run-new/__addonLocation__/package.json b/src/blueprints/run-new/__addonLocation__/package.json
@@ -32,25 +32,21 @@
     "public"
   ],
   "scripts": {
-    "addon": "blueprints-v2-addon --test-app-location '<%= options.addon.locationInverse %>/<%= options.testApp.location %>'",
-    "build": "concurrently 'pnpm:build:*' --names 'build:'",
-    "build:js": "rollup --config",
-    "build:types": "glint --declaration",
-    "lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
-    "lint:css": "stylelint '**/*.css' --allow-empty-input --cache",
-    "lint:css:fix": "stylelint '**/*.css' --allow-empty-input --fix",
-    "lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
+    "addon": "blueprints-v2-addon --test-app-location \"<%= options.addon.locationInverse %>/<%= options.testApp.location %>\"",
+    "build": "rollup --config",
+    "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache",
+    "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix",
+    "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "prelint:types": "type-css-modules --src src",
     "lint:types": "glint",
     "prepack": "rollup --config",
-    "start": "concurrently 'pnpm:start:*' --names 'start:'",
-    "start:js": "rollup --config --watch --no-watch.clearScreen",
-    "start:types": "glint --declaration --watch",
-    "test": "echo 'A v2 addon does not have tests, run tests in <%= options.testApp.location %>'"
+    "start": "rollup --config --watch",
+    "test": "echo \"A v2 addon does not have tests, run tests in <%= options.testApp.location %>\""
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.9.0",

diff --git a/src/blueprints/run-new/__addonLocation__/rollup.config.mjs b/src/blueprints/run-new/__addonLocation__/rollup.config.mjs
@@ -68,6 +68,9 @@ export default {
     // Ensure that .gjs files are properly integrated as Javascript
     addon.gjs(),
 
+    // Emit .d.ts declaration files
+    addon.declarations('declarations'),
+
     // addons are allowed to contain imports of .css files, which we want rollup
     // to leave alone and keep in the published output.
     addon.keepAssets([]),

diff --git a/src/blueprints/run-new/__addonLocation__/tsconfig.json b/src/blueprints/run-new/__addonLocation__/tsconfig.json
@@ -5,7 +5,10 @@
     "allowJs": true,
     "declarationDir": "declarations",
     "rootDir": "./src",
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": [
+      "ember-source/types"
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts b/src/blueprints/run-new/__addonLocation__/unpublished-development-types/index.d.ts
@@ -3,7 +3,6 @@
 
 import '@glint/environment-ember-loose';
 import '@glint/environment-ember-template-imports';
-import 'ember-source/types';
 import 'qunit-dom';
 
 import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry';

diff --git a/tests/fixtures/run-new/output/packages/ui/form/package.json b/tests/fixtures/run-new/output/packages/ui/form/package.json
@@ -32,25 +32,21 @@
     "public"
   ],
   "scripts": {
-    "addon": "blueprints-v2-addon --test-app-location '../../../test-app'",
-    "build": "concurrently 'pnpm:build:*' --names 'build:'",
-    "build:js": "rollup --config",
-    "build:types": "glint --declaration",
-    "lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
-    "lint:css": "stylelint '**/*.css' --allow-empty-input --cache",
-    "lint:css:fix": "stylelint '**/*.css' --allow-empty-input --fix",
-    "lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
+    "addon": "blueprints-v2-addon --test-app-location \"../../../test-app\"",
+    "build": "rollup --config",
+    "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:css": "stylelint \"**/*.css\" --allow-empty-input --cache",
+    "lint:css:fix": "stylelint \"**/*.css\" --allow-empty-input --fix",
+    "lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "prelint:types": "type-css-modules --src src",
     "lint:types": "glint",
     "prepack": "rollup --config",
-    "start": "concurrently 'pnpm:start:*' --names 'start:'",
-    "start:js": "rollup --config --watch --no-watch.clearScreen",
-    "start:types": "glint --declaration --watch",
-    "test": "echo 'A v2 addon does not have tests, run tests in test-app'"
+    "start": "rollup --config --watch",
+    "test": "echo \"A v2 addon does not have tests, run tests in test-app\""
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.9.0",

diff --git a/tests/fixtures/run-new/output/packages/ui/form/rollup.config.mjs b/tests/fixtures/run-new/output/packages/ui/form/rollup.config.mjs
@@ -68,6 +68,9 @@ export default {
     // Ensure that .gjs files are properly integrated as Javascript
     addon.gjs(),
 
+    // Emit .d.ts declaration files
+    addon.declarations('declarations'),
+
     // addons are allowed to contain imports of .css files, which we want rollup
     // to leave alone and keep in the published output.
     addon.keepAssets([]),

diff --git a/tests/fixtures/run-new/output/packages/ui/form/tsconfig.json b/tests/fixtures/run-new/output/packages/ui/form/tsconfig.json
@@ -5,7 +5,10 @@
     "allowJs": true,
     "declarationDir": "declarations",
     "rootDir": "./src",
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": [
+      "ember-source/types"
+    ]
   },
   "include": [
     "src/**/*",

diff --git a/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts b/tests/fixtures/run-new/output/packages/ui/form/unpublished-development-types/index.d.ts
@@ -3,7 +3,6 @@
 
 import '@glint/environment-ember-loose';
 import '@glint/environment-ember-template-imports';
-import 'ember-source/types';
 import 'qunit-dom';
 
 import type EmbroiderCssModulesRegistry from 'embroider-css-modules/template-registry';

diff --git a/update-blueprints.js b/update-blueprints.js
@@ -5,7 +5,7 @@ import gitDiffApply from 'git-diff-apply';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-const CURRENT_VERSION = '0.4.1';
+const CURRENT_VERSION = '0.5.0';
 
 async function updateBlueprints({ from, to }) {
   const startTag = from;