ember-cli 6.10.0-alpha.1 → 6.10.0-beta.1
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.
- package/CHANGELOG.md +131 -219
- package/CONTRIBUTING.md +30 -34
- package/README.md +9 -21
- package/RELEASE.md +11 -9
- package/bin/ember +16 -13
- package/blueprints/addon-import/index.js +4 -4
- package/docs/build/data.json +9 -9
- package/lib/broccoli/ember-app.js +1 -1
- package/lib/commands/generate.js +1 -1
- package/lib/commands/init.js +1 -1
- package/lib/commands/new.js +1 -1
- package/lib/commands/test.js +0 -3
- package/lib/commands/unknown.js +1 -1
- package/lib/debug/deprecate.js +1 -1
- package/lib/models/asset-size-printer.js +3 -3
- package/lib/models/blueprint.js +6 -6
- package/lib/models/builder.js +1 -1
- package/lib/models/command.js +2 -2
- package/lib/models/hardware-info.js +5 -2
- package/lib/models/instrumentation.js +2 -2
- package/lib/models/project.js +3 -3
- package/lib/models/watcher.js +1 -1
- package/lib/models/worker.js +2 -2
- package/lib/tasks/addon-install.js +1 -1
- package/lib/tasks/build-watch.js +2 -2
- package/lib/tasks/build.js +1 -1
- package/lib/tasks/git-init.js +2 -2
- package/lib/tasks/install-blueprint.js +1 -1
- package/lib/tasks/interactive-new.js +5 -5
- package/lib/tasks/npm-task.js +2 -2
- package/lib/tasks/serve.js +1 -1
- package/lib/tasks/server/express-server.js +1 -1
- package/lib/tasks/test-server.js +1 -1
- package/lib/utilities/find-build-file.js +2 -2
- package/lib/utilities/get-lang-arg.js +4 -4
- package/lib/utilities/heimdall-progress.js +5 -2
- package/lib/utilities/lint-fix.js +1 -1
- package/lib/utilities/markdown-color.js +1 -1
- package/lib/utilities/print-command.js +1 -1
- package/lib/utilities/require-as-hash.js +10 -8
- package/lib/utilities/windows-admin.js +1 -1
- package/package.json +60 -55
- package/packages/addon-blueprint/additional-package.json +1 -3
- package/packages/addon-blueprint/index.js +1 -1
- package/packages/addon-blueprint/package.json +5 -5
- package/packages/app-blueprint/files/package.json +9 -9
- package/packages/app-blueprint/index.js +1 -1
- package/packages/app-blueprint/package.json +5 -5
- package/tests/helpers/acceptance.js +1 -1
- package/tests/helpers/command-generator.js +2 -2
- package/tests/helpers/package-cache.js +1 -1
- package/tests/helpers/process-help-string.js +3 -3
- package/tests/helpers/run-command.js +1 -1
- package/lib/utilities/execa.js +0 -20
- package/packages/blueprint-blueprint/files/blueprints/__name__/files/.gitkeep +0 -0
- package/packages/blueprint-blueprint/files/blueprints/__name__/index.js +0 -16
- package/packages/blueprint-blueprint/index.js +0 -5
- package/packages/blueprint-blueprint/package.json +0 -13
- package/packages/blueprint-model/package.json +0 -19
- package/packages/blueprint-model/utilities/directory-for-package-name.js +0 -31
- package/packages/blueprint-model/utilities/edit-file-diff.js +0 -64
- package/packages/blueprint-model/utilities/experiments.js +0 -63
- package/packages/blueprint-model/utilities/file-info.js +0 -170
- package/packages/blueprint-model/utilities/open-editor.js +0 -44
- package/packages/blueprint-model/utilities/prepend-emoji.js +0 -12
- package/packages/blueprint-model/utilities/process-template.js +0 -10
|
@@ -27,7 +27,7 @@ class InteractiveNewTask extends Task {
|
|
|
27
27
|
return [
|
|
28
28
|
{
|
|
29
29
|
name: 'blueprint',
|
|
30
|
-
type: '
|
|
30
|
+
type: 'select',
|
|
31
31
|
message: 'Is this an app or an addon?',
|
|
32
32
|
choices: [
|
|
33
33
|
{
|
|
@@ -59,7 +59,7 @@ class InteractiveNewTask extends Task {
|
|
|
59
59
|
},
|
|
60
60
|
{
|
|
61
61
|
name: 'langSelection',
|
|
62
|
-
type: '
|
|
62
|
+
type: 'select',
|
|
63
63
|
message: ({ blueprint }) => `Please provide the spoken/content language of your ${blueprint}:`,
|
|
64
64
|
when: !newCommandOptions.lang,
|
|
65
65
|
choices: await this.getLangChoices(),
|
|
@@ -79,7 +79,7 @@ class InteractiveNewTask extends Task {
|
|
|
79
79
|
},
|
|
80
80
|
{
|
|
81
81
|
name: 'packageManager',
|
|
82
|
-
type: '
|
|
82
|
+
type: 'select',
|
|
83
83
|
message: 'Pick the package manager to use when installing dependencies:',
|
|
84
84
|
when: !newCommandOptions.packageManager,
|
|
85
85
|
choices: [
|
|
@@ -103,7 +103,7 @@ class InteractiveNewTask extends Task {
|
|
|
103
103
|
},
|
|
104
104
|
{
|
|
105
105
|
name: 'ciProvider',
|
|
106
|
-
type: '
|
|
106
|
+
type: 'select',
|
|
107
107
|
message: 'Which CI provider do you want to use?',
|
|
108
108
|
when: !newCommandOptions.ciProvider,
|
|
109
109
|
choices: [
|
|
@@ -165,7 +165,7 @@ class InteractiveNewTask extends Task {
|
|
|
165
165
|
}
|
|
166
166
|
|
|
167
167
|
getUserLocale() {
|
|
168
|
-
const osLocale = require('os-locale');
|
|
168
|
+
const { osLocale } = require('os-locale');
|
|
169
169
|
|
|
170
170
|
return osLocale();
|
|
171
171
|
}
|
package/lib/tasks/npm-task.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
const chalk = require('chalk');
|
|
4
|
-
const execa = require('
|
|
3
|
+
const { default: chalk } = require('chalk');
|
|
4
|
+
const { execa } = require('execa');
|
|
5
5
|
const semver = require('semver');
|
|
6
6
|
const SilentError = require('silent-error');
|
|
7
7
|
const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
|
package/lib/tasks/serve.js
CHANGED
|
@@ -9,7 +9,7 @@ const ServerWatcher = require('../models/server-watcher');
|
|
|
9
9
|
const Builder = require('../models/builder');
|
|
10
10
|
const SilentError = require('silent-error');
|
|
11
11
|
const serveURL = require('../utilities/get-serve-url');
|
|
12
|
-
const pDefer = require('p-defer');
|
|
12
|
+
const { default: pDefer } = require('p-defer');
|
|
13
13
|
|
|
14
14
|
function mockWatcher(distDir) {
|
|
15
15
|
let watcher = Promise.resolve({ directory: distDir });
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
const path = require('path');
|
|
4
4
|
const EventEmitter = require('events').EventEmitter;
|
|
5
|
-
const chalk = require('chalk');
|
|
5
|
+
const { default: chalk } = require('chalk');
|
|
6
6
|
const fs = require('fs');
|
|
7
7
|
const debounce = require('lodash/debounce');
|
|
8
8
|
const mapSeries = require('promise-map-series');
|
package/lib/tasks/test-server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
-
const
|
|
2
|
+
const { findUpSync } = require('find-up');
|
|
3
3
|
const path = require('path');
|
|
4
4
|
const url = require('url');
|
|
5
5
|
|
|
@@ -7,7 +7,7 @@ module.exports = async function (dir) {
|
|
|
7
7
|
let buildFilePath = null;
|
|
8
8
|
|
|
9
9
|
for (let ext of ['js', 'mjs', 'cjs']) {
|
|
10
|
-
let candidate =
|
|
10
|
+
let candidate = findUpSync(`ember-cli-build.${ext}`, { cwd: dir });
|
|
11
11
|
if (candidate) {
|
|
12
12
|
buildFilePath = candidate;
|
|
13
13
|
break;
|
|
@@ -236,10 +236,10 @@ function getBodyMsg(langArg) {
|
|
|
236
236
|
return isValidCodeAndProg(langArg)
|
|
237
237
|
? getValidAndProgMsg(langArg)
|
|
238
238
|
: isProgLang(langArg)
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
239
|
+
? getProgLangMsg(langArg)
|
|
240
|
+
: startsWithHyphen(langArg)
|
|
241
|
+
? getCliMsg(langArg)
|
|
242
|
+
: getLangCodeMsg(langArg);
|
|
243
243
|
}
|
|
244
244
|
|
|
245
245
|
function getFullMsg(langArg) {
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
const { default: chalk } = require('chalk');
|
|
4
|
+
|
|
3
5
|
module.exports = function progress(heimdalljs = require('heimdalljs')) {
|
|
4
6
|
let current = heimdalljs.current;
|
|
5
7
|
const stack = [current.id.name];
|
|
6
8
|
|
|
7
|
-
while (current = current.parent) {
|
|
9
|
+
while ((current = current.parent)) {
|
|
10
|
+
// eslint-disable-line
|
|
8
11
|
stack.push(current.id.name);
|
|
9
12
|
}
|
|
10
13
|
|
|
@@ -15,5 +18,5 @@ module.exports = function progress(heimdalljs = require('heimdalljs')) {
|
|
|
15
18
|
};
|
|
16
19
|
|
|
17
20
|
module.exports.format = function (text) {
|
|
18
|
-
return
|
|
21
|
+
return chalk.green('building... ') + (text ? `[${text}]` : '');
|
|
19
22
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
const execa = require('
|
|
3
|
+
const { execa } = require('execa');
|
|
4
4
|
const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
|
|
5
5
|
const prependEmoji = require('@ember-tooling/blueprint-model/utilities/prepend-emoji');
|
|
6
6
|
|
|
@@ -13,18 +13,20 @@ const stringUtils = require('ember-cli-string-utils');
|
|
|
13
13
|
// Hamster: Hamster // Same as require('./hamster.js')
|
|
14
14
|
// }
|
|
15
15
|
|
|
16
|
-
const globSync = require('glob')
|
|
16
|
+
const { globSync } = require('glob');
|
|
17
17
|
const path = require('path');
|
|
18
18
|
const getCallerFile = require('get-caller-file');
|
|
19
19
|
|
|
20
20
|
module.exports = requireAsHash;
|
|
21
21
|
function requireAsHash(pattern, type) {
|
|
22
22
|
let callerFileDir = path.dirname(getCallerFile());
|
|
23
|
-
return globSync(pattern, { cwd: callerFileDir })
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
23
|
+
return globSync(pattern, { cwd: callerFileDir })
|
|
24
|
+
.sort()
|
|
25
|
+
.reduce((hash, file) => {
|
|
26
|
+
const klass = require(`${callerFileDir}/${file}`);
|
|
27
|
+
if (!type || klass.prototype instanceof type) {
|
|
28
|
+
hash[stringUtils.classify(path.basename(file, '.js'))] = klass;
|
|
29
|
+
}
|
|
30
|
+
return hash;
|
|
31
|
+
}, {});
|
|
30
32
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ember-cli",
|
|
3
|
-
"version": "6.10.0-
|
|
3
|
+
"version": "6.10.0-beta.1",
|
|
4
4
|
"description": "Command line tool for developing ambitious ember.js apps",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"app",
|
|
@@ -31,13 +31,15 @@
|
|
|
31
31
|
"minor": "prerelease",
|
|
32
32
|
"patch": "prerelease"
|
|
33
33
|
},
|
|
34
|
-
"semverIncrementTag": "
|
|
35
|
-
"publishTag": "
|
|
34
|
+
"semverIncrementTag": "beta",
|
|
35
|
+
"publishTag": "beta"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@ember/
|
|
39
|
-
"@
|
|
40
|
-
"
|
|
38
|
+
"@ember-tooling/blueprint-blueprint": "^0.2.1",
|
|
39
|
+
"@ember-tooling/blueprint-model": "^0.5.0",
|
|
40
|
+
"@ember/app-blueprint": "~6.10.0-beta.1",
|
|
41
|
+
"@pnpm/find-workspace-dir": "^1000.1.3",
|
|
42
|
+
"babel-remove-types": "^1.0.2",
|
|
41
43
|
"broccoli": "^4.0.0",
|
|
42
44
|
"broccoli-concat": "^4.2.5",
|
|
43
45
|
"broccoli-config-loader": "^1.0.1",
|
|
@@ -52,115 +54,113 @@
|
|
|
52
54
|
"broccoli-stew": "^3.0.0",
|
|
53
55
|
"calculate-cache-key-for-tree": "^2.0.0",
|
|
54
56
|
"capture-exit": "^2.0.0",
|
|
55
|
-
"chalk": "^
|
|
56
|
-
"ci-info": "^4.
|
|
57
|
+
"chalk": "^5.6.2",
|
|
58
|
+
"ci-info": "^4.3.1",
|
|
57
59
|
"clean-base-url": "^1.0.0",
|
|
58
|
-
"compression": "^1.8.
|
|
59
|
-
"configstore": "^
|
|
60
|
+
"compression": "^1.8.1",
|
|
61
|
+
"configstore": "^7.1.0",
|
|
60
62
|
"console-ui": "^3.1.2",
|
|
61
|
-
"content-tag": "^
|
|
63
|
+
"content-tag": "^4.0.0",
|
|
62
64
|
"core-object": "^3.1.5",
|
|
63
65
|
"dag-map": "^2.0.2",
|
|
64
|
-
"diff": "^
|
|
66
|
+
"diff": "^8.0.2",
|
|
65
67
|
"ember-cli-is-package-missing": "^1.0.0",
|
|
66
68
|
"ember-cli-normalize-entity-name": "^1.0.0",
|
|
67
69
|
"ember-cli-preprocess-registry": "^5.0.1",
|
|
68
70
|
"ember-cli-string-utils": "^1.1.0",
|
|
69
71
|
"ensure-posix-path": "^1.1.1",
|
|
70
|
-
"execa": "^
|
|
72
|
+
"execa": "^9.6.1",
|
|
71
73
|
"exit": "^0.1.2",
|
|
72
|
-
"express": "^
|
|
73
|
-
"filesize": "^
|
|
74
|
-
"find-up": "^
|
|
74
|
+
"express": "^5.2.1",
|
|
75
|
+
"filesize": "^11.0.13",
|
|
76
|
+
"find-up": "^8.0.0",
|
|
75
77
|
"find-yarn-workspace-root": "^2.0.0",
|
|
76
78
|
"fixturify-project": "^2.1.1",
|
|
77
|
-
"fs-extra": "^11.3.
|
|
79
|
+
"fs-extra": "^11.3.3",
|
|
78
80
|
"fs-tree-diff": "^2.0.1",
|
|
79
81
|
"get-caller-file": "^2.0.5",
|
|
80
82
|
"git-repo-info": "^2.1.1",
|
|
81
|
-
"glob": "^
|
|
83
|
+
"glob": "^13.0.0",
|
|
82
84
|
"heimdalljs": "^0.2.6",
|
|
83
85
|
"heimdalljs-fs-monitor": "^1.1.2",
|
|
84
86
|
"heimdalljs-graph": "^1.0.0",
|
|
85
87
|
"heimdalljs-logger": "^0.1.10",
|
|
86
88
|
"http-proxy": "^1.18.1",
|
|
87
|
-
"inflection": "^
|
|
88
|
-
"inquirer": "^
|
|
89
|
+
"inflection": "^3.0.2",
|
|
90
|
+
"inquirer": "^13.1.0",
|
|
89
91
|
"is-git-url": "^1.0.0",
|
|
90
|
-
"is-language-code": "^
|
|
91
|
-
"isbinaryfile": "^
|
|
92
|
+
"is-language-code": "^5.1.0",
|
|
93
|
+
"isbinaryfile": "^6.0.0",
|
|
92
94
|
"lodash": "^4.17.21",
|
|
93
95
|
"markdown-it": "^14.1.0",
|
|
94
96
|
"markdown-it-terminal": "^0.4.0",
|
|
95
|
-
"minimatch": "^
|
|
96
|
-
"morgan": "^1.10.
|
|
97
|
+
"minimatch": "^10.1.1",
|
|
98
|
+
"morgan": "^1.10.1",
|
|
97
99
|
"nopt": "^3.0.6",
|
|
98
|
-
"npm-package-arg": "^
|
|
99
|
-
"os-locale": "^
|
|
100
|
-
"p-defer": "^
|
|
100
|
+
"npm-package-arg": "^13.0.2",
|
|
101
|
+
"os-locale": "^6.0.2",
|
|
102
|
+
"p-defer": "^4.0.1",
|
|
101
103
|
"portfinder": "^1.0.32",
|
|
102
104
|
"promise-map-series": "^0.3.0",
|
|
103
105
|
"promise.hash.helper": "^1.0.8",
|
|
104
|
-
"quick-temp": "^0.1.
|
|
105
|
-
"resolve": "^1.22.
|
|
106
|
+
"quick-temp": "^0.1.9",
|
|
107
|
+
"resolve": "^1.22.11",
|
|
106
108
|
"resolve-package-path": "^4.0.3",
|
|
107
109
|
"safe-stable-stringify": "^2.4.3",
|
|
108
110
|
"sane": "^5.0.1",
|
|
109
|
-
"semver": "^7.7.
|
|
111
|
+
"semver": "^7.7.3",
|
|
110
112
|
"silent-error": "^1.1.1",
|
|
111
|
-
"sort-package-json": "^
|
|
113
|
+
"sort-package-json": "^3.6.0",
|
|
112
114
|
"symlink-or-copy": "^1.3.1",
|
|
113
115
|
"temp": "0.9.4",
|
|
114
|
-
"testem": "^3.
|
|
116
|
+
"testem": "^3.17.0",
|
|
115
117
|
"tiny-lr": "^2.0.0",
|
|
116
118
|
"tree-sync": "^2.1.0",
|
|
117
|
-
"walk-sync": "^
|
|
119
|
+
"walk-sync": "^4.0.1",
|
|
118
120
|
"watch-detector": "^1.0.2",
|
|
119
|
-
"workerpool": "^
|
|
121
|
+
"workerpool": "^10.0.1",
|
|
120
122
|
"yam": "^1.0.0",
|
|
121
|
-
"@ember-tooling/
|
|
122
|
-
"@ember-tooling/classic-build-
|
|
123
|
-
"@ember-tooling/classic-build-app-blueprint": "6.10.0-alpha.1",
|
|
124
|
-
"@ember-tooling/blueprint-model": "0.5.0"
|
|
123
|
+
"@ember-tooling/classic-build-addon-blueprint": "6.10.0-beta.1",
|
|
124
|
+
"@ember-tooling/classic-build-app-blueprint": "6.10.0-beta.1"
|
|
125
125
|
},
|
|
126
126
|
"devDependencies": {
|
|
127
127
|
"broccoli-plugin": "^4.0.3",
|
|
128
128
|
"broccoli-test-helper": "^2.0.0",
|
|
129
|
-
"chai": "^
|
|
130
|
-
"chai-as-promised": "^
|
|
129
|
+
"chai": "^6.2.1",
|
|
130
|
+
"chai-as-promised": "^8.0.2",
|
|
131
131
|
"chai-files": "^1.4.0",
|
|
132
132
|
"chai-jest-snapshot": "^2.0.0",
|
|
133
|
+
"concurrently": "^9.2.1",
|
|
133
134
|
"ember-cli-blueprint-test-helpers": "^0.19.2",
|
|
134
135
|
"ember-cli-internal-test-helpers": "^0.9.1",
|
|
135
136
|
"eslint": "^8.44.0",
|
|
136
|
-
"eslint-config-prettier": "^
|
|
137
|
+
"eslint-config-prettier": "^10.1.8",
|
|
137
138
|
"eslint-plugin-chai-expect": "^3.0.0",
|
|
138
139
|
"eslint-plugin-mocha": "^10.5.0",
|
|
139
|
-
"eslint-plugin-n": "^
|
|
140
|
-
"eslint-plugin-prettier": "^4.2.1",
|
|
140
|
+
"eslint-plugin-n": "^17.23.1",
|
|
141
141
|
"fixturify": "^3.0.0",
|
|
142
142
|
"jsdom": "^21.1.1",
|
|
143
|
-
"latest-version": "^
|
|
144
|
-
"mocha": "^11.
|
|
145
|
-
"nock": "^
|
|
146
|
-
"nyc": "^
|
|
147
|
-
"prettier": "
|
|
143
|
+
"latest-version": "^9.0.0",
|
|
144
|
+
"mocha": "^11.7.5",
|
|
145
|
+
"nock": "^14.0.10",
|
|
146
|
+
"nyc": "^17.1.0",
|
|
147
|
+
"prettier": "3.7.4",
|
|
148
148
|
"release-plan": "^0.17.2",
|
|
149
|
-
"strip-ansi": "^
|
|
150
|
-
"supertest": "^7.1.
|
|
149
|
+
"strip-ansi": "^7.1.2",
|
|
150
|
+
"supertest": "^7.1.4",
|
|
151
151
|
"testdouble": "^3.18.0",
|
|
152
|
-
"tmp": "^0.2.
|
|
152
|
+
"tmp": "^0.2.5",
|
|
153
153
|
"tmp-promise": "^3.0.3",
|
|
154
154
|
"websocket": "^1.0.32",
|
|
155
|
-
"which": "
|
|
155
|
+
"which": "6.0.0",
|
|
156
156
|
"yuidoc-ember-cli-theme": "^1.0.4",
|
|
157
157
|
"yuidocjs": "0.10.2"
|
|
158
158
|
},
|
|
159
159
|
"engines": {
|
|
160
|
-
"node": ">= 20.
|
|
160
|
+
"node": ">= 20.19.0"
|
|
161
161
|
},
|
|
162
162
|
"volta": {
|
|
163
|
-
"node": "20.
|
|
163
|
+
"node": "20.19.6",
|
|
164
164
|
"pnpm": "10.12.1"
|
|
165
165
|
},
|
|
166
166
|
"publishConfig": {
|
|
@@ -168,7 +168,12 @@
|
|
|
168
168
|
},
|
|
169
169
|
"scripts": {
|
|
170
170
|
"docs": "yuidoc",
|
|
171
|
-
"
|
|
171
|
+
"format": "prettier . --cache --write",
|
|
172
|
+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --group --names \"lint:\" --prefixColors auto --timings",
|
|
173
|
+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --group --names \"fix:\" --prefixColors auto --timings && pnpm format",
|
|
174
|
+
"lint:format": "prettier . --cache --check",
|
|
175
|
+
"lint:js": "eslint . --cache",
|
|
176
|
+
"lint:js:fix": "eslint . --fix",
|
|
172
177
|
"mocha": "pnpm exec mocha --require ./tests/bootstrap.js tests/**/*-test.js",
|
|
173
178
|
"test": "node --unhandled-rejections=strict tests/runner",
|
|
174
179
|
"test:all": "node --unhandled-rejections=strict tests/runner all",
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
const fs = require('fs-extra');
|
|
4
4
|
const path = require('path');
|
|
5
5
|
const walkSync = require('walk-sync');
|
|
6
|
-
const chalk = require('chalk');
|
|
6
|
+
const { default: chalk } = require('chalk');
|
|
7
7
|
const stringUtil = require('ember-cli-string-utils');
|
|
8
8
|
const merge = require('lodash/merge');
|
|
9
9
|
const uniq = require('lodash/uniq');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-tooling/classic-build-addon-blueprint",
|
|
3
|
-
"version": "6.10.0-
|
|
3
|
+
"version": "6.10.0-beta.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/ember-cli/ember-cli.git",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"ember-blueprint"
|
|
12
12
|
],
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@ember-tooling/blueprint-model": "
|
|
15
|
-
"chalk": "^
|
|
14
|
+
"@ember-tooling/blueprint-model": "^0.5.0",
|
|
15
|
+
"chalk": "^5.6.2",
|
|
16
16
|
"ember-cli-normalize-entity-name": "^1.0.0",
|
|
17
17
|
"ember-cli-string-utils": "^1.1.0",
|
|
18
18
|
"fs-extra": "^11.3.0",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"minor": "prerelease",
|
|
27
27
|
"patch": "prerelease"
|
|
28
28
|
},
|
|
29
|
-
"semverIncrementTag": "
|
|
30
|
-
"publishTag": "
|
|
29
|
+
"semverIncrementTag": "beta",
|
|
30
|
+
"publishTag": "beta"
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -45,9 +45,9 @@
|
|
|
45
45
|
"@ember/test-helpers": "^5.4.1<% if (embroider) { %>",
|
|
46
46
|
"@embroider/compat": "^3.9.3",
|
|
47
47
|
"@embroider/core": "^3.5.9<% } %>",
|
|
48
|
-
"@embroider/macros": "^1.19.
|
|
48
|
+
"@embroider/macros": "^1.19.6<% if (embroider) { %>",
|
|
49
49
|
"@embroider/webpack": "^4.1.2<% } %>",
|
|
50
|
-
"@eslint/js": "^9.39.
|
|
50
|
+
"@eslint/js": "^9.39.2",
|
|
51
51
|
"@glimmer/component": "^2.0.0",
|
|
52
52
|
"@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
|
|
53
53
|
"@glint/environment-ember-loose": "^1.5.2",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"broccoli-asset-rev": "^3.0.0",
|
|
61
61
|
"concurrently": "^9.2.1",
|
|
62
62
|
"ember-auto-import": "^2.12.0",
|
|
63
|
-
"ember-cli": "~6.10.0-
|
|
63
|
+
"ember-cli": "~6.10.0-beta.1",
|
|
64
64
|
"ember-cli-app-version": "^7.0.0",
|
|
65
65
|
"ember-cli-babel": "^8.2.0",
|
|
66
66
|
"ember-cli-clean-css": "^3.0.0",
|
|
@@ -76,11 +76,11 @@
|
|
|
76
76
|
"ember-page-title": "^9.0.3",
|
|
77
77
|
"ember-qunit": "^9.0.4",
|
|
78
78
|
"ember-resolver": "^13.1.1",
|
|
79
|
-
"ember-source": "~6.10.0-
|
|
80
|
-
"ember-template-imports": "^4.
|
|
79
|
+
"ember-source": "~6.10.0-beta.1",
|
|
80
|
+
"ember-template-imports": "^4.4.0",
|
|
81
81
|
"ember-template-lint": "^6.1.0<% if (welcome) { %>",
|
|
82
82
|
"ember-welcome-page": "^7.0.2<% } %>",
|
|
83
|
-
"eslint": "^9.39.
|
|
83
|
+
"eslint": "^9.39.2",
|
|
84
84
|
"eslint-config-prettier": "^9.1.2",
|
|
85
85
|
"eslint-plugin-ember": "^12.7.5",
|
|
86
86
|
"eslint-plugin-n": "^17.23.1",
|
|
@@ -89,14 +89,14 @@
|
|
|
89
89
|
"loader.js": "^4.7.0",
|
|
90
90
|
"prettier": "^3.7.4",
|
|
91
91
|
"prettier-plugin-ember-template-tag": "^2.1.2",
|
|
92
|
-
"qunit": "^2.
|
|
92
|
+
"qunit": "^2.25.0",
|
|
93
93
|
"qunit-dom": "^3.5.0",
|
|
94
94
|
"stylelint": "^16.26.1",
|
|
95
95
|
"stylelint-config-standard": "^36.0.1",
|
|
96
96
|
"tracked-built-ins": "^3.4.0<% if (typescript) { %>",
|
|
97
97
|
"typescript": "^5.9.3",
|
|
98
|
-
"typescript-eslint": "^8.
|
|
99
|
-
"webpack": "^5.
|
|
98
|
+
"typescript-eslint": "^8.52.0<% } %>",
|
|
99
|
+
"webpack": "^5.104.1"
|
|
100
100
|
},
|
|
101
101
|
"engines": {
|
|
102
102
|
"node": ">= 20.19"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
const stringUtil = require('ember-cli-string-utils');
|
|
4
|
-
const chalk = require('chalk');
|
|
4
|
+
const { default: chalk } = require('chalk');
|
|
5
5
|
const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilities/experiments');
|
|
6
6
|
const directoryForPackageName = require('@ember-tooling/blueprint-model/utilities/directory-for-package-name');
|
|
7
7
|
const blueprintVersion = require('./package.json').version;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ember-tooling/classic-build-app-blueprint",
|
|
3
|
-
"version": "6.10.0-
|
|
3
|
+
"version": "6.10.0-beta.1",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/ember-cli/ember-cli.git",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"ember-blueprint"
|
|
12
12
|
],
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@ember-tooling/blueprint-model": "
|
|
15
|
-
"chalk": "^
|
|
14
|
+
"@ember-tooling/blueprint-model": "^0.5.0",
|
|
15
|
+
"chalk": "^5.6.2",
|
|
16
16
|
"ember-cli-string-utils": "^1.1.0"
|
|
17
17
|
},
|
|
18
18
|
"release-plan": {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"minor": "prerelease",
|
|
21
21
|
"patch": "prerelease"
|
|
22
22
|
},
|
|
23
|
-
"semverIncrementTag": "
|
|
24
|
-
"publishTag": "
|
|
23
|
+
"semverIncrementTag": "beta",
|
|
24
|
+
"publishTag": "beta"
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -5,7 +5,7 @@ const path = require('path');
|
|
|
5
5
|
const fs = require('fs-extra');
|
|
6
6
|
// eslint-disable-next-line n/no-unpublished-require
|
|
7
7
|
const tmp = require('tmp-promise');
|
|
8
|
-
const execa = require('execa');
|
|
8
|
+
const { execa } = require('execa');
|
|
9
9
|
|
|
10
10
|
const runCommand = require('./run-command');
|
|
11
11
|
const hasGlobalYarn = require('../helpers/has-global-yarn');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
const
|
|
3
|
+
const { execaSync } = require('execa');
|
|
4
4
|
|
|
5
5
|
/**
|
|
6
6
|
* A simple tool to make behavior and API consistent between commands
|
|
@@ -45,6 +45,6 @@ module.exports = class CommandGenerator {
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
_invoke(args, options) {
|
|
48
|
-
return
|
|
48
|
+
return execaSync(this.program, args, options);
|
|
49
49
|
}
|
|
50
50
|
};
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
const fs = require('fs-extra');
|
|
4
4
|
const path = require('path');
|
|
5
5
|
const quickTemp = require('quick-temp');
|
|
6
|
-
const Configstore = require('configstore');
|
|
6
|
+
const { default: Configstore } = require('configstore');
|
|
7
7
|
const CommandGenerator = require('./command-generator');
|
|
8
8
|
const stableStringify = require('safe-stable-stringify');
|
|
9
9
|
const symlinkOrCopySync = require('symlink-or-copy').sync;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
const
|
|
3
|
+
const { supportsColor } = require('chalk');
|
|
4
4
|
// eslint-disable-next-line n/no-unpublished-require
|
|
5
|
-
const stripAnsi = require('strip-ansi');
|
|
5
|
+
const { default: stripAnsi } = require('strip-ansi');
|
|
6
6
|
|
|
7
7
|
module.exports = function (helpString) {
|
|
8
8
|
// currently windows
|
|
9
|
-
if (
|
|
9
|
+
if (supportsColor) {
|
|
10
10
|
return helpString;
|
|
11
11
|
}
|
|
12
12
|
return stripAnsi(helpString);
|
package/lib/utilities/execa.js
DELETED
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
const execa = require('execa');
|
|
4
|
-
const logger = require('heimdalljs-logger')('ember-cli:execa');
|
|
5
|
-
|
|
6
|
-
async function _execa(cmd, args, opts) {
|
|
7
|
-
logger.info('execa(%j, %j)', cmd, args);
|
|
8
|
-
let result = await execa(cmd, args, opts);
|
|
9
|
-
logger.info('execa(%j, %j) -> code: %d', cmd, args, result.code);
|
|
10
|
-
return result;
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
_execa.sync = function (cmd, args, opts) {
|
|
14
|
-
logger.info('execa.sync(%j, %j)', cmd, args);
|
|
15
|
-
let result = execa.sync(cmd, args, opts);
|
|
16
|
-
logger.info('execa.sync(%j, %j) -> code: %d', cmd, args, result.code);
|
|
17
|
-
return result;
|
|
18
|
-
};
|
|
19
|
-
|
|
20
|
-
module.exports = _execa;
|
|
File without changes
|