Widen entrypoint scope

.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: node_js
 sudo: false
 node_js:

README.md

@@ -30,6 +30,8 @@ export default function(config) {
 
 ## Usage
 
+### Existing `tsconfig.json`
+
 If you have an existing `tsconfig.json` file, be sure to use the correct
 JSX factory:
 
@@ -45,8 +47,13 @@ JSX factory:
 Now you can simply add `.ts`/`.tsx` files to your project, and they'll
 be compiled. Cool. Make sure you use `.tsx` if you want to use JSX.
 
-If you want to incrementally move to TypeScript, enable `allowJs`
-in your `tsconfig.json`:
+### Mixing JavaScript and TypeScript
+
+You might see an error like
+`Module './components/app' was resolved to '/src/components/app.js', but '--allowJs' is not set.`.
+
+To fix this, or if you want to incrementally move to TypeScript, make sure
+`allowJs` is enabled in your `tsconfig.json`:
 
 ```json
 {
@@ -55,3 +62,21 @@ in your `tsconfig.json`:
  }
 }
 ```
+
+### Changing the entrypoint
+
+By default, preact-cli looks for `src/index.js` to start your app. This plugin
+widens the scope to "any file in `src` that starts with `index` and has
+a file extension resolved by webpack" - to change this,
+override the `preact-cli-entrypoint` in `preact.config.js`:
+
+```js
+import { resolve } from 'path'
+
+export default function (config, env, helpers) {
+ preactCliTypeScript(config)
+
+ config.resolve.alias['preact-cli-entrypoint'] = resolve(__dirname, 'src', 'foo-file.foo-extension')
+}
+
+```

package.json

@@ -1,6 +1,6 @@
 {
  "name": "preact-cli-plugin-typescript",
- "version": "0.1.1",
+ "version": "0.1.2",
  "description": "Use TypeScript with preact-cli",
  "keywords": [
  "preact",

src/index.js

@@ -1,3 +1,5 @@
+import { resolve } from 'path'
+
 const preactCliTypeScript = config => {
  if (!config) {
  throw Error('You need to pass the webpack config to preactCliTypeScript')
@@ -8,14 +10,18 @@ const preactCliTypeScript = config => {
  // TODO: If `awesome-typescript-loader` or `ts-loader` is already
  // loaded, warn the user and don't add another one.
 
- // TODO: Make sure webpack is setup to resolve ts/x files.
-
+ // Add the loader to the configuration
  config.module.loaders.push({
  enforce: 'pre',
  test: /\.tsx?$/,
  loader: 'awesome-typescript-loader'
  })
 
+ // Currently, preact-cli only looks for `src/index.js` - this will look
+ // for any file in `src` named `index` that has an extension that's
+ // resolved by webpack. This can be overridden by the user.
+ config.resolve.alias['preact-cli-entrypoint'] = resolve(__dirname, 'src', 'index')
+
  return config
 }
 

src/tsconfig.json

@@ -6,6 +6,7 @@
  "moduleResolution": "node",
  "sourceMap": true,
  "jsx": "react",
- "jsxFactory": "h"
+ "jsxFactory": "h",
+ "allowJs": true
  }
 }