qwikifiers · shairez · Dec 7, 2022 · Dec 5, 2022 · Dec 6, 2022 · Dec 6, 2022
diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,4 @@
 
 /dist
 /coverage
+CHANGELOG.md
diff --git a/package.json b/package.json
@@ -16,14 +16,15 @@
     "@commitlint/config-angular": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
     "@jscutlery/semver": "^2.29.0",
-    "@nrwl/cli": "15.2.4",
-    "@nrwl/devkit": "15.2.4",
-    "@nrwl/eslint-plugin-nx": "15.2.4",
-    "@nrwl/jest": "15.2.4",
-    "@nrwl/js": "15.2.4",
-    "@nrwl/linter": "15.2.4",
-    "@nrwl/nx-plugin": "^15.2.4",
-    "@nrwl/workspace": "15.2.4",
+    "@nrwl/cli": "15.3.0",
+    "@nrwl/devkit": "15.3.0",
+    "@nrwl/eslint-plugin-nx": "15.3.0",
+    "@nrwl/jest": "15.3.0",
+    "@nrwl/js": "15.3.0",
+    "@nrwl/linter": "15.3.0",
+    "@nrwl/nx-plugin": "^15.3.0",
+    "@nrwl/vite": "15.3.0",
+    "@nrwl/workspace": "15.3.0",
     "@swc-node/register": "^1.4.2",
     "@swc/cli": "~0.1.55",
     "@swc/core": "^1.2.173",
@@ -42,7 +43,7 @@
     "jest-environment-jsdom": "28.1.1",
     "jsonc-eslint-parser": "^2.1.0",
     "ngx-deploy-npm": "^4.3.9",
-    "nx": "15.2.4",
+    "nx": "15.3.0",
     "prettier": "^2.8.0",
     "pretty-quick": "^3.1.3",
     "ts-jest": "28.0.5",

diff --git a/packages/qwik-nx/executors.json b/packages/qwik-nx/executors.json
@@ -1,10 +1,4 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "executors": {
-    "build": {
-      "implementation": "./src/executors/build/executor",
-      "schema": "./src/executors/build/schema.json",
-      "description": "build executor"
-    }
-  }
+  "executors": {}
 }
diff --git a/packages/qwik-nx/src/executors/build/executor.spec.ts b/packages/qwik-nx/src/executors/build/executor.spec.ts
diff --git a/packages/qwik-nx/src/executors/build/executor.ts b/packages/qwik-nx/src/executors/build/executor.ts
diff --git a/packages/qwik-nx/src/executors/build/schema.d.ts b/packages/qwik-nx/src/executors/build/schema.d.ts
diff --git a/packages/qwik-nx/src/executors/build/schema.json b/packages/qwik-nx/src/executors/build/schema.json
diff --git a/packages/qwik-nx/src/generators/application/files/.eslintignore__template__ b/packages/qwik-nx/src/generators/application/files/.eslintignore__template__
diff --git a/packages/qwik-nx/src/generators/application/files/.eslintrc.cjs__template__ b/packages/qwik-nx/src/generators/application/files/.eslintrc.cjs__template__
diff --git a/packages/qwik-nx/src/generators/application/files/.eslintrc.json__template__ b/packages/qwik-nx/src/generators/application/files/.eslintrc.json__template__
@@ -0,0 +1,33 @@
+{
+  "extends": [
+    "<%= offsetFromRoot %>.eslintrc.json",
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:qwik/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": ["<%= appProjectRoot %>/tsconfig.*?.json"],
+    "ecmaVersion": 2021,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "plugins": ["@typescript-eslint"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/packages/qwik-nx/src/generators/application/files/index.ts__template__ b/packages/qwik-nx/src/generators/application/files/index.ts__template__
diff --git a/packages/qwik-nx/src/generators/application/files/package.json__template__ b/packages/qwik-nx/src/generators/application/files/package.json__template__
diff --git a/.../components/header/header.css__template__ → ...der/header.__styleExtension____template__ b/.../components/header/header.css__template__ → ...der/header.__styleExtension____template__
diff --git a/...ges/qwik-nx/src/generators/application/files/src/components/header/header.tsx__template__ b/...ges/qwik-nx/src/generators/application/files/src/components/header/header.tsx__template__
@@ -1,6 +1,6 @@
 import { component$, useStylesScoped$ } from '@builder.io/qwik';
 import { QwikLogo } from '../icons/qwik';
-import styles from './header.css?inline';
+import styles from './header.<%= styleExtension %>?inline';
 
 export default component$(() => {
   useStylesScoped$(styles);

diff --git a/...lication/files/src/global.css__template__ → ...src/global.__styleExtension____template__ b/...lication/files/src/global.css__template__ → ...src/global.__styleExtension____template__
diff --git a/packages/qwik-nx/src/generators/application/files/src/root.tsx__template__ b/packages/qwik-nx/src/generators/application/files/src/root.tsx__template__
@@ -2,14 +2,14 @@ import { component$, useStyles$ } from '@builder.io/qwik';
 import { QwikCityProvider, RouterOutlet, ServiceWorkerRegister } from '@builder.io/qwik-city';
 import { RouterHead } from './components/router-head/router-head';
 
-import globalStyles from './global.css?inline';
+import globalStyles from './global.<%= styleExtension %>?inline';
 
 export default component$(() => {
   /**
    * The root of a QwikCity site always start with the <QwikCityProvider> component,
    * immediately followed by the document's <head> and <body>.
    *
-   * Dont remove the `<head>` and `<body>` elements.
+   * Don't remove the `<head>` and `<body>` elements.
    */
   useStyles$(globalStyles);
 

diff --git a/.../src/routes/flower/flower.css__template__ → ...wer/flower.__styleExtension____template__ b/.../src/routes/flower/flower.css__template__ → ...wer/flower.__styleExtension____template__
diff --git a/packages/qwik-nx/src/generators/application/files/src/routes/flower/index.tsx__template__ b/packages/qwik-nx/src/generators/application/files/src/routes/flower/index.tsx__template__
@@ -1,6 +1,6 @@
 import { component$, useClientEffect$, useStore, useStylesScoped$ } from '@builder.io/qwik';
 import { DocumentHead, useLocation } from '@builder.io/qwik-city';
-import styles from './flower.css?inline';
+import styles from './flower.<%= styleExtension %>?inline';
 
 export default component$(() => {
   useStylesScoped$(styles);

diff --git a/packages/qwik-nx/src/generators/application/files/tsconfig.app.json__template__ b/packages/qwik-nx/src/generators/application/files/tsconfig.app.json__template__
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node", "vite/client"]
+  },
+  "files": [],
+  "exclude": [],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/packages/qwik-nx/src/generators/application/files/tsconfig.json__template__ b/packages/qwik-nx/src/generators/application/files/tsconfig.json__template__
@@ -1,12 +1,13 @@
 {
+  "extends": "<%= rootTsConfigPath %>",
   "compilerOptions": {
     "allowJs": true,
     "target": "ES2017",
     "module": "ES2020",
     "lib": ["es2020", "DOM", "WebWorker", "DOM.Iterable"],
     "jsx": "react-jsx",
     "jsxImportSource": "@builder.io/qwik",
-    "strict": true,
+    "strict": <%= strict %>,
     "resolveJsonModule": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
@@ -15,11 +16,17 @@
     "isolatedModules": true,
     "outDir": "tmp",
     "noEmit": true,
-    "types": ["node", "vite/client"],
-    "paths": {
-      "~/*": ["./src/*"]
-    }
+    "types": ["node", "vite/client"]
   },
-  "files": ["./.eslintrc.cjs"],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    <% if(setupVitest) { %>
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    <% } %>
+    }
+  ],
   "include": ["src"]
 }
diff --git a/packages/qwik-nx/src/generators/application/files/vite.config.ts__template__ b/packages/qwik-nx/src/generators/application/files/vite.config.ts__template__
@@ -1,15 +1,31 @@
-import { defineConfig } from 'vite';
+<% if(setupVitest) { %>
+/// <reference types="vitest" />
+<% } %>
 import { qwikVite } from '@builder.io/qwik/optimizer';
 import { qwikCity } from '@builder.io/qwik-city/vite';
+import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
-export default defineConfig(() => {
-  return {
-    plugins: [qwikCity(), qwikVite(), tsconfigPaths()],
-    preview: {
-      headers: {
-        'Cache-Control': 'public, max-age=600',
-      },
+export default defineConfig({
+  plugins: [qwikCity(), qwikVite(), tsconfigPaths()],
+  preview: {
+    headers: {
+      'Cache-Control': 'public, max-age=600',
+    },
+  },
+  server: {
+    open: true
+  },
+  <% if(setupVitest) { %> test: {
+    globals: true,
+    cache: {
+      dir: '<%= offsetFromRoot %>node_modules/.vitest',
     },
-  };
+    environment: 'node',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    coverage: {
+      reportsDirectory: '<%= offsetFromRoot %>coverage/<%= appProjectRoot %>'
+    }
+  }
+  <% } %>
 });