@vendure/ui-devkit 2.0.0-beta.1 → 2.0.0-beta.3
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/compiler/compile.js +4 -2
- package/compiler/compile.js.map +1 -1
- package/compiler/scaffold.d.ts +1 -0
- package/compiler/scaffold.js +8 -56
- package/compiler/scaffold.js.map +1 -1
- package/compiler/types.d.ts +17 -0
- package/package.json +9 -9
- package/scaffold/angular.json +3 -3
package/compiler/compile.js
CHANGED
|
@@ -54,7 +54,8 @@ function runCompileMode(outputPath, baseHref, extensions, usingYarn, args) {
|
|
|
54
54
|
const distPath = path.join(outputPath, 'dist');
|
|
55
55
|
const compile = () => new Promise(async (resolve, reject) => {
|
|
56
56
|
await (0, scaffold_1.setupScaffold)(outputPath, extensions);
|
|
57
|
-
|
|
57
|
+
await (0, scaffold_1.setBaseHref)(outputPath, baseHref);
|
|
58
|
+
const commandArgs = ['run', 'build', ...buildProcessArguments(args)];
|
|
58
59
|
if (!usingYarn) {
|
|
59
60
|
// npm requires `--` before any command line args being passed to a script
|
|
60
61
|
commandArgs.splice(2, 0, '--');
|
|
@@ -89,12 +90,13 @@ function runWatchMode(outputPath, baseHref, port, extensions, usingYarn, args) {
|
|
|
89
90
|
};
|
|
90
91
|
const compile = () => new Promise(async (resolve, reject) => {
|
|
91
92
|
await (0, scaffold_1.setupScaffold)(outputPath, extensions);
|
|
93
|
+
await (0, scaffold_1.setBaseHref)(outputPath, baseHref);
|
|
92
94
|
const adminUiExtensions = extensions.filter(utils_1.isAdminUiExtension);
|
|
93
95
|
const normalizedExtensions = (0, utils_1.normalizeExtensions)(adminUiExtensions);
|
|
94
96
|
const globalStylesExtensions = extensions.filter(utils_1.isGlobalStylesExtension);
|
|
95
97
|
const staticAssetExtensions = extensions.filter(utils_1.isStaticAssetExtension);
|
|
96
98
|
const allTranslationFiles = (0, translations_1.getAllTranslationFiles)(extensions.filter(utils_1.isTranslationExtension));
|
|
97
|
-
buildProcess = (0, child_process_1.spawn)(cmd, ['run', 'start', `--port=${port}`,
|
|
99
|
+
buildProcess = (0, child_process_1.spawn)(cmd, ['run', 'start', `--port=${port}`, ...buildProcessArguments(args)], {
|
|
98
100
|
cwd: outputPath,
|
|
99
101
|
shell: true,
|
|
100
102
|
stdio: 'inherit',
|
package/compiler/compile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../src/compiler/compile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,iDAAoD;AACpD,uCAA6D;AAC7D,6CAA+B;AAC/B,2CAA6B;AAE7B,2CAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../src/compiler/compile.ts"],"names":[],"mappings":"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"}
|
package/compiler/scaffold.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Extension } from './types';
|
|
2
2
|
export declare function setupScaffold(outputPath: string, extensions: Extension[]): Promise<void>;
|
|
3
3
|
export declare function copyGlobalStyleFile(outputPath: string, stylePath: string): Promise<void>;
|
|
4
|
+
export declare function setBaseHref(outputPath: string, baseHref: string): Promise<void>;
|
package/compiler/scaffold.js
CHANGED
|
@@ -23,9 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.copyGlobalStyleFile = exports.setupScaffold = void 0;
|
|
27
|
-
/* eslint-disable no-console */
|
|
28
|
-
const child_process_1 = require("child_process");
|
|
26
|
+
exports.setBaseHref = exports.copyGlobalStyleFile = exports.setupScaffold = void 0;
|
|
29
27
|
const fs = __importStar(require("fs-extra"));
|
|
30
28
|
const glob_1 = require("glob");
|
|
31
29
|
const path = __importStar(require("path"));
|
|
@@ -47,13 +45,6 @@ async function setupScaffold(outputPath, extensions) {
|
|
|
47
45
|
const allTranslationFiles = (0, translations_1.getAllTranslationFiles)(extensions.filter(utils_1.isTranslationExtension));
|
|
48
46
|
await (0, translations_1.mergeExtensionTranslations)(outputPath, allTranslationFiles);
|
|
49
47
|
(0, utils_1.copyUiDevkit)(outputPath);
|
|
50
|
-
try {
|
|
51
|
-
await checkIfNgccWasRun();
|
|
52
|
-
}
|
|
53
|
-
catch (e) {
|
|
54
|
-
const cmd = (0, utils_1.shouldUseYarn)() ? 'yarn ngcc' : 'npx ngcc';
|
|
55
|
-
utils_1.logger.log(`An error occurred when running ngcc. Try removing node_modules, re-installing, and then manually running "${cmd}" in the project root.`);
|
|
56
|
-
}
|
|
57
48
|
}
|
|
58
49
|
exports.setupScaffold = setupScaffold;
|
|
59
50
|
/**
|
|
@@ -212,6 +203,13 @@ function copyAdminUiSource(outputPath, modulePathMapping) {
|
|
|
212
203
|
fs.ensureDirSync(outputSrc);
|
|
213
204
|
fs.copySync(adminUiSrc, outputSrc);
|
|
214
205
|
}
|
|
206
|
+
async function setBaseHref(outputPath, baseHref) {
|
|
207
|
+
const angularJsonFilePath = path.join(outputPath, '/angular.json');
|
|
208
|
+
const angularJson = await fs.readJSON(angularJsonFilePath, 'utf-8');
|
|
209
|
+
angularJson.projects['vendure-admin'].architect.build.options.baseHref = baseHref;
|
|
210
|
+
await fs.writeJSON(angularJsonFilePath, angularJson, { spaces: 2 });
|
|
211
|
+
}
|
|
212
|
+
exports.setBaseHref = setBaseHref;
|
|
215
213
|
/**
|
|
216
214
|
* Adds module path mapping to the bundled tsconfig.json file if defined as a UI extension.
|
|
217
215
|
*/
|
|
@@ -224,50 +222,4 @@ function configureModulePathMapping(tsconfigFilePath, modulePathMapping) {
|
|
|
224
222
|
tsconfig.compilerOptions.paths = modulePathMapping;
|
|
225
223
|
fs.writeFileSync(tsconfigFilePath, JSON.stringify(tsconfig, null, 2));
|
|
226
224
|
}
|
|
227
|
-
/**
|
|
228
|
-
* Attempts to find out it the ngcc compiler has been run on the Angular packages, and if not,
|
|
229
|
-
* attemps to run it. This is done this way because attempting to run ngcc from a sub-directory
|
|
230
|
-
* where the angular libs are in a higher-level node_modules folder currently results in the error
|
|
231
|
-
* NG6002, see https://github.com/angular/angular/issues/35747.
|
|
232
|
-
*
|
|
233
|
-
* However, when ngcc is run from the root, it works.
|
|
234
|
-
*/
|
|
235
|
-
async function checkIfNgccWasRun() {
|
|
236
|
-
const coreUmdFile = require.resolve('@vendure/admin-ui/core');
|
|
237
|
-
if (!coreUmdFile) {
|
|
238
|
-
utils_1.logger.error('Could not resolve the "@vendure/admin-ui/core" package!');
|
|
239
|
-
return;
|
|
240
|
-
}
|
|
241
|
-
// ngcc creates a particular folder after it has been run once
|
|
242
|
-
const ivyDir = path.join(coreUmdFile, '../..', '__ivy_ngcc__');
|
|
243
|
-
if (fs.existsSync(ivyDir)) {
|
|
244
|
-
return;
|
|
245
|
-
}
|
|
246
|
-
// Looks like ngcc has not been run, so attempt to do so.
|
|
247
|
-
const rootDir = coreUmdFile.split('node_modules')[0];
|
|
248
|
-
return new Promise((resolve, reject) => {
|
|
249
|
-
utils_1.logger.log('Running the Angular Ivy compatibility compiler (ngcc) on Vendure Admin UI dependencies ' +
|
|
250
|
-
'(this is only needed on the first run)...');
|
|
251
|
-
const cmd = (0, utils_1.shouldUseYarn)() ? 'yarn' : 'npx';
|
|
252
|
-
const ngccProcess = (0, child_process_1.spawn)(cmd, [
|
|
253
|
-
'ngcc',
|
|
254
|
-
'--properties es2015 browser module main',
|
|
255
|
-
'--first-only',
|
|
256
|
-
'--create-ivy-entry-points',
|
|
257
|
-
'-l=error',
|
|
258
|
-
], {
|
|
259
|
-
cwd: rootDir,
|
|
260
|
-
shell: true,
|
|
261
|
-
stdio: 'inherit',
|
|
262
|
-
});
|
|
263
|
-
ngccProcess.on('close', code => {
|
|
264
|
-
if (code !== 0) {
|
|
265
|
-
reject(code);
|
|
266
|
-
}
|
|
267
|
-
else {
|
|
268
|
-
resolve();
|
|
269
|
-
}
|
|
270
|
-
});
|
|
271
|
-
});
|
|
272
|
-
}
|
|
273
225
|
//# sourceMappingURL=scaffold.js.map
|
package/compiler/scaffold.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../src/compiler/scaffold.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../src/compiler/scaffold.ts"],"names":[],"mappings":"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"}
|
package/compiler/types.d.ts
CHANGED
|
@@ -314,6 +314,23 @@ export interface UiExtensionCompilerOptions {
|
|
|
314
314
|
* of the app, for example with the default value of `'/admin/'`, the Admin UI app
|
|
315
315
|
* will be configured to be served from `http://<host>/admin/`.
|
|
316
316
|
*
|
|
317
|
+
* Note: if you are using this in conjunction with the {@link AdminUiPlugin} then you should
|
|
318
|
+
* also set the `route` option to match this value.
|
|
319
|
+
*
|
|
320
|
+
* @example
|
|
321
|
+
* ```TypeScript
|
|
322
|
+
* AdminUiPlugin.init({
|
|
323
|
+
* route: 'my-route',
|
|
324
|
+
* port: 5001,
|
|
325
|
+
* app: compileUiExtensions({
|
|
326
|
+
* baseHref: '/my-route/',
|
|
327
|
+
* outputPath: path.join(__dirname, './custom-admin-ui'),
|
|
328
|
+
* extensions: [],
|
|
329
|
+
* devMode: true,
|
|
330
|
+
* }),
|
|
331
|
+
* }),
|
|
332
|
+
* ```
|
|
333
|
+
*
|
|
317
334
|
* @default '/admin/'
|
|
318
335
|
*/
|
|
319
336
|
baseHref?: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/ui-devkit",
|
|
3
|
-
"version": "2.0.0-beta.
|
|
3
|
+
"version": "2.0.0-beta.3",
|
|
4
4
|
"description": "A library for authoring Vendure Admin UI extensions",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"vendure",
|
|
@@ -36,12 +36,12 @@
|
|
|
36
36
|
"url": "https://github.com/vendure-ecommerce/vendure/issues"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@angular-devkit/build-angular": "^
|
|
40
|
-
"@angular/cli": "^
|
|
41
|
-
"@angular/compiler": "^
|
|
42
|
-
"@angular/compiler-cli": "^
|
|
43
|
-
"@vendure/admin-ui": "
|
|
44
|
-
"@vendure/common": "
|
|
39
|
+
"@angular-devkit/build-angular": "^16.0.3",
|
|
40
|
+
"@angular/cli": "^16.0.3",
|
|
41
|
+
"@angular/compiler": "^16.0.3",
|
|
42
|
+
"@angular/compiler-cli": "^16.0.3",
|
|
43
|
+
"@vendure/admin-ui": "2.0.0-beta.3",
|
|
44
|
+
"@vendure/common": "2.0.0-beta.3",
|
|
45
45
|
"chalk": "^4.1.0",
|
|
46
46
|
"chokidar": "^3.5.1",
|
|
47
47
|
"fs-extra": "^10.0.0",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@rollup/plugin-node-resolve": "^15.0.1",
|
|
53
53
|
"@types/fs-extra": "^11.0.1",
|
|
54
|
-
"@vendure/core": "
|
|
54
|
+
"@vendure/core": "2.0.0-beta.3",
|
|
55
55
|
"rimraf": "^3.0.2",
|
|
56
56
|
"rollup": "^3.18.0",
|
|
57
57
|
"rollup-plugin-terser": "^7.0.2",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"tslib": "^2.5.0",
|
|
60
60
|
"typescript": "4.9.5"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "609e2ed4a0f8b5101a5fa0824e2caca791efca66"
|
|
63
63
|
}
|
package/scaffold/angular.json
CHANGED
|
@@ -46,11 +46,12 @@
|
|
|
46
46
|
}
|
|
47
47
|
],
|
|
48
48
|
"styles": [
|
|
49
|
-
"src/
|
|
49
|
+
"src/global-styles.scss"
|
|
50
50
|
],
|
|
51
51
|
"stylePreprocessorOptions": {
|
|
52
52
|
"includePaths": [
|
|
53
|
-
"./src/styles"
|
|
53
|
+
"./src/styles",
|
|
54
|
+
"./src/fonts"
|
|
54
55
|
]
|
|
55
56
|
},
|
|
56
57
|
"allowedCommonJsDependencies": [
|
|
@@ -114,7 +115,6 @@
|
|
|
114
115
|
}
|
|
115
116
|
}
|
|
116
117
|
},
|
|
117
|
-
"defaultProject": "vendure-admin",
|
|
118
118
|
"schematics": {
|
|
119
119
|
"@schematics/angular:component": {
|
|
120
120
|
"skipTests": true,
|