Targeting ES2015 by default.

Dennis Miasoutov · Dennis Miasoutov · commit b451d8db32e6 · 2020-01-05T08:56:31.000-05:00
diff --git a/app/components/body.tsx b/app/components/body.tsx
@@ -12,8 +12,10 @@ export class Body extends React.Component<BodyProps> {
   public render() {
     const { scripts, markup, bodyAttrs } = this.props;
 
+    const type = process.env.SCRIPTS_TYPE;
+
     const renderScripts = scripts.map((scriptSrc, i) => (
-      <script src={scriptSrc} key={i} charSet="utf-8" />
+      <script type={type} src={scriptSrc} key={i} charSet="utf-8" />
     ));
 
     const renderInlineScripts = this.getInlineScripts().map((script, i) => (
diff --git a/app/flavors/basic/render.tsx b/app/flavors/basic/render.tsx
@@ -18,7 +18,8 @@ export function render(callback: RenderCallback, props: RenderFuncProps): void {
       markup,
     };
 
-    const html = renderToStaticMarkup(<HelmetHtml {...htmlProps} />);
+    const html =
+      "<!DOCTYPE html>" + renderToStaticMarkup(<HelmetHtml {...htmlProps} />);
 
     callback(undefined, {
       html,
diff --git a/app/flavors/router-redux-async/render.tsx b/app/flavors/router-redux-async/render.tsx
@@ -45,7 +45,9 @@ export function render(callback: RenderCallback, props: RenderFuncProps): void {
           markup,
         };
 
-        const html = renderToStaticMarkup(<HelmetHtml {...htmlProps} />);
+        const html =
+          "<!DOCTYPE html>" +
+          renderToStaticMarkup(<HelmetHtml {...htmlProps} />);
 
         callback(undefined, {
           html,
diff --git a/app/flavors/router-redux/render.tsx b/app/flavors/router-redux/render.tsx
@@ -21,7 +21,8 @@ export function render(callback: RenderCallback, props: RenderFuncProps): void {
       markup,
     };
 
-    const html = renderToStaticMarkup(<HelmetHtml {...htmlProps} />);
+    const html =
+      "<!DOCTYPE html>" + renderToStaticMarkup(<HelmetHtml {...htmlProps} />);
 
     callback(undefined, {
       html,
diff --git a/app/wtb.json b/app/wtb.json
@@ -4,5 +4,6 @@
   "flavor": "basic",
   "ssrModule": null,
   "extend": null,
-  "devApiUrl": "http://localhost:5000"
+  "devApiUrl": "http://localhost:5000",
+  "type": "module"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-typescript-builder",
-  "version": "0.0.0",
+  "version": "0.2.4",
   "description": "Webpack config builder for typescript, styles (css and sass), fonts and images.",
   "typings": "lib/config-builder/index.d.js",
   "main": "lib/config-builder/index.js",
diff --git a/src/cli/commands/config.ts b/src/cli/commands/config.ts
@@ -95,6 +95,7 @@ export function createConfigs(dir: string): webpack.Configuration[] {
       NODE_ENV: JSON.stringify(
         program.production ? "production" : "development",
       ),
+      SCRIPTS_TYPE: JSON.stringify(settings.type),
     },
   });
 
diff --git a/src/cli/settings.ts b/src/cli/settings.ts
@@ -5,6 +5,7 @@ export interface Settings {
   ssrModule?: string;
   extend?: ExtendConfigSettings;
   devApiUrl: string;
+  type: string;
 }
 
 export interface ExtendConfigSettings {
diff --git a/src/config-builder/rules/javascript.ts b/src/config-builder/rules/javascript.ts
diff --git a/src/config-builder/rules/typescript.ts b/src/config-builder/rules/typescript.ts
@@ -1,5 +1,5 @@
+import tsImportPluginFactory from "ts-import-plugin";
 import * as webpack from "webpack";
-const tsImportPluginFactory = require("ts-import-plugin");
 
 export const typescript: webpack.Rule = {
   test: /\.(ts|tsx)?$/,
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -4,7 +4,7 @@
     "module": "ESNext",
     "experimentalDecorators": true,
     "allowJs": false,
-    "target": "es5",
+    "target": "ES2015",
     "noImplicitAny": true,
     "skipLibCheck": true,
     "strict": true,
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "module": "CommonJS",
-    "target": "es2019",
+    "target": "ES2019",
     "noImplicitAny": true,
     "moduleResolution": "node",
     "declaration": true,

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@`
`4`	`4`	`"flavor": "basic",`
`5`	`5`	`"ssrModule": null,`
`6`	`6`	`"extend": null,`
`7`		`- "devApiUrl": "http://localhost:5000"`
	`7`	`+ "devApiUrl": "http://localhost:5000",`
	`8`	`+ "type": "module"`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack-typescript-builder",`
`3`		`- "version": "0.0.0",`
	`3`	`+ "version": "0.2.4",`
`4`	`4`	`"description": "Webpack config builder for typescript, styles (css and sass), fonts and images.",`
`5`	`5`	`"typings": "lib/config-builder/index.d.js",`
`6`	`6`	`"main": "lib/config-builder/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ export interface Settings {`
`5`	`5`	`ssrModule?: string;`
`6`	`6`	`extend?: ExtendConfigSettings;`
`7`	`7`	`devApiUrl: string;`
	`8`	`+ type: string;`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`export interface ExtendConfigSettings {`