Typescript, types & template helper name

StorytellerCZ · Dec 21, 2022 · f072a4d · f072a4d
1 parent f82a306
commit f072a4d
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 16 deletions.
diff --git a/accounts-line/CHANGELOG.md b/accounts-line/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+## 1.3.0 - 2022-12-21
+* Typescript re-write
+* Add `zodern:types` for type support
+
 ## 1.2.3 - 2021-06-24
 * Compatibility fix for Meteor 2.3
 

diff --git a/accounts-line/line.js → accounts-line/line.ts b/accounts-line/line.js → accounts-line/line.ts
diff --git a/accounts-line/main.ts b/accounts-line/main.ts
@@ -0,0 +1,2 @@
+import './line'
+import './notice'
diff --git a/accounts-line/notice.js → accounts-line/notice.ts b/accounts-line/notice.js → accounts-line/notice.ts
diff --git a/accounts-line/package-types.json b/accounts-line/package-types.json
@@ -0,0 +1,3 @@
+{
+  "typesEntry": "main.ts"
+}
diff --git a/accounts-line/package.js b/accounts-line/package.js
@@ -1,13 +1,14 @@
 Package.describe({
   name: 'storyteller:accounts-line',
   summary: 'Login service for LINE accounts',
-  version: '1.2.3',
+  version: '1.3.0',
   git: 'https://github.com/StorytellerCZ/meteor-accounts-line'
 });
 
 Package.onUse(api => {
-  api.versionsFrom(['1.12', '2.3']);
-  api.use('ecmascript');
+  api.versionsFrom('2.3');
+  api.use(['ecmascript', 'typescript']);
+  api.use('zodern:types')
   api.use('accounts-base', ['client', 'server']);
   // Export Accounts (etc) to packages using this one.
   api.imply('accounts-base', ['client', 'server']);
@@ -17,7 +18,7 @@ Package.onUse(api => {
 
   // If users use accounts-ui but not facebook-config-ui, give them a tip.
   api.use(['accounts-ui', 'storyteller:line-config-ui@1.1.2'], ['client', 'server'], { weak: true });
-  api.addFiles('notice.js');
+  api.addFiles('notice.ts');
 
-  api.addFiles('line.js');
+  api.addFiles('line.ts');
 });
diff --git a/line-config-ui/CHANGELOG.md b/line-config-ui/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+## 1.2.0 - 2022-12-21
+* Typescript
+* `zodern:types` added
+* Fix helper names
 
 ## 1.1.2 - 2021-06-24
 * Update dependencies

diff --git a/line-config-ui/line_configure.html b/line-config-ui/line_configure.html
@@ -1,4 +1,4 @@
-<template name="configureLoginServiceDialogForWattpad">
+<template name="configureLoginServiceDialogForLine">
   <p>
     First, you'll need to register your app on LINE. Follow these steps:
   </p>

diff --git a/line-config-ui/line_configure.js → line-config-ui/line_configure.ts b/line-config-ui/line_configure.js → line-config-ui/line_configure.ts
@@ -1,11 +1,11 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 
-Template.configureLoginServiceDialogForWattpad.helpers({
+Template.configureLoginServiceDialogForLine.helpers({
   siteUrl: () => Meteor.absoluteUrl()
 });
 
-Template.configureLoginServiceDialogForWattpad.fields = () => [
+Template.configureLoginServiceDialogForLine.fields = () => [
   { property: 'channelId', label: 'Channel ID' },
   { property: 'secret', label: 'Channel Secret' }
 ];
diff --git a/line-config-ui/main.ts b/line-config-ui/main.ts
@@ -0,0 +1 @@
+import './line_configure'
diff --git a/line-config-ui/package-types.json b/line-config-ui/package-types.json
@@ -0,0 +1,3 @@
+{
+  "typesEntry": "main.ts"
+}
diff --git a/line-config-ui/package.js b/line-config-ui/package.js
@@ -1,15 +1,16 @@
 Package.describe({
   name: 'storyteller:line-config-ui',
   summary: 'Blaze configuration templates for LINE OAuth.',
-  version: '1.1.2',
+  version: '1.2.0',
   git: 'https://github.com/StorytellerCZ/meteor-accounts-line'
 });
 
 Package.onUse(api => {
-  api.versionsFrom('1.12');
-  api.use('ecmascript', 'client');
-  api.use('templating@1.4.1', 'client');
+  api.versionsFrom('2.3');
+  api.use('zodern:types', 'server')
+  api.use(['ecmascript', 'typescript'], 'client');
+  api.use('templating', 'client');
 
   api.addFiles('line_login_button.css', 'client');
-  api.addFiles(['line_configure.html', 'line_configure.js'], 'client');
+  api.addFiles(['line_configure.html', 'line_configure.ts'], 'client');
 });
diff --git a/line-oauth/CHANGELOG.md b/line-oauth/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 ## 1.3.0 - 2022-12-13
 * Compatibility with Meteor 2.9
+* Typescript conversion
 
 ## 1.2.3 - 2022-10-19
 * Added missing imports into the code

diff --git a/line-oauth/line_client.js → line-oauth/line_client.ts b/line-oauth/line_client.js → line-oauth/line_client.ts
diff --git a/line-oauth/line_server.js → line-oauth/line_server.ts b/line-oauth/line_server.js → line-oauth/line_server.ts
diff --git a/line-oauth/main.ts b/line-oauth/main.ts
@@ -0,0 +1,2 @@
+import './line_server'
+import './line_client'
diff --git a/line-oauth/package-types.json b/line-oauth/package-types.json
@@ -0,0 +1,3 @@
+{
+  "typesEntry": "main.ts"
+}
diff --git a/line-oauth/package.js b/line-oauth/package.js
@@ -11,15 +11,16 @@ Npm.depends({
 
 Package.onUse(api => {
   api.versionsFrom(['2.9']);
-  api.use('ecmascript', ['client', 'server']);
+  api.use('zodern:types', 'server')
+  api.use(['ecmascript', 'typescript'], ['client', 'server']);
   api.use('oauth2', ['client', 'server']);
   api.use('oauth', ['client', 'server']);
   api.use(['fetch', 'url'], 'server');
   api.use('random', 'client');
   api.use('service-configuration', ['client', 'server']);
 
-  api.addFiles('line_client.js', 'client');
-  api.addFiles('line_server.js', 'server');
+  api.addFiles('line_client.ts', 'client');
+  api.addFiles('line_server.ts', 'server');
 
   api.export('Line');
 });