piral-cli 0.15.0-beta.4465 → 0.15.0-beta.4466
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/lib/apps/new-piral.js
CHANGED
|
@@ -59,9 +59,7 @@ function newPiral(baseDir = process.cwd(), options = {}) {
|
|
|
59
59
|
yield (0, common_1.createFileIfNotExists)(root, '.npmrc', `registry=${registry}
|
|
60
60
|
always-auth=true`, forceOverwrite);
|
|
61
61
|
}
|
|
62
|
-
yield (0, common_1.createFileIfNotExists)(root, 'piral.json', JSON.stringify({
|
|
63
|
-
schemaVersion: 'v2',
|
|
64
|
-
}));
|
|
62
|
+
yield (0, common_1.createFileIfNotExists)(root, 'piral.json', JSON.stringify({}));
|
|
65
63
|
(0, common_1.progress)(`Installing npm package ${packageRef} ...`);
|
|
66
64
|
yield (0, common_1.installNpmPackage)(npmClient, packageRef, root, '--save-exact');
|
|
67
65
|
(0, common_1.progress)(`Taking care of templating ...`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":"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"}
|
package/lib/common/importmap.js
CHANGED
|
@@ -78,6 +78,24 @@ function resolveImportmap(dir, importmap) {
|
|
|
78
78
|
(0, log_1.fail)('importMapReferenceNotFound_0027', dir, identifier);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
+
else if (!url.startsWith('.') && !(0, path_1.isAbsolute)(url)) {
|
|
82
|
+
const entry = (0, npm_1.tryResolvePackage)(url, dir);
|
|
83
|
+
if (entry) {
|
|
84
|
+
const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
|
|
85
|
+
const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
|
|
86
|
+
dependencies.push({
|
|
87
|
+
id: `${identifier}@${version}`,
|
|
88
|
+
requireId: `${identifier}@${requireVersion}`,
|
|
89
|
+
entry,
|
|
90
|
+
name: identifier,
|
|
91
|
+
ref: `${assetName}.js`,
|
|
92
|
+
type: 'local',
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
(0, log_1.fail)('importMapReferenceNotFound_0027', dir, url);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
81
99
|
else {
|
|
82
100
|
const entry = (0, path_1.resolve)(dir, url);
|
|
83
101
|
const exists = yield (0, io_1.checkExists)(entry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.15.0-beta.
|
|
3
|
+
"version": "0.15.0-beta.4466",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"typescript": "^4.7.3",
|
|
79
79
|
"yargs": "^15.4.1"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "35d20c9cd14ad55ef8148f13a4fbf70b0e730df4"
|
|
82
82
|
}
|
package/src/apps/new-piral.ts
CHANGED
package/src/common/importmap.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolve, dirname } from 'path';
|
|
1
|
+
import { resolve, dirname, isAbsolute } from 'path';
|
|
2
2
|
import { log, fail } from './log';
|
|
3
3
|
import { satisfies, validate } from './version';
|
|
4
4
|
import { computeHash } from './hash';
|
|
@@ -84,6 +84,24 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
|
|
|
84
84
|
} else {
|
|
85
85
|
fail('importMapReferenceNotFound_0027', dir, identifier);
|
|
86
86
|
}
|
|
87
|
+
} else if (!url.startsWith('.') && !isAbsolute(url)) {
|
|
88
|
+
const entry = tryResolvePackage(url, dir);
|
|
89
|
+
|
|
90
|
+
if (entry) {
|
|
91
|
+
const packageJson = await findFile(dirname(entry), 'package.json');
|
|
92
|
+
const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
|
|
93
|
+
|
|
94
|
+
dependencies.push({
|
|
95
|
+
id: `${identifier}@${version}`,
|
|
96
|
+
requireId: `${identifier}@${requireVersion}`,
|
|
97
|
+
entry,
|
|
98
|
+
name: identifier,
|
|
99
|
+
ref: `${assetName}.js`,
|
|
100
|
+
type: 'local',
|
|
101
|
+
});
|
|
102
|
+
} else {
|
|
103
|
+
fail('importMapReferenceNotFound_0027', dir, url);
|
|
104
|
+
}
|
|
87
105
|
} else {
|
|
88
106
|
const entry = resolve(dir, url);
|
|
89
107
|
const exists = await checkExists(entry);
|
package/src/common/npm.test.ts
CHANGED
|
@@ -454,12 +454,12 @@ describe('npm Module', () => {
|
|
|
454
454
|
|
|
455
455
|
it('makeExternals without externals returns coreExternals', () => {
|
|
456
456
|
const externals = makeExternals(process.cwd(), { piral: '*' });
|
|
457
|
-
expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', '
|
|
457
|
+
expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
|
|
458
458
|
});
|
|
459
459
|
|
|
460
460
|
it('makeExternals with no externals returns coreExternals', () => {
|
|
461
461
|
const externals = makeExternals(process.cwd(), { piral: '*' }, []);
|
|
462
|
-
expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', '
|
|
462
|
+
expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
|
|
463
463
|
});
|
|
464
464
|
|
|
465
465
|
it('makeExternals with exclude coreExternals returns empty set', () => {
|
|
@@ -476,19 +476,18 @@ describe('npm Module', () => {
|
|
|
476
476
|
'react-dom',
|
|
477
477
|
'react-router',
|
|
478
478
|
'react-router-dom',
|
|
479
|
-
'history',
|
|
480
479
|
'tslib',
|
|
481
480
|
]);
|
|
482
481
|
});
|
|
483
482
|
|
|
484
483
|
it('makeExternals with external duplicate only reflects coreExternals', () => {
|
|
485
484
|
const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'foo']);
|
|
486
|
-
expect(externals).toEqual(['react', 'foo', 'react-dom', 'react-router', 'react-router-dom', '
|
|
485
|
+
expect(externals).toEqual(['react', 'foo', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
|
|
487
486
|
});
|
|
488
487
|
|
|
489
488
|
it('makeExternals with explicit include and exclude', () => {
|
|
490
|
-
const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-calendar', '!
|
|
491
|
-
expect(externals).toEqual(['react', 'react-calendar', 'react-dom', 'react-router', 'react-router-dom'
|
|
489
|
+
const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-calendar', '!tslib']);
|
|
490
|
+
expect(externals).toEqual(['react', 'react-calendar', 'react-dom', 'react-router', 'react-router-dom']);
|
|
492
491
|
});
|
|
493
492
|
|
|
494
493
|
it('makeExternals with all exclude and explicit include', () => {
|