fix: main package json (QwikDev#1826)

hitesh97 · Oct 21, 2022 · 61489d3 · 61489d3
1 parent 133612a
commit 61489d3
Show file tree

Hide file tree

Showing 90 changed files with 191 additions and 167 deletions.
diff --git a/packages/create-qwik/create-app.ts b/packages/create-qwik/create-app.ts
@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
 import type { CreateAppOptions, CreateAppResult, IntegrationData } from '../qwik/src/cli/types';
-import fs from 'fs';
+import fs from 'node:fs';
 import color from 'kleur';
-import { isAbsolute, join, relative, resolve } from 'path';
+import { isAbsolute, join, relative, resolve } from 'node:path';
 import {
   cleanPackageJson,
   getPackageManager,

diff --git a/packages/create-qwik/create-interactive.ts b/packages/create-qwik/create-interactive.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-import fs from 'fs';
-import { relative } from 'path';
+import fs from 'node:fs';
+import { relative } from 'node:path';
 import prompts from 'prompts';
 import color from 'kleur';
 import type { CreateAppOptions } from '../qwik/src/cli/types';

diff --git a/packages/docs/contributors.ts b/packages/docs/contributors.ts
@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
 import fetch from 'node-fetch';
-import fs from 'fs';
-import path from 'path';
-import url from 'url';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
 import matter from 'gray-matter';
 
 const rootDir = path.join(path.dirname(url.fileURLToPath(import.meta.url)), '..', '..');

diff --git a/packages/docs/src/entry.static.tsx b/packages/docs/src/entry.static.tsx
@@ -1,7 +1,7 @@
 import { qwikCityGenerate } from '@builder.io/qwik-city/static/node';
 import render from './entry.ssr';
-import { fileURLToPath } from 'url';
-import { join } from 'path';
+import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 
 // Execute Qwik City Static Generator
 qwikCityGenerate(render, {

diff --git a/packages/docs/src/routes/docs/advanced/custom-build-dir/index.mdx b/packages/docs/src/routes/docs/advanced/custom-build-dir/index.mdx
@@ -20,7 +20,7 @@ Usually with Vite.js we do it like this:
 import { defineConfig } from 'vite';
 import { qwikVite } from '@builder.io/qwik/optimizer';
 import { qwikCity } from '@builder.io/qwik-city/vite';
-import { resolve } from 'path';
+import { resolve } from 'node:path';
 /* VITE_IMPORTS */
 
 export default defineConfig(() => {

diff --git a/packages/docs/src/routes/qwikcity/adaptors/node/index.mdx b/packages/docs/src/routes/qwikcity/adaptors/node/index.mdx
@@ -17,8 +17,8 @@ Below is an example of using the built-in Node middleware within a user's [Expre
 ```typescript
 import { qwikCity } from '@builder.io/qwik-city/middleware/node';
 import express from 'express';
-import { fileURLToPath } from 'url';
-import { join } from 'path';
+import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import render from './entry.ssr';
 
 // Directories where the static assets are located

diff --git a/...es/docs/src/routes/qwikcity/static-site-generation/static-site-config/index.mdx b/...es/docs/src/routes/qwikcity/static-site-generation/static-site-config/index.mdx
@@ -13,8 +13,8 @@ Below is an example of a `src/entry.static.tsx` file, which is the initial file
 // file: src/entry.static.tsx
 import { qwikCityGenerate } from '@builder.io/qwik-city/static/node';
 import render from './entry.ssr';
-import { fileURLToPath } from 'url';
-import { join } from 'path';
+import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 
 qwikCityGenerate(render, {
   origin: 'https://qwik.builder.io',

diff --git a/packages/docs/vite.config.ts b/packages/docs/vite.config.ts
@@ -1,6 +1,6 @@
 import { defineConfig } from 'vite';
 import { qwikVite } from '@builder.io/qwik/optimizer';
-import { resolve } from 'path';
+import { resolve } from 'node:path';
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import { partytownVite } from '@builder.io/partytown/utils';
 import { examplesData, playgroundData, tutorialData } from './vite.repl-apps';

diff --git a/packages/docs/vite.repl-apps.ts b/packages/docs/vite.repl-apps.ts
@@ -1,7 +1,7 @@
 import type { Plugin } from 'vite';
 import type { TransformModuleInput } from '@builder.io/qwik/optimizer';
-import { join, basename } from 'path';
-import { existsSync, readdirSync, readFileSync, statSync } from 'fs';
+import { join, basename } from 'node:path';
+import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import type { ExampleSection } from './src/routes/examples/apps/examples-data';
 import type { PlaygroundApp } from './src/routes/playground/playground-data';
 import type { TutorialSection } from './src/routes/tutorial/tutorial-data';

diff --git a/packages/eslint-plugin-qwik/qwik.unit.ts b/packages/eslint-plugin-qwik/qwik.unit.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 // @ts-ignore
 import Utils from '@typescript-eslint/utils';
-import { fileURLToPath } from 'url';
+import { fileURLToPath } from 'node:url';
 import { test } from 'uvu';
 import { rules } from './index';
 

diff --git a/packages/qwik-city/adaptors/cloudflare-pages/vite/index.ts b/packages/qwik-city/adaptors/cloudflare-pages/vite/index.ts
@@ -1,8 +1,8 @@
 import type { Plugin } from 'vite';
 import type { QwikVitePlugin } from '@builder.io/qwik/optimizer';
 import type { StaticGenerateOptions, StaticGenerateRenderOptions } from '../../../static';
-import { join } from 'path';
-import fs from 'fs';
+import { join } from 'node:path';
+import fs from 'node:fs';
 
 /**
  * @alpha

diff --git a/packages/qwik-city/adaptors/express/vite/index.ts b/packages/qwik-city/adaptors/express/vite/index.ts
@@ -1,8 +1,8 @@
 import type { Plugin } from 'vite';
 import type { QwikVitePlugin } from '@builder.io/qwik/optimizer';
 import type { StaticGenerateOptions, StaticGenerateRenderOptions } from '../../../static';
-import { join } from 'path';
-import fs from 'fs';
+import { join } from 'node:path';
+import fs from 'node:fs';
 
 /**
  * @alpha

diff --git a/packages/qwik-city/adaptors/netlify-edge/vite/index.ts b/packages/qwik-city/adaptors/netlify-edge/vite/index.ts
@@ -1,8 +1,8 @@
 import type { Plugin } from 'vite';
 import type { QwikVitePlugin } from '@builder.io/qwik/optimizer';
 import type { StaticGenerateOptions, StaticGenerateRenderOptions } from '../../../static';
-import { join } from 'path';
-import fs from 'fs';
+import { join } from 'node:path';
+import fs from 'node:fs';
 
 /**
  * @alpha

diff --git a/packages/qwik-city/adaptors/static/vite/index.ts b/packages/qwik-city/adaptors/static/vite/index.ts
@@ -1,8 +1,8 @@
 import type { Plugin } from 'vite';
 import type { QwikVitePlugin } from '@builder.io/qwik/optimizer';
 import type { StaticGenerateRenderOptions } from '../../../static';
-import { join } from 'path';
-import fs from 'fs';
+import { join } from 'node:path';
+import fs from 'node:fs';
 
 /**
  * @alpha

diff --git a/packages/qwik-city/buildtime/context.ts b/packages/qwik-city/buildtime/context.ts
@@ -1,5 +1,5 @@
 import type { NormalizedPluginOptions, BuildContext, PluginOptions } from './types';
-import { isAbsolute, resolve } from 'path';
+import { isAbsolute, resolve } from 'node:path';
 import { normalizePath } from '../utils/fs';
 
 export function createBuildContext(

diff --git a/packages/qwik-city/buildtime/markdown/markdown-url.ts b/packages/qwik-city/buildtime/markdown/markdown-url.ts
@@ -1,8 +1,8 @@
-import { dirname, join, basename } from 'path';
+import { dirname, join, basename } from 'node:path';
 import { getSourceFile } from '../routing/source-file';
 import type { NormalizedPluginOptions } from '../types';
 import { getExtension, getPathnameFromDirPath, isMarkdownExt, normalizePath } from '../../utils/fs';
-import { existsSync } from 'fs';
+import { existsSync } from 'node:fs';
 import { isSameOriginUrl } from '../../utils/pathname';
 
 export function getMarkdownRelativeUrl(

diff --git a/packages/qwik-city/buildtime/markdown/markdown-url.unit.ts b/packages/qwik-city/buildtime/markdown/markdown-url.unit.ts
@@ -2,8 +2,8 @@ import { test } from 'uvu';
 import { equal } from 'uvu/assert';
 import { getMarkdownRelativeUrl } from './markdown-url';
 import type { NormalizedPluginOptions } from '../types';
-import { tmpdir } from 'os';
-import { join } from 'path';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 
 test('getMarkdownRelativeUrl', () => {
   const routesDir = tmpdir();

diff --git a/packages/qwik-city/buildtime/markdown/menu.unit.ts b/packages/qwik-city/buildtime/markdown/menu.unit.ts
@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join } from 'node:path';
 import * as assert from 'uvu/assert';
 import { createMenu, parseMenu } from './menu';
 import { suite } from '../../utils/test-suite';

diff --git a/packages/qwik-city/buildtime/routing/resolve-source-file.ts b/packages/qwik-city/buildtime/routing/resolve-source-file.ts
@@ -1,4 +1,4 @@
-import { dirname } from 'path';
+import { dirname } from 'node:path';
 import { resolveMenu } from '../markdown/menu';
 import type {
   BuildEntry,

diff --git a/packages/qwik-city/buildtime/routing/walk-routes-dir.ts b/packages/qwik-city/buildtime/routing/walk-routes-dir.ts
@@ -1,5 +1,5 @@
-import fs from 'fs';
-import { basename, join } from 'path';
+import fs from 'node:fs';
+import { basename, join } from 'node:path';
 import type { RouteSourceFile } from '../types';
 import { normalizePath } from '../../utils/fs';
 import { getSourceFile } from './source-file';

diff --git a/packages/qwik-city/buildtime/vite/config.ts b/packages/qwik-city/buildtime/vite/config.ts
@@ -1,4 +1,4 @@
-// import { basename } from 'path';
+// import { basename } from 'node:path';
 import { ConfigEnv, mergeConfig, UserConfigExport } from 'vite';
 
 /**

diff --git a/packages/qwik-city/buildtime/vite/dev-server.ts b/packages/qwik-city/buildtime/vite/dev-server.ts
@@ -1,7 +1,7 @@
 import type { ViteDevServer, Connect } from 'vite';
-import type { ServerResponse } from 'http';
-import fs from 'fs';
-import { join, resolve } from 'path';
+import type { ServerResponse } from 'node:http';
+import fs from 'node:fs';
+import { join, resolve } from 'node:path';
 import type { BuildContext } from '../types';
 import type { RouteModule } from '../../runtime/src/library/types';
 import type { QwikViteDevResponse } from '../../../qwik/src/optimizer/src/plugins/vite';

diff --git a/packages/qwik-city/buildtime/vite/plugin.ts b/packages/qwik-city/buildtime/vite/plugin.ts
@@ -1,5 +1,5 @@
 import { createMdxTransformer, MdxTransform } from '../markdown/mdx';
-import { basename, join, resolve } from 'path';
+import { basename, join, resolve } from 'node:path';
 import type { Plugin, UserConfig } from 'vite';
 import { generateQwikCityPlan } from '../runtime-generation/generate-qwik-city-plan';
 import type { BuildContext } from '../types';
@@ -20,7 +20,7 @@ import { transformMenu } from '../markdown/menu';
 import { generateQwikCityEntries } from '../runtime-generation/generate-entries';
 import { patchGlobalFetch } from '../../middleware/node/node-fetch';
 import type { QwikManifest } from '@builder.io/qwik/optimizer';
-import fs from 'fs';
+import fs from 'node:fs';
 import {
   generateServiceWorkerRegister,
   prependManifestToServiceWorker,

diff --git a/packages/qwik-city/buildtime/vite/validate-plugin.ts b/packages/qwik-city/buildtime/vite/validate-plugin.ts
@@ -1,5 +1,5 @@
-import fs from 'fs';
-import { isAbsolute } from 'path';
+import fs from 'node:fs';
+import { isAbsolute } from 'node:path';
 import type { NormalizedPluginOptions } from '../types';
 
 export async function validatePlugin(opts: NormalizedPluginOptions) {

diff --git a/packages/qwik-city/middleware/node/api.md b/packages/qwik-city/middleware/node/api.md
@@ -6,11 +6,11 @@
 
 /// <reference types="node" />
 
-import type { IncomingMessage } from 'http';
+import type { IncomingMessage } from 'node:http';
 import type { Render } from '@builder.io/qwik/server';
 import type { RenderOptions } from '@builder.io/qwik/server';
 import type { RenderOptions as RenderOptions_2 } from '@builder.io/qwik';
-import type { ServerResponse } from 'http';
+import type { ServerResponse } from 'node:http';
 
 // @alpha (undocumented)
 export function createQwikCity(opts: QwikCityNodeRequestOptions): {

diff --git a/packages/qwik-city/middleware/node/http.ts b/packages/qwik-city/middleware/node/http.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from 'http';
+import type { IncomingMessage, ServerResponse } from 'node:http';
 import { createHeaders } from '../request-handler/headers';
 import type { QwikCityRequestContext } from '../request-handler/types';
 

diff --git a/packages/qwik-city/middleware/node/index.ts b/packages/qwik-city/middleware/node/index.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from 'http';
+import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { QwikCityHandlerOptions } from '../request-handler/types';
 import { errorHandler, notFoundHandler, requestHandler } from '../request-handler';
 import { fromNodeHttp, getUrl } from './http';

diff --git a/packages/qwik-city/package.json b/packages/qwik-city/package.json
@@ -2,13 +2,14 @@
   "name": "@builder.io/qwik-city",
   "version": "0.0.113",
   "description": "The meta-framework for Qwik.",
-  "main": "./lib/index.qwik.cjs",
+  "main": "./lib/index.qwik.mjs",
   "module": "./lib/index.qwik.mjs",
   "qwik": "./lib/index.qwik.mjs",
   "types": "./lib/index.d.ts",
   "type": "module",
   "exports": {
     ".": {
+      "types": "./lib/index.d.ts",
       "import": "./lib/index.qwik.mjs",
       "require": "./lib/index.qwik.cjs"
     },

diff --git a/packages/qwik-city/runtime/src/app/routes/api/[org]/[user].json/index.ts b/packages/qwik-city/runtime/src/app/routes/api/[org]/[user].json/index.ts
@@ -1,5 +1,5 @@
 import type { RequestHandler } from '~qwik-city-runtime';
-import os from 'os';
+import os from 'node:os';
 
 export const onGet: RequestHandler = ({ request, params }) => {
   return {

diff --git a/packages/qwik-city/runtime/src/app/routes/api/data.json/index.ts b/packages/qwik-city/runtime/src/app/routes/api/data.json/index.ts
@@ -1,5 +1,5 @@
 import type { RequestHandler } from '~qwik-city-runtime';
-import os from 'os';
+import os from 'node:os';
 
 export const onGet: RequestHandler = ({ request }) => {
   return {

diff --git a/packages/qwik-city/runtime/src/app/routes/products/[id]/index.tsx b/packages/qwik-city/runtime/src/app/routes/products/[id]/index.tsx
@@ -1,6 +1,6 @@
 import { Resource, component$, useStore } from '@builder.io/qwik';
 import { Link, useEndpoint, useLocation, RequestHandler, DocumentHead } from '~qwik-city-runtime';
-import os from 'os';
+import os from 'node:os';
 
 export default component$(() => {
   const { params, pathname } = useLocation();

diff --git a/packages/qwik-city/runtime/src/entry.express.tsx b/packages/qwik-city/runtime/src/entry.express.tsx
@@ -1,6 +1,6 @@
 import express from 'express';
-import { fileURLToPath } from 'url';
-import { join } from 'path';
+import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import { qwikCity } from '../../middleware/node';
 import render from './entry.ssr';
 

diff --git a/packages/qwik-city/static/node/index.ts b/packages/qwik-city/static/node/index.ts
@@ -1,6 +1,6 @@
 import type { StaticGenerateOptions } from '../types';
 import { createSystem } from './node-system';
-import { isMainThread, workerData } from 'worker_threads';
+import { isMainThread, workerData } from 'node:worker_threads';
 import { mainThread } from '../main-thread';
 import { workerThread } from '../worker-thread';
 

diff --git a/packages/qwik-city/static/node/node-main.ts b/packages/qwik-city/static/node/node-main.ts
@@ -6,10 +6,10 @@ import type {
   WorkerOutputMessage,
   WorkerInputMessage,
 } from '../types';
-import fs from 'fs';
-import { cpus as nodeCpus } from 'os';
-import { Worker } from 'worker_threads';
-import { isAbsolute, resolve } from 'path';
+import fs from 'node:fs';
+import { cpus as nodeCpus } from 'node:os';
+import { Worker } from 'node:worker_threads';
+import { isAbsolute, resolve } from 'node:path';
 import { ensureDir } from './node-system';
 import { normalizePath } from '../../utils/fs';
 

diff --git a/packages/qwik-city/static/node/node-system.ts b/packages/qwik-city/static/node/node-system.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import type { StaticGenerateOptions, System } from '../types';
-import fs from 'fs';
-import { dirname, join } from 'path';
+import fs from 'node:fs';
+import { dirname, join } from 'node:path';
 import { patchGlobalFetch } from '../../middleware/node/node-fetch';
 import { createNodeMainProcess } from './node-main';
 import { createNodeWorkerProcess } from './node-worker';

diff --git a/packages/qwik-city/static/node/node-worker.ts b/packages/qwik-city/static/node/node-worker.ts
@@ -1,4 +1,4 @@
-import { parentPort } from 'worker_threads';
+import { parentPort } from 'node:worker_threads';
 import type { WorkerInputMessage, WorkerOutputMessage } from '../types';
 
 export async function createNodeWorkerProcess(

diff --git a/packages/qwik-city/utils/fs.ts b/packages/qwik-city/utils/fs.ts
@@ -1,4 +1,4 @@
-import { basename, dirname, normalize, relative } from 'path';
+import { basename, dirname, normalize, relative } from 'node:path';
 import type { NormalizedPluginOptions } from '../buildtime/types';
 import { toTitleCase } from './format';
 import { normalizePathname } from './pathname';

diff --git a/packages/qwik-city/utils/fs.unit.ts b/packages/qwik-city/utils/fs.unit.ts
@@ -1,5 +1,5 @@
-import { tmpdir } from 'os';
-import { join } from 'path';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 import { test } from 'uvu';
 import { equal } from 'uvu/assert';
 import type { NormalizedPluginOptions } from '../buildtime/types';

diff --git a/packages/qwik-city/utils/test-suite.ts b/packages/qwik-city/utils/test-suite.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
 import * as assert from 'uvu/assert';
-import { join } from 'path';
+import { join } from 'node:path';
 import { suite as uvuSuite } from 'uvu';
 import type {
   BuildContext,
@@ -10,10 +10,10 @@ import type {
   NormalizedPluginOptions,
 } from '../buildtime/types';
 import { createBuildContext } from '../buildtime/context';
-import { tmpdir } from 'os';
+import { tmpdir } from 'node:os';
 import { normalizePath } from './fs';
 import { build } from '../buildtime/build';
-import { fileURLToPath } from 'url';
+import { fileURLToPath } from 'node:url';
 
 export function suite(title?: string) {
   const s = uvuSuite<TestContext>(title);

diff --git a/packages/qwik-react/package.json b/packages/qwik-react/package.json
@@ -56,7 +56,7 @@
     "url": "https://github.com/BuilderIO/qwik/issues"
   },
   "type": "module",
-  "main": "./lib/index.qwik.cjs",
+  "main": "./lib/index.qwik.mjs",
   "module": "./lib/index.qwik.mjs",
   "qwik": "./lib/index.qwik.mjs",
   "types": "./lib/types/index.d.ts"

diff --git a/packages/qwik/package.json b/packages/qwik/package.json
@@ -2,7 +2,8 @@
   "name": "@builder.io/qwik",
   "version": "0.11.1",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
-  "main": "./dist/core.cjs",
+  "main": "./dist/core.mjs",
+  "module": "./dist/core.mjs",
   "types": "./dist/core.d.ts",
   "bin": "./dist/qwik.cjs",
   "type": "module",