Skip to content

Commit 83394c4

Browse files
authored
Updated blueprints to match @embroider/[email protected] (#62)
* chore: Updated blueprints * chore: Updated fixtures * chore: Updated latestVersions * chore: Updated fixtures --------- Co-authored-by: ijlee2 <[email protected]>
1 parent 607bb9a commit 83394c4

File tree

108 files changed

+449
-549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+449
-549
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/declarations/
6+
/dist/
7+
8+
# misc
9+
/coverage/

src/blueprints/ember-addon/__addonLocation__/__gitignore__

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,10 @@
33
# will also appear in published NPM packages.
44
/LICENSE.md
55
/README.md
6+
7+
# compiled output
8+
/declarations
9+
/dist
10+
11+
# npm/pnpm/yarn pack output
12+
*.tgz
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
{
2-
<% if (options.packages.addon.hasTypeScript) { %> "presets": [["@babel/preset-typescript"]],
3-
<% } %> "plugins": [
4-
"@embroider/addon-dev/template-colocation-plugin",<% if (options.packages.addon.hasTypeScript) { %>
5-
["@babel/plugin-transform-typescript", { "allowDeclareFields": true }],<% } %>
1+
<% if (options.packages.addon.hasTypeScript) { %>{
2+
"presets": [["@babel/preset-typescript"]],
3+
"plugins": [
4+
"@embroider/addon-dev/template-colocation-plugin",
5+
["@babel/plugin-transform-typescript", { "allowDeclareFields": true }],
66
["@babel/plugin-proposal-decorators", { "version": "legacy" }],
77
"@babel/plugin-transform-class-properties"
88
]
9-
}
9+
}<% } else { %>{
10+
"plugins": [
11+
"@embroider/addon-dev/template-colocation-plugin",
12+
["@babel/plugin-proposal-decorators", { "version": "legacy" }],
13+
"@babel/plugin-transform-class-properties"
14+
]
15+
}<% } %>

src/blueprints/ember-addon/__addonLocation__/rollup.config.mjs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ const addon = new Addon({
77
destDir: 'dist',
88
});
99

10-
// Add extensions here, such as ts, gjs, etc that you may import
11-
const extensions = ['.js'<% if (options.packages.addon.hasTypeScript) { %>, '.ts'<% } %>];
12-
1310
export default {
1411
// This provides defaults that work well alongside `publicEntrypoints` below.
1512
// You can augment this if you need to.
@@ -38,7 +35,7 @@ export default {
3835
// babel.config.json.
3936
babel({
4037
babelHelpers: 'bundled',
41-
extensions,
38+
extensions: ['.js'<% if (options.packages.addon.hasTypeScript) { %>, '.ts'<% } %>],
4239
}),
4340

4441
// Ensure that standalone .hbs files are properly integrated as Javascript.
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
# compiled output
2-
declarations/
3-
dist/
4-
5-
# npm/pnpm/yarn pack output
6-
*.tgz
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
72

83
# dependencies
94
node_modules/
105

116
# misc
12-
/.env*
13-
/.pnpm-debug.log
14-
/npm-debug.log*
15-
/yarn-error.log
7+
.env*
8+
.pnpm-debug.log
9+
npm-debug.log*
10+
yarn-error.log

src/blueprints/ember-addon/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% if (options.packageManager.isNpm) { %>{
2-
"name": "<%= options.packages.addon.name %>",
2+
"name": "workspace-root",
33
"version": "<%= options.packages.addon.version %>",
44
"private": true,
55
"repository": "",
@@ -23,7 +23,7 @@
2323
"concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
2424
}
2525
}<% } else if (options.packageManager.isPnpm) { %>{
26-
"name": "<%= options.packages.addon.name %>",
26+
"name": "workspace-root",
2727
"version": "<%= options.packages.addon.version %>",
2828
"private": true,
2929
"repository": "",
@@ -43,7 +43,7 @@
4343
"concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
4444
}
4545
}<% } else if (options.packageManager.isYarn) { %>{
46-
"name": "<%= options.packages.addon.name %>",
46+
"name": "workspace-root",
4747
"version": "<%= options.packages.addon.version %>",
4848
"private": true,
4949
"repository": "",

src/utils/blueprints/get-version.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ import { decideVersion } from '@codemod-utils/blueprints';
33
import type { Options } from '../../types/index.js';
44

55
const latestVersions = new Map([
6-
['@babel/core', '7.22.6'],
7-
['@babel/plugin-proposal-decorators', '7.22.6'],
6+
['@babel/core', '7.22.10'],
7+
['@babel/plugin-proposal-decorators', '7.22.10'],
88
['@babel/plugin-transform-class-properties', '7.22.5'],
99
['@babel/preset-typescript', '7.22.5'],
10-
['@babel/runtime', '7.22.6'],
11-
['@embroider/addon-dev', '3.1.1'],
12-
['@embroider/addon-shim', '1.8.5'],
10+
['@babel/runtime', '7.22.10'],
11+
['@embroider/addon-dev', '4.1.0'],
12+
['@embroider/addon-shim', '1.8.6'],
1313
['@rollup/plugin-babel', '6.0.3'],
1414
['concurrently', '8.2.0'],
1515
['ember-auto-import', '2.6.3'],
1616
['ember-cli-babel', '7.26.11'],
17-
['ember-cli-htmlbars', '6.2.0'],
18-
['rollup', '3.26.0'],
17+
['ember-cli-htmlbars', '6.3.0'],
18+
['rollup', '3.28.0'],
1919
['rollup-plugin-copy', '3.4.0'],
2020
]);
2121

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
# compiled output
2-
declarations/
3-
dist/
4-
5-
# npm/pnpm/yarn pack output
6-
*.tgz
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
72

83
# dependencies
94
node_modules/
105

116
# misc
12-
/.env*
13-
/.pnpm-debug.log
14-
/npm-debug.log*
15-
/yarn-error.log
7+
.env*
8+
.pnpm-debug.log
9+
npm-debug.log*
10+
yarn-error.log

tests/fixtures/ember-container-query-customizations/output/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "ember-container-query",
2+
"name": "workspace-root",
33
"version": "3.2.0",
44
"private": true,
55
"repository": "",

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,10 @@
33
# will also appear in published NPM packages.
44
/LICENSE.md
55
/README.md
6+
7+
# compiled output
8+
/declarations
9+
/dist
10+
11+
# npm/pnpm/yarn pack output
12+
*.tgz

0 commit comments

Comments
 (0)