Skip to content

Commit dbd749d

Browse files
author
Template Bot
committed
Apply template update: [js] Update typescript 5.9.3 → 6.0.2 (major)
Source: mockdeep/Rails-Template#1384
1 parent c8da2ee commit dbd749d

5 files changed

Lines changed: 125 additions & 86 deletions

File tree

app/javascript/application.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @ts-nocheck
22
import "@hotwired/turbo-rails";
33
import "@rails/activestorage";
4+
<<<<<<< HEAD
45
import * as bootstrap from "bootstrap";
56

67
window.bootstrap = bootstrap;
@@ -341,3 +342,10 @@ window.StoryList = StoryList;
341342
window.AppView = AppView;
342343

343344
export { Story, StoryView, StoryList, AppView };
345+
=======
346+
import {session} from "@hotwired/turbo";
347+
348+
import "./controllers/index";
349+
350+
session.drive = false;
351+
>>>>>>> 70fbdce (Update typescript to version 6.0.2 (#1384))

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"stylelint-config-recess-order": "^7.7.0",
4747
"stylelint-config-standard": "^40.0.0",
4848
"stylelint-selector-bem-pattern": "^4.0.1",
49-
"typescript": "^5.9.3",
49+
"typescript": "^6.0.2",
5050
"typescript-eslint": "^8.57.2",
5151
"vitest": "^4.1.0"
5252
},

0 commit comments

Comments
 (0)