Skip to content

Commit

Permalink
🎨 Support path alias
Browse files Browse the repository at this point in the history
  • Loading branch information
MadratJerry committed Apr 16, 2019
1 parent 511e0fb commit 3bef21c
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 13 deletions.
5 changes: 5 additions & 0 deletions config-overrides.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
const path = require('path')
const RewireReactHotLoader = require('react-app-rewire-hot-loader')
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')

module.exports = function override(config, env) {
config = RewireReactHotLoader(config, env)
config.plugins.push(new MonacoWebpackPlugin())
config.resolve = {
...config.resolve,
alias: { '@': path.resolve(__dirname, 'src') },
}
return config
}
12 changes: 6 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { hot } from 'react-hot-loader'
import React, { ChangeEvent, useState } from 'react'
import Editor, { Props as EditorProps } from './components/Editor'
import Monarch from './lib/tokenizer'
import Token from './lib/tokenizer/token'
import simpleC from './lib/languages/simpleC'
import NavagationButton from './components/NavagationButton'
import React, { useState } from 'react'
import Editor, { Props as EditorProps } from '@/components/Editor'
import Monarch from '@/lib/tokenizer'
import Token from '@/lib/tokenizer/token'
import simpleC from '@/lib/languages/simpleC'
import NavagationButton from '@/components/NavagationButton'

const tokenizer = new Monarch(simpleC)
const App = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/NavagationButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import ClickAwayListener from '@material-ui/core/ClickAwayListener'
import Grow from '@material-ui/core/Grow'
import Paper from '@material-ui/core/Paper'
import Popper from '@material-ui/core/Popper'
import NavagationList from './NavigationList'
import AnimateMenuIcon from './AnimateMenuIcon'
import NavagationList from '@/components/NavigationList'
import AnimateMenuIcon from '@/components/AnimateMenuIcon'

const useStyles = makeStyles(theme => ({
fab: { position: 'fixed', top: 8, left: 8, zIndex: 1 },
Expand Down
4 changes: 2 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'
import * as serviceWorker from './serviceWorker'
import CssBaseline from '@material-ui/core/CssBaseline'
import { createMuiTheme } from '@material-ui/core/styles'
import { ThemeProvider } from '@material-ui/styles'
import App from './App'
import * as serviceWorker from './serviceWorker'
import 'typeface-roboto'

const theme = createMuiTheme({ typography: { useNextVariants: true } })
Expand Down
2 changes: 1 addition & 1 deletion src/lib/languages/simpleC.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IMonarchLanguage } from '../tokenizer/monarchTypes'
import { IMonarchLanguage } from '@/lib/tokenizer/monarchTypes'

// prettier-ignore
const simpleC : IMonarchLanguage = {
Expand Down
11 changes: 9 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"target": "es6",
"lib": ["dom", "dom.iterable", "esnext"],
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
Expand All @@ -21,5 +25,8 @@
"suppressImplicitAnyIndexErrors": true,
"jsx": "preserve"
},
"include": ["src"]
"extends": "./tsconfig.paths.json",
"include": [
"src"
]
}
8 changes: 8 additions & 0 deletions tsconfig.paths.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/*": ["src/*"]
}
}
}

0 comments on commit 3bef21c

Please sign in to comment.