Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ts-node for dev #704

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/snowpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
},
"bin": {
"sp": "pkg/dist-node/index.bin.js",
"snowpack": "pkg/dist-node/index.bin.js"
"snowpack": "pkg/dist-node/index.bin.js",
"snowpack-ts": "scripts/ts-node.js"
},
"@pika/pack": {
"pipeline": [
Expand Down Expand Up @@ -91,5 +92,9 @@
"validate-npm-package-name": "^3.0.0",
"ws": "^7.3.0",
"yargs-parser": "^18.1.3"
},
"devDependencies": {
"ts-node": "^8.10.2",
"typescript": "^3.9.7"
}
}
3 changes: 3 additions & 0 deletions packages/snowpack/scripts/ts-node.bin.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { cli } from '../src/index'

cli(process.argv)
16 changes: 16 additions & 0 deletions packages/snowpack/scripts/ts-node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env node

const path = require('path');
const tsNode = require('ts-node/dist/bin');

const curArgs = process.argv.slice(2);
const tsNodeArgs = curArgs.splice(0, curArgs.indexOf('--'));
const snowpackArgs = curArgs.splice(curArgs.indexOf('--') + 1);

const rootPath = path.resolve(__dirname, '../');
const tsConfigPath = path.resolve(rootPath, './tsconfig.ts-node.json');
const tsNodeBinPath = path.resolve(__dirname, './ts-node.bin.ts');

const args = tsNodeArgs.concat(['-P', tsConfigPath, '--dir', rootPath, tsNodeBinPath]).concat(snowpackArgs);

tsNode.main(args);
10 changes: 9 additions & 1 deletion packages/snowpack/src/commands/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,15 @@ import {
} from '../util';
import {command as installCommand} from './install';
import {getPort, paint} from './paint';
const HMR_DEV_CODE = readFileSync(path.join(__dirname, '../assets/hmr.js'));

const indexOfSrc = __dirname.indexOf('/src/');
const srcPath = __dirname.slice(0, indexOfSrc);
const hrmDevFilePath =
indexOfSrc === -1
? path.join(__dirname, '../assets/hmr.js')
: path.join(srcPath, './assets/hmr.js');

const HMR_DEV_CODE = readFileSync(hrmDevFilePath);

const DEFAULT_PROXY_ERROR_HANDLER = (
err: Error,
Expand Down
14 changes: 7 additions & 7 deletions packages/snowpack/src/commands/install.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import {performance} from 'perf_hooks';
import rimraf from 'rimraf';
import {InputOptions, OutputOptions, rollup, RollupError} from 'rollup';
import validatePackageName from 'validate-npm-package-name';
import {resolveTargetsFromRemoteCDN} from '../resolve-remote.js';
import {rollupPluginCatchUnresolved} from '../rollup-plugins/rollup-plugin-catch-unresolved.js';
import {resolveTargetsFromRemoteCDN} from '../resolve-remote';
import {rollupPluginCatchUnresolved} from '../rollup-plugins/rollup-plugin-catch-unresolved';
import {rollupPluginCatchFetch} from '../rollup-plugins/rollup-plugin-catch-fetch';
import {rollupPluginCss} from '../rollup-plugins/rollup-plugin-css';
import {rollupPluginDependencyCache} from '../rollup-plugins/rollup-plugin-remote-cdn.js';
import {rollupPluginDependencyStats} from '../rollup-plugins/rollup-plugin-stats.js';
import {rollupPluginDependencyCache} from '../rollup-plugins/rollup-plugin-remote-cdn';
import {rollupPluginDependencyStats} from '../rollup-plugins/rollup-plugin-stats';
import {rollupPluginWrapInstallTargets} from '../rollup-plugins/rollup-plugin-wrap-install-targets';
import {scanDepList, scanImports, scanImportsFromFiles} from '../scan-imports.js';
import {printStats} from '../stats-formatter.js';
import {scanDepList, scanImports, scanImportsFromFiles} from '../scan-imports';
import {printStats} from '../stats-formatter';
import {
CommandOptions,
DependencyStatsOutput,
Expand All @@ -41,7 +41,7 @@ import {
writeLockfile,
isPackageAliasEntry,
findMatchingAliasEntry,
} from '../util.js';
} from '../util';

type InstallResultCode = 'SUCCESS' | 'ASSET' | 'FAIL';

Expand Down
6 changes: 3 additions & 3 deletions packages/snowpack/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import {addCommand, rmCommand} from './commands/add-rm';
import {command as buildCommand} from './commands/build';
import {command as devCommand} from './commands/dev';
import {command as installCommand} from './commands/install';
import {loadAndValidateConfig} from './config.js';
import {loadAndValidateConfig} from './config';
import {CLIFlags} from './types/snowpack';
import {clearCache, readLockfile} from './util.js';
import {clearCache, readLockfile} from './util';

export {install as unstable_installCommand} from './commands/install';
export {createConfiguration} from './config.js';
export {createConfiguration} from './config';
export * from './types/snowpack';

const cwd = process.cwd();
Expand Down
2 changes: 1 addition & 1 deletion packages/snowpack/src/resolve-remote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as colors from 'kleur/colors';
import PQueue from 'p-queue';
import validatePackageName from 'validate-npm-package-name';
import {SnowpackConfig, ImportMap} from './types/snowpack';
import {fetchCDNResource, PIKA_CDN, RESOURCE_CACHE} from './util.js';
import {fetchCDNResource, PIKA_CDN, RESOURCE_CACHE} from './util';

/**
* Given an install specifier, attempt to resolve it from the CDN.
Expand Down
18 changes: 18 additions & 0 deletions packages/snowpack/tsconfig.ts-node.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"ts-node": {
"transpileOnly": true
},
"compilerOptions": {
"target": "ES2015",
"module": "CommonJS",
"moduleResolution": "node",
"esModuleInterop": true,
"strict": true,
"noImplicitAny": false,
"noUnusedLocals": true,
"noUnusedParameters": true,
"jsx": "react"
},
"include": ["src/**/*", "@types/**/*", "scripts/ts-node.bin.ts"],
"exclude": ["node_modules"]
}