Skip to content

Commit 6d9e6a0

Browse files
committed
Support for globs in packager and switch to new packager
1 parent da534f7 commit 6d9e6a0

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

packages/app/src/sandbox/eval/presets/angular-cli/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ async function addAngularJSONResources(manager) {
6363
for (let i = 0; i < styles.length; i++) {
6464
const p = styles[i];
6565

66-
const finalPath = absolute(join(project.root, p));
66+
const finalPath = absolute(join(project.root, p.input || p));
6767

6868
const tModule = await manager.resolveTranspiledModuleAsync(
6969
finalPath,
@@ -103,7 +103,7 @@ async function addAngularCLIResources(manager) {
103103
/* eslint-disable no-await-in-loop */
104104
for (let i = 0; i < styles.length; i++) {
105105
const p = styles[i];
106-
const finalPath = absolute(join(app.root || 'src', p));
106+
const finalPath = absolute(join(app.root || 'src', p.input || p));
107107

108108
const tModule = await manager.resolveTranspiledModuleAsync(
109109
finalPath,

packages/app/src/sandbox/eval/transpiled-module.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,14 @@ export default class TranspiledModule {
596596
// We now know that this has been transpiled on the server, so we shortcut
597597
const loaderContext = this.getLoaderContext(manager, {});
598598
// These are precomputed requires, for npm dependencies
599-
requires.forEach(r => loaderContext.addDependency(r));
599+
requires.forEach(r => {
600+
if (r.indexOf('glob:') === 0) {
601+
const reGlob = r.replace('glob:', '');
602+
loaderContext.addDependenciesInDirectory(reGlob);
603+
} else {
604+
loaderContext.addDependency(r);
605+
}
606+
});
600607

601608
code = this.module.code;
602609
} else {

packages/app/src/sandbox/npm/fetch-dependencies.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ const VERSION = 1;
1818

1919
const BUCKET_URL =
2020
process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test'
21-
? 'https://d1jyvh0kxilfa7.cloudfront.net'
22-
: 'https://dev-packager-packages.csb.dev';
23-
24-
const NEW_PACKAGER_URL =
25-
'https://aiwi8rnkp5.execute-api.eu-west-1.amazonaws.com/prod/packages';
21+
? 'https://prod-packager-packages.codesandbox.io'
22+
: 'https://dev-packager-packages.codesandbox.io';
2623

2724
const PACKAGER_URL =
2825
process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test'
29-
? 'https://drq28qbjmc.execute-api.eu-west-1.amazonaws.com/prod/packages'
26+
? 'https://aiwi8rnkp5.execute-api.eu-west-1.amazonaws.com/prod/packages'
3027
: 'https://xi5p9f7czk.execute-api.eu-west-1.amazonaws.com/dev/packages';
3128

3229
function callApi(url: string, method = 'GET') {

0 commit comments

Comments
 (0)