@sveltejs/kit - npm Package Compare versions

Comparing version 0.0.23 to 0.0.24

CHANGELOG.md

 # @sveltejs/kit
 
+## 0.0.24
+
+### Patch Changes
+
+- 67eaeea: Move app-utils stuff into subpackages
+- 7f8df30: Move kit runtime code, expose via \$app aliases
+- Updated dependencies [67eaeea]
+  - @sveltejs/app-utils@0.0.16
+
 ## 0.0.23
@@ -4,0 +13,0 @@

dist/cli.js

@@ -195,5 +195,5 @@ 'use strict';
 var name = "@sveltejs/kit";
-var version = "0.0.23";
+var version = "0.0.24";
 var dependencies = {
-	"@sveltejs/app-utils": "0.0.15",
+	"@sveltejs/app-utils": "0.0.16",
 	"cheap-watch": "^1.0.2",
@@ -222,3 +222,4 @@ "http-proxy": "^1.18.1",
 	"source-map-support": "^0.5.19",
-	svelte: "^3.29.0"
+	svelte: "^3.29.0",
+	typescript: "^4.0.5"
 };
@@ -225,0 +226,0 @@ var bin = {

dist/index2.js

@@ -9,3 +9,2 @@ 'use strict';
 var child_process = require('child_process');
-var appUtils = require('@sveltejs/app-utils');
 var utils = require('./utils.js');
@@ -150,3 +149,3 @@ var util = require('util');
     // squelching these warnings (it happens when e.g. the root layout imports
-    // from /_app/main/client)
+    // from /_app/main/runtime/navigation)
     if (ignorable_warnings.has(warning.code))
@@ -162,3 +161,3 @@ return;
         const manifest = utils.create_manifest_data('src/routes'); // TODO make configurable, without breaking Snowpack config
-        appUtils.mkdirp('.svelte/main');
+        utils.mkdirp('.svelte/main');
         utils.create_app({
@@ -179,4 +178,9 @@ manifest_data: manifest,
             header('Creating unoptimized build...');
-            yield exec(`rm -rf .svelte/build/unoptimized`);
+            yield rimraf('.svelte/build/unoptimized');
             utils.copy_assets();
+            const setup_file = `${unoptimized}/server/_app/setup/index.js`;
+            if (!fs__default['default'].existsSync(setup_file)) {
+                utils.mkdirp(path__default['default'].dirname(setup_file));
+                fs__default['default'].writeFileSync(setup_file, '');
+            }
             yield exec(`${snowpack_bin} build --out=${unoptimized}/server --ssr`);
@@ -190,8 +194,6 @@ log.success('server');
             header('Optimizing...');
-            yield exec(`rm -rf .svelte/build/optimized`);
+            yield rimraf('.svelte/build/optimized');
             const server_input = {
-                root: `${unoptimized}/server/_app/main/root.js`,
-                setup: fs__default['default'].existsSync(`${unoptimized}/server/_app/setup/index.js`)
-                    ? `${unoptimized}/server/_app/setup/index.js`
-                    : path__default['default'].join(__dirname, '../assets/setup.js'),
+                root: `${unoptimized}/server/_app/main/generated/root.js`,
+                setup: `${unoptimized}/server/_app/setup/index.js`
             };
@@ -205,5 +207,16 @@ [
             });
+            // https://github.com/snowpackjs/snowpack/discussions/1395
+            const re = /(\.\.\/)+_app\/main\/runtime\//;
+            const work_around_alias_bug = type => ({
+                name: 'work-around-alias-bug',
+                resolveId(imported) {
+                    if (re.test(imported)) {
+                        return path__default['default'].resolve(`${unoptimized}/${type}/_app/main/runtime`, imported.replace(re, ''));
+                    }
+                }
+            });
             const server_chunks = yield rollup.rollup({
                 input: server_input,
                 plugins: [
+                    work_around_alias_bug('server'),
                     {
@@ -234,3 +247,3 @@ name: 'remove-css',
             log.success(`server`);
-            const entry = path__default['default'].resolve(`${unoptimized}/client/_app/main/client.js`);
+            const entry = path__default['default'].resolve(`${unoptimized}/client/_app/main/runtime/navigation.js`);
             const client_chunks = yield rollup.rollup({
@@ -241,2 +254,3 @@ input: {
                 plugins: [
+                    work_around_alias_bug('client'),
                     {
@@ -291,14 +305,19 @@ name: 'deproxy-css',
                                 const chunk = bundle[key];
-                                if (!chunk.imports) {
-                                    console.log(chunk);
+                                if (chunk) {
+                                    const imports = chunk.imports;
+                                    if (imports) {
+                                        imports.forEach(key => {
+                                            if (key.endsWith('.css')) {
+                                                js.add(inject_styles);
+                                                css.add(key);
+                                            }
+                                            else {
+                                                find_deps(key, js, css);
+                                            }
+                                        });
+                                    }
                                 }
-                                chunk.imports.forEach(key => {
-                                    if (key.endsWith('.css')) {
-                                        js.add(inject_styles);
-                                        css.add(key);
-                                    }
-                                    else {
-                                        find_deps(key, js, css);
-                                    }
-                                });
+                                else {
+                                    this.error(`'${key}' is imported but could not be bundled`);
+                                }
                                 return { js, css };
@@ -344,3 +363,3 @@ };
             header(`Generating app (${config.adapter})...`);
-            yield exec(`rm -rf build`); // TODO customize
+            yield rimraf('build'); // TODO customize
             const adapter = cli.requireRelative_1(config.adapter);
@@ -356,4 +375,11 @@ yield adapter({
 }
+function rimraf(path) {
+    return cli.__awaiter(this, void 0, void 0, function* () {
+        return new Promise(resolve => {
+            (fs__default['default'].rm || fs__default['default'].rmdir)(path, { recursive: true, force: true }, () => resolve());
+        });
+    });
+}
 
 exports.build = build;
 //# sourceMappingURL=index2.js.map

dist/utils.js

@@ -5,4 +5,31 @@ 'use strict';
 var fs = require('fs');
-var appUtils = require('@sveltejs/app-utils');
 
+function mkdirp(dir) {
+    try {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    catch (e) {
+        if (e.code === 'EEXIST')
+            return;
+        throw e;
+    }
+}
+function copy(from, to, filter = () => true) {
+    if (!filter(path.basename(from)))
+        return [];
+    const files = [];
+    const stats = fs.statSync(from);
+    if (stats.isDirectory()) {
+        fs.readdirSync(from).forEach(file => {
+            files.push(...copy(path.join(from, file), path.join(to, file)));
+        });
+    }
+    else {
+        mkdirp(path.dirname(to));
+        fs.copyFileSync(from, to);
+        files.push(to);
+    }
+    return files;
+}
+
 function posixify(str) {
@@ -15,3 +42,3 @@ return str.replace(/\\/g, '/');
         previous_contents.set(file, code);
-        appUtils.mkdirp(path.dirname(file));
+        mkdirp(path.dirname(file));
         fs.writeFileSync(file, code);
@@ -345,7 +372,7 @@ fudge_mtime(file);
     if (!fs.existsSync(output))
-        appUtils.mkdirp(output);
+        mkdirp(output);
     const client_manifest = generate_client_manifest(manifest_data);
     const app = generate_app(manifest_data);
-    write_if_changed(`${output}/manifest.js`, client_manifest);
-    write_if_changed(`${output}/root.svelte`, app);
+    write_if_changed(`${output}/generated/manifest.js`, client_manifest);
+    write_if_changed(`${output}/generated/root.svelte`, app);
 }
@@ -446,6 +473,3 @@ function create_param_match(param, i) {
 function copy_assets() {
-    appUtils.mkdirp('.svelte/main/components');
-    ['client.js', 'components/layout.svelte', 'components/error.svelte'].forEach(file => {
-        fs.copyFileSync(path.resolve(__dirname, `../assets/${file}`), `.svelte/main/${file}`);
-    });
+    copy(path.resolve(__dirname, `../assets`), '.svelte/main');
 }
@@ -456,2 +480,3 @@
 exports.create_manifest_data = create_manifest_data;
+exports.mkdirp = mkdirp;
 //# sourceMappingURL=utils.js.map

package.json

 {
 	"name": "@sveltejs/kit",
-	"version": "0.0.23",
+	"version": "0.0.24",
 	"dependencies": {
-		"@sveltejs/app-utils": "0.0.15",
+		"@sveltejs/app-utils": "0.0.16",
 		"cheap-watch": "^1.0.2",
@@ -29,3 +29,4 @@ "http-proxy": "^1.18.1",
 		"source-map-support": "^0.5.19",
-		"svelte": "^3.29.0"
+		"svelte": "^3.29.0",
+		"typescript": "^4.0.5"
 	},
@@ -32,0 +33,0 @@ "bin": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1688797

increased by24.49%

Number of package files

32

increased by10.34%

Lines of code

12938

increased by29.9%

Worsened metrics

Dev dependency count

14

increased by7.69%

Number of medium supply chain risk alerts

17

increased by142.86%

Dependency changes

• + Added@sveltejs/app-utils@0.0.16(transitive)

• - Removed@sveltejs/app-utils@0.0.15(transitive)

• Updated@sveltejs/app-utils@0.0.16