@optimizely/ocp-cli 1.1.9 → 1.1.10
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/dist/lib/AppUpdater.js +17 -9
- package/dist/lib/AppUpdater.js.map +1 -1
- package/dist/oo-cli.manifest.json +1 -1
- package/package.json +1 -1
- package/src/lib/AppUpdater.ts +23 -18
package/dist/lib/AppUpdater.js
CHANGED
|
@@ -112,7 +112,7 @@ var AppUpdater;
|
|
|
112
112
|
AppUpdater.ensureDependencies = ensureDependencies;
|
|
113
113
|
function getPackageDependencies(prod = false) {
|
|
114
114
|
try {
|
|
115
|
-
const result = child_process.spawnSync(`yarn --no-progress ${prod ? '--prod ' : ''}-s list --json --pattern=@zaiusinc
|
|
115
|
+
const result = child_process.spawnSync(`yarn --no-progress ${prod ? '--prod ' : ''}-s list --json --pattern=@zaiusinc/ --non-interactive`, { cwd: process.cwd(), shell: true });
|
|
116
116
|
if (result.status === 0) {
|
|
117
117
|
const tree = JSON.parse(result.stdout.toString());
|
|
118
118
|
const output = {};
|
|
@@ -137,15 +137,23 @@ var AppUpdater;
|
|
|
137
137
|
return (0, semver_1.compare)(ocpVersion, projectModuleversion) === 0;
|
|
138
138
|
}
|
|
139
139
|
function ensurePublicPackageUsage() {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
140
|
+
try {
|
|
141
|
+
const result = child_process.spawnSync('yarn --no-progress --prod -s list --json --pattern="@zaius/app-sdk|@zaius/node-sdk" --non-interactive', { cwd: process.cwd(), shell: true });
|
|
142
|
+
if (result.status === 0) {
|
|
143
|
+
const tree = JSON.parse(result.stdout.toString());
|
|
144
|
+
if (!tree.data.trees.length) {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
console.log(chalk.red('@zaius/app-sdk & @zaius/node-sdk are no longer supported. ' +
|
|
148
|
+
'Please update your package.json to use the @zaiusinc scope for these packages.'));
|
|
149
|
+
process.exit(1);
|
|
145
150
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
151
|
+
else {
|
|
152
|
+
console.error(result.stderr.toString());
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
catch (e) {
|
|
156
|
+
console.error(e);
|
|
149
157
|
}
|
|
150
158
|
console.log(chalk.red("Unable to get package dependencies. Are you in your app's working directory?"));
|
|
151
159
|
process.exit(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppUpdater.js","sourceRoot":"","sources":["../../src/lib/AppUpdater.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,+CAA+C;AAC/C,2CAA+B;AAC/B,mCAAsC;AACtC,qCAA8C;AAC9C,+CAAiD;AACjD,uDAAmD;AACnD,uDAAkD;AAClD,oCAAqC;AAGrC,IAAiB,UAAU,
|
|
1
|
+
{"version":3,"file":"AppUpdater.js","sourceRoot":"","sources":["../../src/lib/AppUpdater.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/lib/AppUpdater.ts
CHANGED
|
@@ -128,7 +128,7 @@ export namespace AppUpdater {
|
|
|
128
128
|
export function getPackageDependencies(prod: boolean = false): {[name: string]: string} {
|
|
129
129
|
try {
|
|
130
130
|
const result = child_process.spawnSync(
|
|
131
|
-
`yarn --no-progress ${prod ? '--prod ' : ''}-s list --json --pattern=@zaiusinc
|
|
131
|
+
`yarn --no-progress ${prod ? '--prod ' : ''}-s list --json --pattern=@zaiusinc/ --non-interactive`,
|
|
132
132
|
{cwd: process.cwd(), shell: true}
|
|
133
133
|
);
|
|
134
134
|
|
|
@@ -155,26 +155,31 @@ export namespace AppUpdater {
|
|
|
155
155
|
}
|
|
156
156
|
|
|
157
157
|
function ensurePublicPackageUsage() {
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
158
|
+
try {
|
|
159
|
+
const result = child_process.spawnSync(
|
|
160
|
+
'yarn --no-progress --prod -s list --json --pattern="@zaius/app-sdk|@zaius/node-sdk" --non-interactive',
|
|
161
|
+
{cwd: process.cwd(), shell: true}
|
|
162
|
+
);
|
|
162
163
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
164
|
+
if (result.status === 0) {
|
|
165
|
+
const tree = JSON.parse(result.stdout.toString());
|
|
166
|
+
if (!tree.data.trees.length) {
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
168
169
|
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
170
|
+
console.log(
|
|
171
|
+
chalk.red(
|
|
172
|
+
'@zaius/app-sdk & @zaius/node-sdk are no longer supported. ' +
|
|
173
|
+
'Please update your package.json to use the @zaiusinc scope for these packages.'
|
|
174
|
+
)
|
|
175
|
+
);
|
|
176
|
+
process.exit(1);
|
|
177
|
+
} else {
|
|
178
|
+
console.error(result.stderr.toString());
|
|
179
|
+
}
|
|
180
|
+
} catch (e) {
|
|
181
|
+
console.error(e);
|
|
176
182
|
}
|
|
177
|
-
|
|
178
183
|
console.log(chalk.red("Unable to get package dependencies. Are you in your app's working directory?"));
|
|
179
184
|
process.exit(1);
|
|
180
185
|
}
|