@embroider/compat 3.7.0 → 3.7.1-unstable.3e8dbe3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. package/babel.js +1 -0
  2. package/package.json +11 -9
  3. package/src/audit/babel-visitor.js +7 -1
  4. package/src/audit/babel-visitor.js.map +1 -1
  5. package/src/audit/build.js.map +1 -1
  6. package/src/audit.d.ts +6 -53
  7. package/src/audit.js +98 -285
  8. package/src/audit.js.map +1 -1
  9. package/src/babel-plugin-adjust-imports.js +19 -18
  10. package/src/babel-plugin-adjust-imports.js.map +1 -1
  11. package/src/babel.d.ts +19 -0
  12. package/src/babel.js +153 -0
  13. package/src/babel.js.map +1 -0
  14. package/src/compat-adapters/@ember-data/store.d.ts +1 -5
  15. package/src/compat-adapters/@ember-data/store.js +3 -15
  16. package/src/compat-adapters/@ember-data/store.js.map +1 -1
  17. package/src/compat-adapters/active-model-adapter.d.ts +1 -1
  18. package/src/compat-adapters/ember-asset-loader.d.ts +1 -1
  19. package/src/compat-adapters/ember-cli-addon-docs.d.ts +1 -1
  20. package/src/compat-adapters/ember-decorators.d.ts +1 -1
  21. package/src/compat-adapters/ember-fetch.d.ts +5 -0
  22. package/src/compat-adapters/ember-fetch.js +19 -0
  23. package/src/compat-adapters/ember-fetch.js.map +1 -0
  24. package/src/compat-adapters/ember-macro-helpers.d.ts +1 -1
  25. package/src/compat-adapters/ember-percy.d.ts +1 -1
  26. package/src/compat-adapters/ember-resolver.d.ts +4 -0
  27. package/src/compat-adapters/ember-resolver.js +21 -0
  28. package/src/compat-adapters/ember-resolver.js.map +1 -0
  29. package/src/compat-adapters/ember-scroll-modifiers.d.ts +1 -1
  30. package/src/compat-adapters/ember-source.d.ts +2 -2
  31. package/src/compat-adapters/ember-test-selectors.d.ts +1 -1
  32. package/src/compat-addons.js +1 -1
  33. package/src/compat-addons.js.map +1 -1
  34. package/src/compat-app-builder.d.ts +9 -64
  35. package/src/compat-app-builder.js +110 -1275
  36. package/src/compat-app-builder.js.map +1 -1
  37. package/src/compat-app.d.ts +4 -22
  38. package/src/compat-app.js +70 -216
  39. package/src/compat-app.js.map +1 -1
  40. package/src/content-for-config.d.ts +11 -0
  41. package/src/content-for-config.js +66 -0
  42. package/src/content-for-config.js.map +1 -0
  43. package/src/default-pipeline.d.ts +2 -2
  44. package/src/default-pipeline.js +21 -0
  45. package/src/default-pipeline.js.map +1 -1
  46. package/src/dependency-rules.js +17 -10
  47. package/src/dependency-rules.js.map +1 -1
  48. package/src/detect-babel-plugins.d.ts +1 -0
  49. package/src/detect-babel-plugins.js +14 -0
  50. package/src/detect-babel-plugins.js.map +1 -1
  51. package/src/http-audit.d.ts +13 -0
  52. package/src/http-audit.js +60 -0
  53. package/src/http-audit.js.map +1 -0
  54. package/src/index.d.ts +1 -2
  55. package/src/index.js +2 -3
  56. package/src/index.js.map +1 -1
  57. package/src/module-visitor.d.ts +52 -0
  58. package/src/module-visitor.js +285 -0
  59. package/src/module-visitor.js.map +1 -0
  60. package/src/options.d.ts +3 -2
  61. package/src/options.js +3 -0
  62. package/src/options.js.map +1 -1
  63. package/src/resolver-transform.js +9 -6
  64. package/src/resolver-transform.js.map +1 -1
  65. package/src/standalone-addon-build.js +6 -15
  66. package/src/standalone-addon-build.js.map +1 -1
  67. package/src/v1-config.d.ts +0 -8
  68. package/src/v1-config.js +1 -51
  69. package/src/v1-config.js.map +1 -1
  70. package/src/compat-adapters/@ember-data/debug.d.ts +0 -6
  71. package/src/compat-adapters/@ember-data/debug.js +0 -22
  72. package/src/compat-adapters/@ember-data/debug.js.map +0 -1
  73. package/src/rename-require-plugin.d.ts +0 -1
  74. package/src/rename-require-plugin.js +0 -15
  75. package/src/rename-require-plugin.js.map +0 -1
  76. package/src/sync-dir.d.ts +0 -8
  77. package/src/sync-dir.js +0 -68
  78. package/src/sync-dir.js.map +0 -1
  79. package/src/template-tag-codemod.d.ts +0 -13
  80. package/src/template-tag-codemod.js +0 -304
  81. package/src/template-tag-codemod.js.map +0 -1
  82. package/src/v1-appboot.d.ts +0 -14
  83. package/src/v1-appboot.js +0 -47
  84. package/src/v1-appboot.js.map +0 -1
package/src/sync-dir.js DELETED
@@ -1,68 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.SyncDir = void 0;
7
- const assert_never_1 = __importDefault(require("assert-never"));
8
- const fs_tree_diff_1 = __importDefault(require("fs-tree-diff"));
9
- const walk_sync_1 = __importDefault(require("walk-sync"));
10
- const path_1 = require("path");
11
- const fs_extra_1 = require("fs-extra");
12
- // mirrors the changes in the src dir to the dest dir, while tracking the
13
- // current set of files present. If dest is undefined, it only tracks the set of
14
- // files without mirroring the changes to anywhere
15
- class SyncDir {
16
- constructor(src, dest) {
17
- this.src = src;
18
- this.dest = dest;
19
- this.prev = new fs_tree_diff_1.default();
20
- this.files = new Set();
21
- }
22
- update() {
23
- let next = new fs_tree_diff_1.default({
24
- entries: walk_sync_1.default.entries(this.src),
25
- });
26
- for (let [operation, relativePath] of this.prev.calculatePatch(next)) {
27
- let outputPath;
28
- if (this.dest) {
29
- outputPath = (0, path_1.resolve)(this.dest, relativePath);
30
- }
31
- switch (operation) {
32
- case 'unlink':
33
- if (outputPath) {
34
- (0, fs_extra_1.unlinkSync)(outputPath);
35
- }
36
- this.files.delete(relativePath);
37
- break;
38
- case 'rmdir':
39
- if (outputPath) {
40
- (0, fs_extra_1.rmdirSync)(outputPath);
41
- }
42
- break;
43
- case 'mkdir':
44
- if (outputPath) {
45
- (0, fs_extra_1.mkdirpSync)(outputPath);
46
- }
47
- break;
48
- case 'change':
49
- if (outputPath) {
50
- (0, fs_extra_1.removeSync)(outputPath);
51
- (0, fs_extra_1.copySync)((0, path_1.resolve)(this.src, relativePath), outputPath, { dereference: true });
52
- }
53
- break;
54
- case 'create':
55
- if (outputPath) {
56
- (0, fs_extra_1.copySync)((0, path_1.resolve)(this.src, relativePath), outputPath, { dereference: true });
57
- }
58
- this.files.add(relativePath);
59
- break;
60
- default:
61
- (0, assert_never_1.default)(operation);
62
- }
63
- this.prev = next;
64
- }
65
- }
66
- }
67
- exports.SyncDir = SyncDir;
68
- //# sourceMappingURL=sync-dir.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"sync-dir.js","sourceRoot":"","sources":["sync-dir.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAuC;AACvC,gEAAkC;AAClC,0DAAiC;AACjC,+BAA+B;AAC/B,uCAAmF;AAEnF,yEAAyE;AACzE,gFAAgF;AAChF,kDAAkD;AAClD,MAAa,OAAO;IAIlB,YAAoB,GAAW,EAAU,IAAwB;QAA7C,QAAG,GAAH,GAAG,CAAQ;QAAU,SAAI,GAAJ,IAAI,CAAoB;QAHzD,SAAI,GAAW,IAAI,sBAAM,EAAE,CAAC;QAC3B,UAAK,GAAgB,IAAI,GAAG,EAAE,CAAC;IAE4B,CAAC;IAErE,MAAM;QACJ,IAAI,IAAI,GAAG,IAAI,sBAAM,CAAC;YACpB,OAAO,EAAE,mBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;SACpC,CAAC,CAAC;QACH,KAAK,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACrE,IAAI,UAA8B,CAAC;YACnC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;YAChD,CAAC;YACD,QAAQ,SAAS,EAAE,CAAC;gBAClB,KAAK,QAAQ;oBACX,IAAI,UAAU,EAAE,CAAC;wBACf,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;oBACzB,CAAC;oBACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAChC,MAAM;gBACR,KAAK,OAAO;oBACV,IAAI,UAAU,EAAE,CAAC;wBACf,IAAA,oBAAS,EAAC,UAAU,CAAC,CAAC;oBACxB,CAAC;oBACD,MAAM;gBACR,KAAK,OAAO;oBACV,IAAI,UAAU,EAAE,CAAC;wBACf,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;oBACzB,CAAC;oBACD,MAAM;gBACR,KAAK,QAAQ;oBACX,IAAI,UAAU,EAAE,CAAC;wBACf,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;wBACvB,IAAA,mBAAQ,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/E,CAAC;oBACD,MAAM;gBACR,KAAK,QAAQ;oBACX,IAAI,UAAU,EAAE,CAAC;wBACf,IAAA,mBAAQ,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/E,CAAC;oBACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBAC7B,MAAM;gBACR;oBACE,IAAA,sBAAW,EAAC,SAAS,CAAC,CAAC;YAC3B,CAAC;YACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,CAAC;IACH,CAAC;CACF;AAlDD,0BAkDC","sourcesContent":["import assertNever from 'assert-never';\nimport FSTree from 'fs-tree-diff';\nimport walkSync from 'walk-sync';\nimport { resolve } from 'path';\nimport { copySync, mkdirpSync, removeSync, rmdirSync, unlinkSync } from 'fs-extra';\n\n// mirrors the changes in the src dir to the dest dir, while tracking the\n// current set of files present. If dest is undefined, it only tracks the set of\n// files without mirroring the changes to anywhere\nexport class SyncDir {\n private prev: FSTree = new FSTree();\n readonly files: Set<string> = new Set();\n\n constructor(private src: string, private dest: string | undefined) {}\n\n update(): void {\n let next = new FSTree({\n entries: walkSync.entries(this.src),\n });\n for (let [operation, relativePath] of this.prev.calculatePatch(next)) {\n let outputPath: string | undefined;\n if (this.dest) {\n outputPath = resolve(this.dest, relativePath);\n }\n switch (operation) {\n case 'unlink':\n if (outputPath) {\n unlinkSync(outputPath);\n }\n this.files.delete(relativePath);\n break;\n case 'rmdir':\n if (outputPath) {\n rmdirSync(outputPath);\n }\n break;\n case 'mkdir':\n if (outputPath) {\n mkdirpSync(outputPath);\n }\n break;\n case 'change':\n if (outputPath) {\n removeSync(outputPath);\n copySync(resolve(this.src, relativePath), outputPath, { dereference: true });\n }\n break;\n case 'create':\n if (outputPath) {\n copySync(resolve(this.src, relativePath), outputPath, { dereference: true });\n }\n this.files.add(relativePath);\n break;\n default:\n assertNever(operation);\n }\n this.prev = next;\n }\n }\n}\n"]}
@@ -1,13 +0,0 @@
1
- import type { EmberAppInstance } from '@embroider/core';
2
- import type { Node } from 'broccoli-node-api';
3
- import { type ExternalNameHint } from './resolver-transform';
4
- export interface TemplateTagCodemodOptions {
5
- shouldTransformPath: (outputPath: string) => boolean;
6
- nameHint: ExternalNameHint;
7
- dryRun: boolean;
8
- }
9
- export default function templateTagCodemod(emberApp: EmberAppInstance, { shouldTransformPath, nameHint, dryRun, }?: {
10
- shouldTransformPath?: ((outputPath: string) => boolean) | undefined;
11
- nameHint?: ExternalNameHint | undefined;
12
- dryRun?: boolean | undefined;
13
- }): Node;
@@ -1,304 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.default = templateTagCodemod;
7
- const default_pipeline_1 = __importDefault(require("./default-pipeline"));
8
- const path_1 = require("path");
9
- const fs_1 = require("fs");
10
- const broccoli_plugin_1 = __importDefault(require("broccoli-plugin"));
11
- const core_1 = require("@babel/core");
12
- const core_2 = require("@embroider/core");
13
- const resolver_transform_1 = __importDefault(require("./resolver-transform"));
14
- const child_process_1 = require("child_process");
15
- const core_3 = require("@embroider/core");
16
- function templateTagCodemod(emberApp, { shouldTransformPath = (() => true), nameHint = (path => {
17
- return path
18
- .split('/')
19
- .map(part => part
20
- .split('-')
21
- // capitalize first letter
22
- .map(inner_part => inner_part.charAt(0).toUpperCase() + inner_part.slice(1))
23
- .join(''))
24
- .join('_');
25
- }), dryRun = false, } = {}) {
26
- return new TemplateTagCodemodPlugin([
27
- (0, default_pipeline_1.default)(emberApp, undefined, {
28
- staticAddonTrees: true,
29
- staticAddonTestSupportTrees: true,
30
- staticComponents: true,
31
- staticHelpers: true,
32
- staticModifiers: true,
33
- staticEmberSource: true,
34
- amdCompatibility: {
35
- es: [],
36
- },
37
- }),
38
- ], { shouldTransformPath, nameHint, dryRun });
39
- }
40
- const TEMPLATE_ONLY_MARKER = `import templateOnlyComponent from '@ember/component/template-only';`;
41
- const TEMPLATE_COLOCATION_MARKER = /\/\* import __COLOCATED_TEMPLATE__ from (.*) \*\//;
42
- class TemplateTagCodemodPlugin extends broccoli_plugin_1.default {
43
- constructor(inputNodes, options) {
44
- super(inputNodes, {
45
- name: 'TemplateTagCodemodPlugin',
46
- });
47
- this.options = options;
48
- }
49
- async build() {
50
- var _a, _b;
51
- function* walkSync(dir) {
52
- const files = (0, fs_1.readdirSync)(dir);
53
- for (const file of files) {
54
- const pathToFile = (0, path_1.join)(dir, file);
55
- const isDirectory = (0, fs_1.statSync)(pathToFile).isDirectory();
56
- if (isDirectory) {
57
- yield* walkSync(pathToFile);
58
- }
59
- else {
60
- yield pathToFile;
61
- }
62
- }
63
- }
64
- this.inputPaths[0];
65
- const tmp_path = (0, fs_1.readFileSync)(this.inputPaths[0] + '/.stage2-output').toLocaleString();
66
- const compatPattern = /#embroider_compat\/(?<type>[^\/]+)\/(?<rest>.*)/;
67
- const resolver = new core_2.ResolverLoader(process.cwd()).resolver;
68
- const hbs_file_test = /[\\/]rewritten-app[\\/]components[\\/].*\.hbs$/;
69
- // locate ember-source for the host app so we know which version to insert builtIns for
70
- const emberSourceEntrypoint = require.resolve('ember-source', { paths: [process.cwd()] });
71
- const emberVersion = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(emberSourceEntrypoint, '../../package.json')).toString()).version;
72
- const ember_template_compiler = resolver.nodeResolve('ember-source/vendor/ember/ember-template-compiler', (0, path_1.resolve)((0, core_3.locateEmbroiderWorkingDir)(process.cwd()), 'rewritten-app', 'package.json'));
73
- if (ember_template_compiler.type === 'not_found') {
74
- throw 'This will not ever be true';
75
- }
76
- const embroider_compat_path = require.resolve('@embroider/compat', { paths: [process.cwd()] });
77
- const babel_plugin_ember_template_compilation = require.resolve('babel-plugin-ember-template-compilation', {
78
- paths: [embroider_compat_path],
79
- });
80
- const babel_plugin_syntax_decorators = require.resolve('@babel/plugin-syntax-decorators', {
81
- paths: [embroider_compat_path],
82
- });
83
- const babel_plugin_syntax_typescript = require.resolve('@babel/plugin-syntax-typescript', {
84
- paths: [embroider_compat_path],
85
- });
86
- const resolver_transform = (0, resolver_transform_1.default)({
87
- appRoot: process.cwd(),
88
- emberVersion: emberVersion,
89
- externalNameHint: this.options.nameHint,
90
- });
91
- for await (const current_file of walkSync(tmp_path)) {
92
- if (hbs_file_test.test(current_file) && this.options.shouldTransformPath(current_file)) {
93
- const template_file_src = (0, fs_1.readFileSync)(current_file).toLocaleString();
94
- // run the template transformations using embroider resolver information
95
- // to replace template values with js import syntax used in g(j/t)s
96
- let transformed_source = (_b = (_a = (0, core_1.transformSync)((0, core_2.hbsToJS)(template_file_src), {
97
- plugins: [
98
- [
99
- babel_plugin_ember_template_compilation,
100
- {
101
- compilerPath: ember_template_compiler.filename,
102
- transforms: [resolver_transform],
103
- targetFormat: 'hbs',
104
- },
105
- ],
106
- ],
107
- filename: current_file,
108
- })) === null || _a === void 0 ? void 0 : _a.code) !== null && _b !== void 0 ? _b : '';
109
- // using transformSync to parse and traverse in one go
110
- // we're only extracting the transformed template information from previous step
111
- // and preserving it for later assembly in the backing class
112
- const import_bucket = [];
113
- let template_tag_value = '';
114
- (0, core_1.transformSync)(transformed_source, {
115
- plugins: [
116
- function template_tag_extractor() {
117
- return {
118
- visitor: {
119
- ImportDeclaration(import_declaration) {
120
- const extractor = import_declaration.node.source.value.match(compatPattern);
121
- if (extractor) {
122
- const result = resolver.nodeResolve(extractor[0], current_file);
123
- if (result.type === 'real') {
124
- // find package there the resolver is pointing
125
- const owner_package = resolver.packageCache.ownerOfFile(result.filename);
126
- let relative_import_path = (0, path_1.relative)(owner_package.root, result.filename);
127
- // for addons strip off appPublicationDir from relative path
128
- // we do this on app files as well as they don't contain the
129
- // path that we strip off
130
- // this makes sure that ambiguous imports get properly attributed
131
- relative_import_path = relative_import_path.replace('_app_/', '');
132
- // remove the extension to match what a developer would normally write
133
- relative_import_path = relative_import_path.slice(0, -(0, path_1.extname)(relative_import_path).length);
134
- // change import path to real one
135
- import_declaration.node.source.value = owner_package.name + '/' + relative_import_path;
136
- import_bucket.push(import_declaration);
137
- }
138
- }
139
- else if (import_declaration.node.source.value.indexOf('@ember/template-compilation') === -1) {
140
- import_bucket.push(import_declaration);
141
- }
142
- },
143
- CallExpression(path) {
144
- // reverse of hbs to js
145
- // extract the template string to put into template tag in backing class
146
- if ('name' in path.node.callee &&
147
- path.node.callee.name === 'precompileTemplate' &&
148
- path.node.arguments &&
149
- 'value' in path.node.arguments[0]) {
150
- template_tag_value = `<template>\n\t${path.node.arguments[0].value}\n</template>`;
151
- }
152
- },
153
- },
154
- };
155
- },
156
- ],
157
- });
158
- //find backing class
159
- const backing_class_resolution = resolver.nodeResolve('#embroider_compat/' + (0, path_1.relative)(tmp_path, current_file).replace(/[\\]/g, '/').slice(0, -4), tmp_path);
160
- const backing_class_filename = 'filename' in backing_class_resolution ? backing_class_resolution.filename : '';
161
- // this can be either a generated js file in case of template only components
162
- // the js or ts file depending on what the app is configured
163
- const backing_class_src = (0, fs_1.readFileSync)(backing_class_filename).toString();
164
- const is_typescript = (0, path_1.extname)(backing_class_filename) === '.ts';
165
- let insert_imports_byte_count = null;
166
- let insert_template_byte_count = null;
167
- const is_template_only = backing_class_src.indexOf(TEMPLATE_ONLY_MARKER) !== -1;
168
- // we parse the backing class to find the insert points for imports and template
169
- (0, core_1.transformSync)(backing_class_src, {
170
- plugins: [
171
- [
172
- is_typescript ? babel_plugin_syntax_typescript : babel_plugin_syntax_decorators,
173
- { decoratorsBeforeExport: true },
174
- ],
175
- function glimmer_syntax_creator( /* babel */) {
176
- return {
177
- name: 'test',
178
- visitor: {
179
- ImportDeclaration(import_declaration) {
180
- insert_imports_byte_count = import_declaration.node.end;
181
- },
182
- ExportDefaultDeclaration(path) {
183
- // convention is that we have a default export for each component
184
- // we look for the closing bracket of the class body
185
- path.traverse({
186
- ClassBody(path) {
187
- // we substract 1 to find the byte right before the final closing bracket `}`
188
- // this is the default insert point for template tag though it could live anywhere inside the class body
189
- // possible future point to add option for putting template first thing in class
190
- insert_template_byte_count = path.node.end ? path.node.end - 1 : 0;
191
- },
192
- });
193
- },
194
- },
195
- };
196
- },
197
- ],
198
- });
199
- // list of imports needed by the previous hbs template extracted in second step
200
- const hbs_template_required_imports = import_bucket.join('\n');
201
- // we extracted all we needed from transformed_source so we switch to the second phase
202
- // transforming the backing class into what will be our final output
203
- transformed_source = backing_class_src;
204
- if (is_template_only) {
205
- // because we can't inject a comment as the default export
206
- // we replace the known exported string
207
- transformed_source = transformed_source.replace('templateOnlyComponent()', template_tag_value);
208
- // we clean known markers from generated files
209
- transformed_source = transformed_source.replace(TEMPLATE_ONLY_MARKER, hbs_template_required_imports);
210
- transformed_source = transformed_source.replace(TEMPLATE_COLOCATION_MARKER, '');
211
- }
212
- else {
213
- // we modify the source from end to start in order to keep our byte counts valid through the transforms
214
- if (insert_template_byte_count) {
215
- // first we split the backing class at the byte count we found during backing class parsing
216
- // then concat the string back together adding the transformed template in the middle
217
- transformed_source =
218
- transformed_source.substring(0, insert_template_byte_count) +
219
- '\n' +
220
- template_tag_value +
221
- '\n' +
222
- transformed_source.substring(insert_template_byte_count, transformed_source.length);
223
- }
224
- if (insert_imports_byte_count) {
225
- // first we split the backing class at the byte count we found during backing class parsing
226
- // then concat the string back together adding the transformed template in the middle
227
- transformed_source =
228
- transformed_source.substring(0, insert_imports_byte_count) +
229
- '\n' +
230
- hbs_template_required_imports +
231
- '\n' +
232
- transformed_source.substring(insert_imports_byte_count, transformed_source.length);
233
- }
234
- transformed_source = transformed_source.replace(TEMPLATE_COLOCATION_MARKER, '');
235
- }
236
- const dryRun = this.options.dryRun ? '--dry-run' : '';
237
- // work out original file path in app tree
238
- const app_relative_path = (0, path_1.join)('app', (0, path_1.relative)(tmp_path, current_file));
239
- const new_file_path = app_relative_path.slice(0, -4) + (is_typescript ? '.gts' : '.gjs');
240
- // write glimmer file out
241
- if (this.options.dryRun) {
242
- console.log('Write new file', new_file_path, transformed_source);
243
- }
244
- else {
245
- (0, fs_1.writeFileSync)((0, path_1.join)(process.cwd(), new_file_path), transformed_source, { flag: 'wx+' });
246
- }
247
- // git rm old files (js/ts if exists + hbs)
248
- let rm_hbs = await execute(`git rm ${app_relative_path} ${dryRun}`, {
249
- pwd: process.cwd(),
250
- });
251
- console.log(rm_hbs.output);
252
- if (!is_template_only) {
253
- // remove backing class only if it's not a template only component
254
- // resolve relative path to rewritten-app
255
- const app_relative_path = (0, path_1.join)('app', (0, path_1.relative)(tmp_path, backing_class_filename));
256
- let rm_js = await execute(`git rm ${app_relative_path} ${dryRun}`, {
257
- pwd: process.cwd(),
258
- });
259
- console.log(rm_js.output);
260
- }
261
- }
262
- }
263
- }
264
- }
265
- async function execute(shellCommand, opts) {
266
- let env;
267
- if (opts === null || opts === void 0 ? void 0 : opts.env) {
268
- env = { ...process.env, ...opts.env };
269
- }
270
- let child = (0, child_process_1.spawn)(shellCommand, {
271
- stdio: ['inherit', 'pipe', 'pipe'],
272
- cwd: opts === null || opts === void 0 ? void 0 : opts.pwd,
273
- shell: true,
274
- env,
275
- });
276
- let stderrBuffer = [];
277
- let stdoutBuffer = [];
278
- let combinedBuffer = [];
279
- child.stderr.on('data', data => {
280
- stderrBuffer.push(data);
281
- combinedBuffer.push(data);
282
- });
283
- child.stdout.on('data', data => {
284
- stdoutBuffer.push(data);
285
- combinedBuffer.push(data);
286
- });
287
- return new Promise(resolve => {
288
- child.on('close', (exitCode) => {
289
- resolve({
290
- exitCode,
291
- get stdout() {
292
- return stdoutBuffer.join('');
293
- },
294
- get stderr() {
295
- return stderrBuffer.join('');
296
- },
297
- get output() {
298
- return combinedBuffer.join('');
299
- },
300
- });
301
- });
302
- });
303
- }
304
- //# sourceMappingURL=template-tag-codemod.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"template-tag-codemod.js","sourceRoot":"","sources":["template-tag-codemod.ts"],"names":[],"mappings":"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","sourcesContent":["import { default as compatBuild } from './default-pipeline';\nimport type { EmberAppInstance } from '@embroider/core';\nimport type { Node, InputNode } from 'broccoli-node-api';\nimport { join, relative, resolve, extname } from 'path';\nimport type { types as t } from '@babel/core';\nimport type { NodePath } from '@babel/traverse';\nimport { statSync, readdirSync, readFileSync, writeFileSync } from 'fs';\nimport Plugin from 'broccoli-plugin';\nimport { transformSync } from '@babel/core';\nimport { hbsToJS, ResolverLoader } from '@embroider/core';\nimport ResolverTransform, { type ExternalNameHint } from './resolver-transform';\nimport { spawn } from 'child_process';\nimport { locateEmbroiderWorkingDir } from '@embroider/core';\n\nexport interface TemplateTagCodemodOptions {\n shouldTransformPath: (outputPath: string) => boolean;\n nameHint: ExternalNameHint;\n dryRun: boolean;\n}\n\nexport default function templateTagCodemod(\n emberApp: EmberAppInstance,\n {\n shouldTransformPath = (() => true) as TemplateTagCodemodOptions['shouldTransformPath'],\n nameHint = (path => {\n return path\n .split('/')\n .map(part =>\n part\n .split('-')\n // capitalize first letter\n .map(inner_part => inner_part.charAt(0).toUpperCase() + inner_part.slice(1))\n .join('')\n )\n .join('_');\n }) as TemplateTagCodemodOptions['nameHint'],\n dryRun = false,\n } = {}\n): Node {\n return new TemplateTagCodemodPlugin(\n [\n compatBuild(emberApp, undefined, {\n staticAddonTrees: true,\n staticAddonTestSupportTrees: true,\n staticComponents: true,\n staticHelpers: true,\n staticModifiers: true,\n staticEmberSource: true,\n amdCompatibility: {\n es: [],\n },\n }),\n ],\n { shouldTransformPath, nameHint, dryRun }\n );\n}\n\nconst TEMPLATE_ONLY_MARKER = `import templateOnlyComponent from '@ember/component/template-only';`;\nconst TEMPLATE_COLOCATION_MARKER = /\\/\\* import __COLOCATED_TEMPLATE__ from (.*) \\*\\//;\n\nclass TemplateTagCodemodPlugin extends Plugin {\n constructor(inputNodes: InputNode[], readonly options: TemplateTagCodemodOptions) {\n super(inputNodes, {\n name: 'TemplateTagCodemodPlugin',\n });\n }\n async build() {\n function* walkSync(dir: string): Generator<string> {\n const files = readdirSync(dir);\n\n for (const file of files) {\n const pathToFile = join(dir, file);\n const isDirectory = statSync(pathToFile).isDirectory();\n if (isDirectory) {\n yield* walkSync(pathToFile);\n } else {\n yield pathToFile;\n }\n }\n }\n this.inputPaths[0];\n const tmp_path = readFileSync(this.inputPaths[0] + '/.stage2-output').toLocaleString();\n const compatPattern = /#embroider_compat\\/(?<type>[^\\/]+)\\/(?<rest>.*)/;\n const resolver = new ResolverLoader(process.cwd()).resolver;\n const hbs_file_test = /[\\\\/]rewritten-app[\\\\/]components[\\\\/].*\\.hbs$/;\n // locate ember-source for the host app so we know which version to insert builtIns for\n const emberSourceEntrypoint = require.resolve('ember-source', { paths: [process.cwd()] });\n const emberVersion = JSON.parse(readFileSync(join(emberSourceEntrypoint, '../../package.json')).toString()).version;\n\n const ember_template_compiler = resolver.nodeResolve(\n 'ember-source/vendor/ember/ember-template-compiler',\n resolve(locateEmbroiderWorkingDir(process.cwd()), 'rewritten-app', 'package.json')\n );\n if (ember_template_compiler.type === 'not_found') {\n throw 'This will not ever be true';\n }\n\n const embroider_compat_path = require.resolve('@embroider/compat', { paths: [process.cwd()] });\n const babel_plugin_ember_template_compilation = require.resolve('babel-plugin-ember-template-compilation', {\n paths: [embroider_compat_path],\n });\n const babel_plugin_syntax_decorators = require.resolve('@babel/plugin-syntax-decorators', {\n paths: [embroider_compat_path],\n });\n const babel_plugin_syntax_typescript = require.resolve('@babel/plugin-syntax-typescript', {\n paths: [embroider_compat_path],\n });\n const resolver_transform = ResolverTransform({\n appRoot: process.cwd(),\n emberVersion: emberVersion,\n externalNameHint: this.options.nameHint,\n });\n\n for await (const current_file of walkSync(tmp_path)) {\n if (hbs_file_test.test(current_file) && this.options.shouldTransformPath(current_file)) {\n const template_file_src = readFileSync(current_file).toLocaleString();\n\n // run the template transformations using embroider resolver information\n // to replace template values with js import syntax used in g(j/t)s\n let transformed_source =\n transformSync(hbsToJS(template_file_src), {\n plugins: [\n [\n babel_plugin_ember_template_compilation,\n {\n compilerPath: ember_template_compiler.filename,\n transforms: [resolver_transform],\n targetFormat: 'hbs',\n },\n ],\n ],\n filename: current_file,\n })?.code ?? '';\n\n // using transformSync to parse and traverse in one go\n // we're only extracting the transformed template information from previous step\n // and preserving it for later assembly in the backing class\n const import_bucket: NodePath<t.ImportDeclaration>[] = [];\n let template_tag_value = '';\n transformSync(transformed_source, {\n plugins: [\n function template_tag_extractor(): unknown {\n return {\n visitor: {\n ImportDeclaration(import_declaration: NodePath<t.ImportDeclaration>) {\n const extractor = import_declaration.node.source.value.match(compatPattern);\n if (extractor) {\n const result = resolver.nodeResolve(extractor[0], current_file);\n if (result.type === 'real') {\n // find package there the resolver is pointing\n const owner_package = resolver.packageCache.ownerOfFile(result.filename);\n let relative_import_path = relative(owner_package!.root, result.filename);\n // for addons strip off appPublicationDir from relative path\n // we do this on app files as well as they don't contain the\n // path that we strip off\n // this makes sure that ambiguous imports get properly attributed\n relative_import_path = relative_import_path.replace('_app_/', '');\n // remove the extension to match what a developer would normally write\n relative_import_path = relative_import_path.slice(0, -extname(relative_import_path).length);\n\n // change import path to real one\n import_declaration.node.source.value = owner_package!.name + '/' + relative_import_path;\n import_bucket.push(import_declaration);\n }\n } else if (import_declaration.node.source.value.indexOf('@ember/template-compilation') === -1) {\n import_bucket.push(import_declaration);\n }\n },\n CallExpression(path: NodePath<t.CallExpression>) {\n // reverse of hbs to js\n // extract the template string to put into template tag in backing class\n if (\n 'name' in path.node.callee &&\n path.node.callee.name === 'precompileTemplate' &&\n path.node.arguments &&\n 'value' in path.node.arguments[0]\n ) {\n template_tag_value = `<template>\\n\\t${path.node.arguments[0].value}\\n</template>`;\n }\n },\n },\n };\n },\n ],\n });\n\n //find backing class\n const backing_class_resolution = resolver.nodeResolve(\n '#embroider_compat/' + relative(tmp_path, current_file).replace(/[\\\\]/g, '/').slice(0, -4),\n tmp_path\n );\n\n const backing_class_filename = 'filename' in backing_class_resolution ? backing_class_resolution.filename : '';\n // this can be either a generated js file in case of template only components\n // the js or ts file depending on what the app is configured\n const backing_class_src = readFileSync(backing_class_filename).toString();\n\n const is_typescript = extname(backing_class_filename) === '.ts';\n\n let insert_imports_byte_count = null;\n let insert_template_byte_count = null;\n\n const is_template_only = backing_class_src.indexOf(TEMPLATE_ONLY_MARKER) !== -1;\n\n // we parse the backing class to find the insert points for imports and template\n transformSync(backing_class_src, {\n plugins: [\n [\n is_typescript ? babel_plugin_syntax_typescript : babel_plugin_syntax_decorators,\n { decoratorsBeforeExport: true },\n ],\n function glimmer_syntax_creator(/* babel */): unknown {\n return {\n name: 'test',\n visitor: {\n ImportDeclaration(import_declaration: NodePath<t.ImportDeclaration>) {\n insert_imports_byte_count = import_declaration.node.end;\n },\n ExportDefaultDeclaration(path: NodePath<t.ExportDefaultDeclaration>) {\n // convention is that we have a default export for each component\n // we look for the closing bracket of the class body\n path.traverse({\n ClassBody(path) {\n // we substract 1 to find the byte right before the final closing bracket `}`\n // this is the default insert point for template tag though it could live anywhere inside the class body\n // possible future point to add option for putting template first thing in class\n insert_template_byte_count = path.node.end ? path.node.end - 1 : 0;\n },\n });\n },\n },\n };\n },\n ],\n });\n\n // list of imports needed by the previous hbs template extracted in second step\n const hbs_template_required_imports = import_bucket.join('\\n');\n\n // we extracted all we needed from transformed_source so we switch to the second phase\n // transforming the backing class into what will be our final output\n transformed_source = backing_class_src;\n if (is_template_only) {\n // because we can't inject a comment as the default export\n // we replace the known exported string\n transformed_source = transformed_source.replace('templateOnlyComponent()', template_tag_value);\n // we clean known markers from generated files\n transformed_source = transformed_source.replace(TEMPLATE_ONLY_MARKER, hbs_template_required_imports);\n transformed_source = transformed_source.replace(TEMPLATE_COLOCATION_MARKER, '');\n } else {\n // we modify the source from end to start in order to keep our byte counts valid through the transforms\n if (insert_template_byte_count) {\n // first we split the backing class at the byte count we found during backing class parsing\n // then concat the string back together adding the transformed template in the middle\n transformed_source =\n transformed_source.substring(0, insert_template_byte_count) +\n '\\n' +\n template_tag_value +\n '\\n' +\n transformed_source.substring(insert_template_byte_count, transformed_source.length);\n }\n if (insert_imports_byte_count) {\n // first we split the backing class at the byte count we found during backing class parsing\n // then concat the string back together adding the transformed template in the middle\n transformed_source =\n transformed_source.substring(0, insert_imports_byte_count) +\n '\\n' +\n hbs_template_required_imports +\n '\\n' +\n transformed_source.substring(insert_imports_byte_count, transformed_source.length);\n }\n transformed_source = transformed_source.replace(TEMPLATE_COLOCATION_MARKER, '');\n }\n\n const dryRun = this.options.dryRun ? '--dry-run' : '';\n // work out original file path in app tree\n const app_relative_path = join('app', relative(tmp_path, current_file));\n const new_file_path = app_relative_path.slice(0, -4) + (is_typescript ? '.gts' : '.gjs');\n\n // write glimmer file out\n if (this.options.dryRun) {\n console.log('Write new file', new_file_path, transformed_source);\n } else {\n writeFileSync(join(process.cwd(), new_file_path), transformed_source, { flag: 'wx+' });\n }\n\n // git rm old files (js/ts if exists + hbs)\n let rm_hbs = await execute(`git rm ${app_relative_path} ${dryRun}`, {\n pwd: process.cwd(),\n });\n console.log(rm_hbs.output);\n\n if (!is_template_only) {\n // remove backing class only if it's not a template only component\n // resolve relative path to rewritten-app\n const app_relative_path = join('app', relative(tmp_path, backing_class_filename));\n let rm_js = await execute(`git rm ${app_relative_path} ${dryRun}`, {\n pwd: process.cwd(),\n });\n\n console.log(rm_js.output);\n }\n }\n }\n }\n}\n\nasync function execute(\n shellCommand: string,\n opts?: { env?: Record<string, string>; pwd?: string }\n): Promise<{\n exitCode: number;\n stderr: string;\n stdout: string;\n output: string;\n}> {\n let env: Record<string, string | undefined> | undefined;\n if (opts?.env) {\n env = { ...process.env, ...opts.env };\n }\n let child = spawn(shellCommand, {\n stdio: ['inherit', 'pipe', 'pipe'],\n cwd: opts?.pwd,\n shell: true,\n env,\n });\n let stderrBuffer: string[] = [];\n let stdoutBuffer: string[] = [];\n let combinedBuffer: string[] = [];\n child.stderr.on('data', data => {\n stderrBuffer.push(data);\n combinedBuffer.push(data);\n });\n child.stdout.on('data', data => {\n stdoutBuffer.push(data);\n combinedBuffer.push(data);\n });\n return new Promise(resolve => {\n child.on('close', (exitCode: number) => {\n resolve({\n exitCode,\n get stdout() {\n return stdoutBuffer.join('');\n },\n get stderr() {\n return stderrBuffer.join('');\n },\n get output() {\n return combinedBuffer.join('');\n },\n });\n });\n });\n}\n"]}
@@ -1,14 +0,0 @@
1
- import Plugin from 'broccoli-plugin';
2
- import type { Node } from 'broccoli-node-api';
3
- export declare class WriteV1AppBoot extends Plugin {
4
- private lastContents;
5
- constructor();
6
- build(): void;
7
- }
8
- export declare class ReadV1AppBoot extends Plugin {
9
- private appBoot;
10
- private hasBuilt;
11
- constructor(appBootTree: Node);
12
- build(): void;
13
- readAppBoot(): string | undefined;
14
- }
package/src/v1-appboot.js DELETED
@@ -1,47 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.ReadV1AppBoot = exports.WriteV1AppBoot = void 0;
7
- const broccoli_plugin_1 = __importDefault(require("broccoli-plugin"));
8
- const path_1 = require("path");
9
- const fs_extra_1 = require("fs-extra");
10
- class WriteV1AppBoot extends broccoli_plugin_1.default {
11
- constructor() {
12
- super([], {
13
- persistentOutput: true,
14
- needsCache: false,
15
- });
16
- }
17
- build() {
18
- let filename = (0, path_1.join)(this.outputPath, 'config/app-boot.js');
19
- let contents = `{{content-for "app-boot"}}`;
20
- if (!this.lastContents || this.lastContents !== contents) {
21
- (0, fs_extra_1.outputFileSync)(filename, contents);
22
- }
23
- this.lastContents = contents;
24
- }
25
- }
26
- exports.WriteV1AppBoot = WriteV1AppBoot;
27
- class ReadV1AppBoot extends broccoli_plugin_1.default {
28
- constructor(appBootTree) {
29
- super([appBootTree], {
30
- persistentOutput: true,
31
- needsCache: false,
32
- });
33
- this.hasBuilt = false;
34
- }
35
- build() {
36
- this.appBoot = (0, fs_extra_1.readFileSync)((0, path_1.join)(this.inputPaths[0], `config/app-boot.js`), 'utf8');
37
- this.hasBuilt = true;
38
- }
39
- readAppBoot() {
40
- if (!this.hasBuilt) {
41
- throw new Error(`AppBoot not available until after the build`);
42
- }
43
- return this.appBoot;
44
- }
45
- }
46
- exports.ReadV1AppBoot = ReadV1AppBoot;
47
- //# sourceMappingURL=v1-appboot.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"v1-appboot.js","sourceRoot":"","sources":["v1-appboot.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAqC;AAErC,+BAA4B;AAC5B,uCAAwD;AAExD,MAAa,cAAe,SAAQ,yBAAM;IAExC;QACE,KAAK,CAAC,EAAE,EAAE;YACR,gBAAgB,EAAE,IAAI;YACtB,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IACD,KAAK;QACH,IAAI,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAC3D,IAAI,QAAQ,GAAG,4BAA4B,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YACzD,IAAA,yBAAc,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;IAC/B,CAAC;CACF;AAhBD,wCAgBC;AAED,MAAa,aAAc,SAAQ,yBAAM;IAGvC,YAAY,WAAiB;QAC3B,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE;YACnB,gBAAgB,EAAE,IAAI;YACtB,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;QALG,aAAQ,GAAG,KAAK,CAAC;IAMzB,CAAC;IACD,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,IAAA,uBAAY,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,EAAE,MAAM,CAAC,CAAC;QACpF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,WAAW;QACT,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AApBD,sCAoBC","sourcesContent":["import Plugin from 'broccoli-plugin';\nimport type { Node } from 'broccoli-node-api';\nimport { join } from 'path';\nimport { readFileSync, outputFileSync } from 'fs-extra';\n\nexport class WriteV1AppBoot extends Plugin {\n private lastContents: string | undefined;\n constructor() {\n super([], {\n persistentOutput: true,\n needsCache: false,\n });\n }\n build() {\n let filename = join(this.outputPath, 'config/app-boot.js');\n let contents = `{{content-for \"app-boot\"}}`;\n if (!this.lastContents || this.lastContents !== contents) {\n outputFileSync(filename, contents);\n }\n this.lastContents = contents;\n }\n}\n\nexport class ReadV1AppBoot extends Plugin {\n private appBoot: string | undefined;\n private hasBuilt = false;\n constructor(appBootTree: Node) {\n super([appBootTree], {\n persistentOutput: true,\n needsCache: false,\n });\n }\n build() {\n this.appBoot = readFileSync(join(this.inputPaths[0], `config/app-boot.js`), 'utf8');\n this.hasBuilt = true;\n }\n\n readAppBoot() {\n if (!this.hasBuilt) {\n throw new Error(`AppBoot not available until after the build`);\n }\n return this.appBoot;\n }\n}\n"]}