ember-cli 6.9.0-alpha.1 → 6.9.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.
Files changed (36) hide show
  1. package/CHANGELOG.md +100 -167
  2. package/RELEASE.md +20 -13
  3. package/blueprints/http-mock/index.js +6 -1
  4. package/blueprints/http-proxy/index.js +6 -1
  5. package/blueprints/server/index.js +8 -1
  6. package/docs/build/data.json +75 -50
  7. package/lib/commands/addon.js +1 -1
  8. package/lib/commands/asset-sizes.js +8 -0
  9. package/lib/commands/build.js +39 -4
  10. package/lib/commands/destroy.js +15 -1
  11. package/lib/commands/generate.js +15 -1
  12. package/lib/commands/init.js +1 -7
  13. package/lib/commands/new.js +3 -3
  14. package/lib/commands/serve.js +18 -1
  15. package/lib/commands/test.js +25 -2
  16. package/lib/models/command.js +7 -0
  17. package/lib/models/project.js +17 -1
  18. package/lib/tasks/install-blueprint.js +5 -0
  19. package/package.json +8 -8
  20. package/packages/addon-blueprint/index.js +1 -1
  21. package/packages/addon-blueprint/package.json +5 -4
  22. package/packages/app-blueprint/files/.ember-cli +2 -2
  23. package/packages/app-blueprint/files/package.json +13 -13
  24. package/packages/app-blueprint/package.json +5 -4
  25. package/packages/blueprint-blueprint/files/blueprints/__name__/files/.gitkeep +0 -0
  26. package/packages/blueprint-blueprint/files/blueprints/__name__/index.js +0 -16
  27. package/packages/blueprint-blueprint/index.js +0 -5
  28. package/packages/blueprint-blueprint/package.json +0 -12
  29. package/packages/blueprint-model/package.json +0 -18
  30. package/packages/blueprint-model/utilities/directory-for-package-name.js +0 -31
  31. package/packages/blueprint-model/utilities/edit-file-diff.js +0 -64
  32. package/packages/blueprint-model/utilities/experiments.js +0 -63
  33. package/packages/blueprint-model/utilities/file-info.js +0 -170
  34. package/packages/blueprint-model/utilities/open-editor.js +0 -44
  35. package/packages/blueprint-model/utilities/prepend-emoji.js +0 -12
  36. package/packages/blueprint-model/utilities/process-template.js +0 -10
@@ -1,170 +0,0 @@
1
- 'use strict';
2
-
3
- const fs = require('fs');
4
- const util = require('util');
5
- const chalk = require('chalk');
6
- const EditFileDiff = require('./edit-file-diff');
7
- const EOL = require('os').EOL;
8
- const rxEOL = new RegExp(EOL, 'g');
9
- const isBinaryFile = require('isbinaryfile').isBinaryFileSync;
10
- const hash = require('promise.hash.helper');
11
- const canEdit = require('./open-editor').canEdit;
12
- const processTemplate = require('./process-template');
13
-
14
- const readFile = util.promisify(fs.readFile);
15
- const lstat = util.promisify(fs.stat);
16
-
17
- function diffHighlight(line) {
18
- if (line[0] === '+') {
19
- return chalk.green(line);
20
- } else if (line[0] === '-') {
21
- return chalk.red(line);
22
- } else if (/^@@/.test(line)) {
23
- return chalk.cyan(line);
24
- } else {
25
- return line;
26
- }
27
- }
28
-
29
- const NOOP = (_) => _;
30
- class FileInfo {
31
- constructor(options) {
32
- this.action = options.action;
33
- this.outputBasePath = options.outputBasePath;
34
- this.outputPath = options.outputPath;
35
- this.displayPath = options.displayPath;
36
- this.inputPath = options.inputPath;
37
- this.templateVariables = options.templateVariables;
38
- this.replacer = options.replacer || NOOP;
39
- this.ui = options.ui;
40
- }
41
-
42
- confirmOverwrite(path) {
43
- let promptOptions = {
44
- type: 'expand',
45
- name: 'answer',
46
- default: false,
47
- message: `${chalk.red('Overwrite')} ${path}?`,
48
- choices: [
49
- { key: 'y', name: 'Yes, overwrite', value: 'overwrite' },
50
- { key: 'n', name: 'No, skip', value: 'skip' },
51
- ],
52
- };
53
-
54
- let outputPathIsFile = false;
55
- try {
56
- outputPathIsFile = fs.statSync(this.outputPath).isFile();
57
- } catch (err) {
58
- /* ignore */
59
- }
60
-
61
- let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath));
62
-
63
- if (canDiff) {
64
- promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' });
65
-
66
- if (canEdit()) {
67
- promptOptions.choices.push({ key: 'e', name: 'Edit', value: 'edit' });
68
- }
69
- }
70
-
71
- return this.ui.prompt(promptOptions).then((response) => response.answer);
72
- }
73
-
74
- displayDiff() {
75
- let info = this,
76
- jsdiff = require('diff');
77
- return hash({
78
- input: this.render(),
79
- output: readFile(info.outputPath),
80
- }).then((result) => {
81
- let diff = jsdiff.createPatch(
82
- info.outputPath,
83
- result.output.toString().replace(rxEOL, '\n'),
84
- result.input.replace(rxEOL, '\n')
85
- );
86
- let lines = diff.split('\n');
87
-
88
- for (let i = 0; i < lines.length; i++) {
89
- info.ui.write(diffHighlight(lines[i] + EOL));
90
- }
91
- });
92
- }
93
-
94
- async render() {
95
- if (!this.rendered) {
96
- let result = await this._render();
97
- this.rendered = this.replacer(result, this);
98
- }
99
-
100
- return this.rendered;
101
- }
102
-
103
- _render() {
104
- let path = this.inputPath;
105
- let context = this.templateVariables;
106
-
107
- return readFile(path).then((content) =>
108
- lstat(path).then((fileStat) => {
109
- if (isBinaryFile(content, fileStat.size)) {
110
- return content;
111
- } else {
112
- try {
113
- return processTemplate(content.toString(), context);
114
- } catch (err) {
115
- err.message += ` (Error in blueprint template: ${path})`;
116
- throw err;
117
- }
118
- }
119
- })
120
- );
121
- }
122
-
123
- checkForConflict() {
124
- return this.render().then((input) => {
125
- input = input.toString().replace(rxEOL, '\n');
126
-
127
- return readFile(this.outputPath)
128
- .then((output) => {
129
- output = output.toString().replace(rxEOL, '\n');
130
-
131
- return input === output ? 'identical' : 'confirm';
132
- })
133
- .catch((e) => {
134
- if (e.code === 'ENOENT') {
135
- return 'none';
136
- }
137
-
138
- throw e;
139
- });
140
- });
141
- }
142
-
143
- confirmOverwriteTask() {
144
- let info = this;
145
-
146
- return function () {
147
- function doConfirm() {
148
- return info.confirmOverwrite(info.displayPath).then((action) => {
149
- if (action === 'diff') {
150
- return info.displayDiff().then(doConfirm);
151
- } else if (action === 'edit') {
152
- let editFileDiff = new EditFileDiff({ info });
153
- return editFileDiff
154
- .edit()
155
- .then(() => (info.action = action))
156
- .catch(() => doConfirm())
157
- .then(() => info);
158
- } else {
159
- info.action = action;
160
- return info;
161
- }
162
- });
163
- }
164
-
165
- return doConfirm();
166
- };
167
- }
168
- }
169
-
170
- module.exports = FileInfo;
@@ -1,44 +0,0 @@
1
- 'use strict';
2
-
3
- const spawn = require('child_process').spawn;
4
-
5
- function openEditor(file) {
6
- if (!openEditor.canEdit()) {
7
- throw new Error('EDITOR environment variable is not set');
8
- }
9
-
10
- if (!file) {
11
- throw new Error('No `file` option provided');
12
- }
13
-
14
- let editorArgs = openEditor._env().EDITOR.split(' ');
15
- let editor = editorArgs.shift();
16
- const args = [file].concat(editorArgs);
17
- let editProcess = openEditor._spawn(editor, args, { stdio: 'inherit' });
18
-
19
- return new Promise((resolve, reject) => {
20
- editProcess.on('close', (code) => {
21
- if (code === 0) {
22
- resolve();
23
- } else {
24
- reject(
25
- new Error(`Spawn('${editor}', [${args.join(',')}]) exited with a non zero error status code: '${code}'`)
26
- );
27
- }
28
- });
29
- });
30
- }
31
-
32
- openEditor.canEdit = function () {
33
- return openEditor._env().EDITOR !== undefined;
34
- };
35
-
36
- openEditor._env = function () {
37
- return process.env;
38
- };
39
-
40
- openEditor._spawn = function () {
41
- return spawn.apply(this, arguments);
42
- };
43
-
44
- module.exports = openEditor;
@@ -1,12 +0,0 @@
1
- 'use strict';
2
-
3
- function supportEmoji() {
4
- const hasEmojiTurnedOff = process.argv.indexOf('--no-emoji') > -1;
5
- return process.stdout.isTTY && process.platform !== 'win32' && !hasEmojiTurnedOff;
6
- }
7
-
8
- const areEmojiSupported = supportEmoji();
9
-
10
- module.exports = function prependEmoji(emoji, msg) {
11
- return areEmojiSupported ? `${emoji} ${msg}` : msg;
12
- };
@@ -1,10 +0,0 @@
1
- 'use strict';
2
-
3
- module.exports = function processTemplate(content, context) {
4
- let options = {
5
- evaluate: /<%([\s\S]+?)%>/g,
6
- interpolate: /<%=([\s\S]+?)%>/g,
7
- escape: /<%-([\s\S]+?)%>/g,
8
- };
9
- return require('lodash/template')(content, options)(context);
10
- };