ghorsington пре 4 година
родитељ
комит
158a6799a3
9 измењених фајлова са 126 додато и 127 уклоњено
  1. 2 2
      web/.eslintrc.json
  2. 7 7
      web/package.json
  3. 90 90
      web/rollup.config.js
  4. 2 1
      web/src/client.ts
  5. 2 2
      web/src/routes/example.ts
  6. 16 12
      web/src/sapper.d.ts
  7. 0 1
      web/src/server.ts
  8. 5 11
      web/svelte.config.js
  9. 2 1
      web/tsconfig.json

+ 2 - 2
web/.eslintrc.json

@@ -6,7 +6,7 @@
 	"parserOptions": {
 		"ecmaVersion": 11,
 		"sourceType": "module",
-		"project": "./tsconfig.json"
+		"project": "./web/tsconfig.json"
 	},
 	"env": {
 		"node": true,
@@ -27,7 +27,7 @@
 		"import/no-extraneous-dependencies": "off",
 		"indent": [
 			"error",
-			"tab"
+			4
 		],
 		"no-console": "off",
 		"no-tabs": [

+ 7 - 7
web/package.json

@@ -33,11 +33,11 @@
 		"sirv": "^0.4.6"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.11.0",
+		"@babel/core": "^7.11.1",
 		"@babel/plugin-syntax-dynamic-import": "^7.0.0",
 		"@babel/plugin-transform-runtime": "^7.11.0",
 		"@babel/preset-env": "^7.11.0",
-		"@babel/runtime": "^7.11.0",
+		"@babel/runtime": "^7.11.2",
 		"@rollup/plugin-babel": "^5.1.0",
 		"@rollup/plugin-commonjs": "^13.0.2",
 		"@rollup/plugin-json": "^4.1.0",
@@ -47,8 +47,8 @@
 		"@types/compression": "^1.7.0",
 		"@types/express": "^4.17.7",
 		"@types/node-fetch": "^2.5.7",
-		"@typescript-eslint/eslint-plugin": "^3.7.1",
-		"@typescript-eslint/parser": "^3.7.1",
+		"@typescript-eslint/eslint-plugin": "^3.9.0",
+		"@typescript-eslint/parser": "^3.9.0",
 		"bufferutil": "^4.0.1",
 		"class-validator": "^0.12.2",
 		"cross-env": "^7.0.2",
@@ -57,13 +57,13 @@
 		"eslint-plugin-import": "^2.22.0",
 		"eslint-plugin-svelte3": "^2.7.3",
 		"reflect-metadata": "^0.1.13",
-		"rollup": "^2.23.0",
+		"rollup": "^2.23.1",
 		"rollup-plugin-svelte": "^5.2.3",
 		"rollup-plugin-terser": "^6.1.0",
 		"sapper": "^0.27.16",
-		"svelte": "^3.24.0",
+		"svelte": "^3.24.1",
 		"svelte-preprocess": "^3.9.12",
-		"tslib": "^2.0.0",
+		"tslib": "^2.0.1",
 		"typescript": "^3.9.7",
 		"utf-8-validate": "^5.0.2"
 	}

+ 90 - 90
web/rollup.config.js

@@ -11,8 +11,8 @@ import pkg from "./package.json";
 import { preprocess as sveltePreprocessConfig } from "./svelte.config";
 
 const preprocess = [
-	sveltePreprocessConfig,
-	// You could have more preprocessors, like MDsveX
+    sveltePreprocessConfig,
+    // You could have more preprocessors, like MDsveX
 ];
 
 const mode = process.env.NODE_ENV;
@@ -21,105 +21,105 @@ const sourcemap = dev ? "inline" : false;
 const legacy = !!process.env.SAPPER_LEGACY_BUILD;
 
 const warningIsIgnored = (warning) => warning.message.includes(
-	"Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification",
+    "Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification",
 ) || warning.message.includes("Circular dependency: node_modules");
 
 // Workaround for https://github.com/sveltejs/sapper/issues/1221
 const onwarn = (warning, _onwarn) => (warning.code === "CIRCULAR_DEPENDENCY" && /[/\\]@sapper[/\\]/.test(warning.message)) || warningIsIgnored(warning) || console.warn(warning.toString());
 
 export default {
-	client: {
-		input: config.client.input().replace(/\.js$/, ".ts"),
-		output: config.client.output(),
-		plugins: [
-			replace({
-				"process.browser": true,
-				"process.env.NODE_ENV": JSON.stringify(mode),
-			}),
-			svelte({
-				dev,
-				hydratable: true,
-				emitCss: true,
-				preprocess,
-			}),
-			resolve({
-				browser: true,
-				dedupe: ["svelte"],
-			}),
-			commonjs(),
-			typescript(),
-			json(),
+    client: {
+        input: config.client.input().replace(/\.js$/, ".ts"),
+        output: config.client.output(),
+        plugins: [
+            replace({
+                "process.browser": true,
+                "process.env.NODE_ENV": JSON.stringify(mode),
+            }),
+            svelte({
+                dev,
+                hydratable: true,
+                emitCss: true,
+                preprocess,
+            }),
+            resolve({
+                browser: true,
+                dedupe: ["svelte"],
+            }),
+            commonjs(),
+            typescript(),
+            json(),
 
-			legacy && babel({
-				extensions: [".js", ".mjs", ".html", ".svelte"],
-				babelHelpers: "runtime",
-				exclude: ["node_modules/@babel/**"],
-				presets: [
-					["@babel/preset-env", {
-						targets: "> 0.25%, not dead",
-					}],
-				],
-				plugins: [
-					"@babel/plugin-syntax-dynamic-import",
-					["@babel/plugin-transform-runtime", {
-						useESModules: true,
-					}],
-				],
-			}),
+            legacy && babel({
+                extensions: [".js", ".mjs", ".html", ".svelte"],
+                babelHelpers: "runtime",
+                exclude: ["node_modules/@babel/**"],
+                presets: [
+                    ["@babel/preset-env", {
+                        targets: "> 0.25%, not dead",
+                    }],
+                ],
+                plugins: [
+                    "@babel/plugin-syntax-dynamic-import",
+                    ["@babel/plugin-transform-runtime", {
+                        useESModules: true,
+                    }],
+                ],
+            }),
 
-			!dev && terser({
-				module: true,
-			}),
-		],
+            !dev && terser({
+                module: true,
+            }),
+        ],
 
-		preserveEntrySignatures: false,
-		onwarn,
-	},
+        preserveEntrySignatures: false,
+        onwarn,
+    },
 
-	server: {
-		input: { server: config.server.input().server.replace(/\.js$/, ".ts") },
-		output: { ...config.server.output(), sourcemap },
-		plugins: [
-			replace({
-				"process.browser": false,
-				"process.env.NODE_ENV": JSON.stringify(mode),
-				"module.require": "require",
-			}),
-			svelte({
-				generate: "ssr",
-				dev,
-				preprocess,
-			}),
-			resolve({
-				dedupe: ["svelte"],
-			}),
-			commonjs(),
-			typescript(),
-			json(),
-		],
-		external: Object.keys(pkg.dependencies).concat(
-			require("module").builtinModules || Object.keys(process.binding("natives")), // eslint-disable-line global-require
-		),
+    server: {
+        input: { server: config.server.input().server.replace(/\.js$/, ".ts") },
+        output: { ...config.server.output(), sourcemap },
+        plugins: [
+            replace({
+                "process.browser": false,
+                "process.env.NODE_ENV": JSON.stringify(mode),
+                "module.require": "require",
+            }),
+            svelte({
+                generate: "ssr",
+                dev,
+                preprocess,
+            }),
+            resolve({
+                dedupe: ["svelte"],
+            }),
+            commonjs(),
+            typescript(),
+            json(),
+        ],
+        external: Object.keys(pkg.dependencies).concat(
+            require("module").builtinModules || Object.keys(process.binding("natives")), // eslint-disable-line global-require
+        ),
 
-		preserveEntrySignatures: "strict",
-		onwarn,
-	},
+        preserveEntrySignatures: "strict",
+        onwarn,
+    },
 
-	serviceworker: {
-		input: config.serviceworker.input().replace(/\.js$/, ".ts"),
-		output: config.serviceworker.output(),
-		plugins: [
-			resolve(),
-			replace({
-				"process.browser": true,
-				"process.env.NODE_ENV": JSON.stringify(mode),
-			}),
-			commonjs(),
-			typescript(),
-			!dev && terser(),
-		],
+    serviceworker: {
+        input: config.serviceworker.input().replace(/\.js$/, ".ts"),
+        output: config.serviceworker.output(),
+        plugins: [
+            resolve(),
+            replace({
+                "process.browser": true,
+                "process.env.NODE_ENV": JSON.stringify(mode),
+            }),
+            commonjs(),
+            typescript(),
+            !dev && terser(),
+        ],
 
-		preserveEntrySignatures: false,
-		onwarn,
-	},
+        preserveEntrySignatures: false,
+        onwarn,
+    },
 };

+ 2 - 1
web/src/client.ts

@@ -1,5 +1,6 @@
+// eslint-disable-next-line import/no-unresolved
 import * as sapper from "@sapper/app";
 
 sapper.start({
-	target: document.querySelector("#sapper"),
+    target: document.querySelector("#sapper"),
 });

+ 2 - 2
web/src/routes/example.ts

@@ -1,9 +1,9 @@
 import { Request as ExpressRequest, Response as ExpressResponse } from "express";
 
 export const get = async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
-	res.end("you made a get request");
+    res.end("you made a get request");
 };
 
 export const post = async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
-	res.end("you made a post request");
+    res.end("you made a post request");
 };

+ 16 - 12
web/src/sapper.d.ts

@@ -1,4 +1,4 @@
-declare module '@sapper/app' {
+declare module "@sapper/app" {
     // from sapper/runtime/src/app/types.ts
     // sapper doesn't export its types yet
     interface Redirect {
@@ -22,11 +22,13 @@ declare module '@sapper/app' {
         session: Writable<unknown>
     };
 
-    export { goto, prefetch, prefetchRoutes, start, stores }
+    export {
+        goto, prefetch, prefetchRoutes, start, stores,
+    };
 }
 
-declare module '@sapper/server' {
-    import { RequestHandler } from 'express'
+declare module "@sapper/server" {
+    import { RequestHandler } from "express";
 
     interface MiddlewareOptions {
         session?: (req: Express.Request, res: Express.Response) => unknown
@@ -35,14 +37,16 @@ declare module '@sapper/server' {
 
     function middleware(opts?: MiddlewareOptions): RequestHandler
 
-    export { middleware }
+    export { middleware };
 }
 
-declare module '@sapper/service-worker' {
-    const timestamp: number
-    const files: string[]
-    const shell: string[]
-    const routes: { pattern: RegExp }[]
+declare module "@sapper/service-worker" {
+    const timestamp: number;
+    const files: string[];
+    const shell: string[];
+    const routes: { pattern: RegExp }[];
 
-    export { timestamp, files, files as assets, shell, routes }
-}
+    export {
+        timestamp, files, files as assets, shell, routes,
+    };
+}

+ 0 - 1
web/src/server.ts

@@ -10,7 +10,6 @@ const PORT = process.env.PORT; // eslint-disable-line prefer-destructuring
 // replaces `process.env.NODE_ENV` with `"production"` during `prod`
 const dev = process.env.NODE_ENV === "development";
 
-
 const createSapperServer = async (): Promise<Express> => {
 	const app = express();
 

+ 5 - 11
web/svelte.config.js

@@ -1,12 +1,6 @@
-import sveltePreprocess from "svelte-preprocess";
+const sveltePreprocess = require("svelte-preprocess");
 
-const dev = process.env.NODE_ENV === "development";
-
-export const preprocess = sveltePreprocess({
-	typescript: {
-		// This returns compilation times back to what they're like without TypeScript
-		// And still type checks for production builds
-		// Use IDE tools for type checking during development instead
-		transpileOnly: dev,
-	},
-});
+module.exports = {
+    preprocess: sveltePreprocess({
+    }),
+};

+ 2 - 1
web/tsconfig.json

@@ -2,7 +2,8 @@
     "compilerOptions": {
         "lib": [
             "DOM",
-            "WebWorker"
+            "WebWorker",
+            "ES2015"
         ],
         "target": "ES2016",
         "allowSyntheticDefaultImports": true,