Skip to content

Commit 04d037c

Browse files
authored
Merge pull request #16 from oslabs-beta/CHRONOS-71-AWS-index.js-to-ts
CHRONOS-71
2 parents 6fecc88 + 9263220 commit 04d037c

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
import React from 'react';
1313
import { render } from 'react-dom';
1414
import { Provider } from 'react-redux';
15-
import App from './App.jsx';
15+
import App from './App';
1616
import store from './store';
1717
import './styles.css';
1818

1919
render(
2020
<Provider store={store}>
2121
<App/>
2222
</Provider>,
23-
document.getElementById('contents')
23+
document.getElementById('contents') as HTMLElement //Included Type Assertion
2424
);
2525

2626

examples/AWS/AWS-EC2/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/AWS/AWS-EC2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "unit-13-DevOps",
2+
"name": "unit13devops",
33
"version": "1.0.0",
44
"description": "MegaMarket Loyalty Card Tracker ",
55
"main": "index.js",

examples/AWS/AWS-EC2/webpack.config.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
55
module.exports = {
66
entry: [
77
// entry point of our app
8-
'./client/index.js'
8+
'./client/index.tsx'
99
],
1010
output: {
1111
path: path.resolve(__dirname, 'dist'),
@@ -41,8 +41,16 @@ module.exports = {
4141
},
4242
},
4343
},
44+
resolve: {
45+
extensions: ['.ts', '.tsx', '.js', '.jsx', '.json'], // Add .ts and .tsx extensions
46+
},
4447
module: {
4548
rules: [
49+
{
50+
test: /\.tsx?$/, // Handle .ts and .tsx files
51+
use: 'ts-loader',
52+
exclude: /node_modules/,
53+
},
4654
{
4755
test: /.(js|jsx)$/,
4856
exclude: /node_modules/,

0 commit comments

Comments
 (0)