oc-template-solid-compiler 0.5.0 → 0.6.1

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+export * from './lib/compile';
+export * from 'oc-template-solid';

package/dist/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./lib/compile"), exports);
+__exportStar(require("oc-template-solid"), exports);

package/dist/lib/compile.d.ts

@@ -0,0 +1,3 @@
+import { createCompile } from 'oc-generic-template-compiler';
+export type CompilerOptions = ReturnType<typeof createCompile>;
+export declare const compile: CompilerOptions;

package/dist/lib/compile.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compile = void 0;
+const oc_generic_template_compiler_1 = require("oc-generic-template-compiler");
+const oc_statics_compiler_1 = __importDefault(require("oc-statics-compiler"));
+const oc_template_solid_1 = require("oc-template-solid");
+const oc_vite_compiler_1 = require("oc-vite-compiler");
+const vite_plugin_solid_1 = __importDefault(require("vite-plugin-solid"));
+const solidOCProviderTemplate_1 = __importDefault(require("./solidOCProviderTemplate"));
+exports.compile = (0, oc_generic_template_compiler_1.createCompile)({
+    compileView: (options, cb) => (0, oc_vite_compiler_1.viteView)({
+        ...options,
+        plugins: [(0, vite_plugin_solid_1.default)()],
+        viewWrapper: solidOCProviderTemplate_1.default,
+        externals: (0, oc_template_solid_1.getInfo)().externals
+    }, cb),
+    compileServer: oc_vite_compiler_1.viteServer,
+    compileStatics: oc_statics_compiler_1.default,
+    getInfo: oc_template_solid_1.getInfo
+});

package/dist/lib/solidOCProviderTemplate.d.ts

@@ -0,0 +1,3 @@
+export default function solidOCProviderTemplate({ viewPath }: {
+    viewPath: string;
+}): string;

package/{lib → dist/lib}/solidOCProviderTemplate.js

@@ -1,9 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const removeExtension = (path) => path.replace(/\.(t|j)sx?$/, '');
-
-const solidOCProviderTemplate = ({ viewPath }) => `
+function solidOCProviderTemplate({ viewPath }) {
+    return `
   import { render } from 'solid-js/web';
   import View from '${removeExtension(viewPath)}';
-  import { DataProvider } from 'oc-template-solid-compiler/utils/useData'
+  import { DataProvider } from 'oc-template-solid-compiler/dist/utils/useData'
 
   function OCProvider(props: any): any {
     const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = props;
@@ -20,8 +22,8 @@ const solidOCProviderTemplate = ({ viewPath }) => `
         if (err) {
           return cb(err);
         }
-        const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = (data.solidComponent.props as any); 
-        cb(null, rest, data.solidComponent.props);
+        const { _staticPath, _baseUrl, _componentName, _componentVersion, ...rest } = (data.component.props as any); 
+        cb(null, rest, data.component.props);
       });
     }
 
@@ -51,5 +53,5 @@ const solidOCProviderTemplate = ({ viewPath }) => `
 
   export default renderer;
 `;
-
-module.exports = solidOCProviderTemplate;
+}
+exports.default = solidOCProviderTemplate;

package/dist/utils/useData.d.ts

@@ -0,0 +1,7 @@
+type PromiseData<T = any> = T & {
+    getData<O = any>(parameters?: Partial<T>): Promise<O>;
+    getSetting(setting: 'name' | 'version' | 'baseUrl' | 'staticPath'): string;
+};
+export declare const DataProvider: (props: any) => import("solid-js").JSX.Element;
+export declare function useData<T = any>(): PromiseData<T>;
+export {};

package/dist/utils/useData.jsx

@@ -0,0 +1,24 @@
+import { createContext, useContext } from 'solid-js';
+const DataContext = createContext({});
+export const DataProvider = (props) => {
+    // @ts-ignore children props
+    return <DataContext.Provider value={props.value}>{props.children}</DataContext.Provider>;
+};
+export function useData() {
+    const { getData, ...rest } = useContext(DataContext);
+    function asyncGetData(data) {
+        return new Promise((resolve, reject) => {
+            // @ts-ignore
+            getData({ ...rest, ...data }, (err, newData) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(newData);
+                }
+            });
+        });
+    }
+    // @ts-ignore
+    return { getData: asyncGetData, ...rest };
+}

package/package.json

@@ -1,16 +1,22 @@
 {
   "name": "oc-template-solid-compiler",
-  "version": "0.5.0",
-  "description": "",
-  "main": "index.js",
+  "version": "0.6.1",
+  "description": "Compiler for the SolidJS OC template",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsc && tsc --project tsconfig.solid.json",
+    "prepare": "npm run build",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
+  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/guestlinelabs/oc-template-solid.git"
+    "url": "https://github.com/opencomponents/vite-templates.git"
   },
   "bugs": {
-    "url": "https://github.com/guestlinelabs/oc-template-solid/issues"
+    "url": "https://github.com/opencomponents/vite-templates/issues"
   },
-  "homepage": "https://github.com/guestlinelabs/oc-template-solid#readme",
+  "homepage": "https://github.com/opencomponents/vite-templates#readme",
   "keywords": [
     "oc",
     "opencomponents",
@@ -22,29 +28,22 @@
     "email": "mkredz@gmail.com"
   },
   "license": "MIT",
-  "types": "./lib/oc-app.d.ts",
   "dependencies": {
     "chalk": "^3.0.0",
-    "cssesc": "^3.0.0",
     "immer": "^9.0.6",
     "oc-generic-template-compiler": "2.1.1",
     "oc-statics-compiler": "2.1.1",
-    "oc-template-solid": "0.0.1",
-    "oc-vite-compiler": "^2.1.3",
+    "oc-template-solid": "^0.1.0",
+    "oc-vite-compiler": "^3.1.1",
     "resolve": "^1.20.0",
     "solid-js": "^1.8.7",
     "vite-plugin-solid": "^2.8.0"
   },
   "files": [
-    "index.js",
-    "lib",
-    "utils",
-    "scaffold",
-    "README.md",
-    "LICENSE"
+    "dist/**",
+    "scaffold"
   ],
   "devDependencies": {
-    "fs-extra": "^10.0.0",
     "lodash": "^4.17.4",
     "prettier": "^2.3.2",
     "prettier-config-guestline": "2.0.0"

package/scaffold/src/package.json

@@ -5,8 +5,7 @@
   "scripts": {
     "lint": "eslint --max-warnings 0 --ext .js,.jsx,.ts,.tsx src",
     "build": "tsc --noEmit && oc package .",
-    "test": "vitest",
-    "start": "oc dev .. --components sold"
+    "test": "vitest"
   },
   "oc": {
     "files": {
@@ -34,9 +33,9 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@types/testing-library__jest-dom": "^5.14.5",
     "jsdom": "^21.1.1",
-    "oc-template-solid": "0.0.1",
-    "oc-template-solid-compiler": "0.5.0",
-    "solid-js": "^1.7.0",
+    "oc-server": "*",
+    "oc-template-solid-compiler": "0.4.0",
+    "solid-js": "^1.8.7",
     "typescript": "5.0.2",
     "vitest": "^0.29.7"
   }

package/scaffold/src/src/App.test.tsx

@@ -1,6 +1,6 @@
 import { describe, it, afterEach, beforeEach, expect, vi } from 'vitest';
 import { render } from '@solidjs/testing-library';
-import { DataProvider } from 'oc-template-solid-compiler/utils/useData';
+import { DataProvider } from 'oc-template-solid-compiler/dist/utils/useData';
 
 import App from './App';
 
@@ -24,7 +24,7 @@ describe('App - Page', () => {
           lastName: 'lastName',
           userId: 0,
           getData,
-          getSetting,
+          getSetting
         }}
       >
         <App />

package/scaffold/src/src/App.tsx

@@ -1,5 +1,6 @@
 import { createSignal, Show, For } from 'solid-js';
-import { useData } from 'oc-template-solid-compiler/utils/useData';
+import { useData } from 'oc-template-solid-compiler/dist/utils/useData';
+import { serverClient } from 'oc-server';
 import styles from './styles.css';
 import type { AdditionalData, ClientProps } from './types';
 
@@ -8,41 +9,33 @@ interface AppProps extends ClientProps {
 }
 
 const App = () => {
-  const { firstName, lastName, userId, getData, getSetting } =
-    useData<AppProps>();
+  const { firstName, lastName, userId, getSetting } = useData<AppProps>();
   const staticPath = getSetting('staticPath');
-  const [additionalData, setAdditionalData] =
-    createSignal<AdditionalData | null>(null);
+  const [additionalData, setAdditionalData] = createSignal<AdditionalData | null>(null);
   const [error, setError] = createSignal('');
 
-  function handleClick() {
-    getData({ userId, getMoreData: true })
-      .then((response) => setAdditionalData(response))
-      .catch((err) => setError(err));
+  async function handleClick() {
+    const data = await serverClient.getMoreData({ userId });
+
+    try {
+      setAdditionalData(data);
+    } catch (error) {
+      setError(String(error));
+    }
   }
 
   return (
     <Show when={!error()} fallback={<div>Something wrong happened!</div>}>
       <div class={styles.container}>
-        <img
-          width="50"
-          height="50"
-          src={`${staticPath}/public/logo.png`}
-          alt="Logo"
-        />
+        <img width="50" height="50" src={`${staticPath}/public/logo.png`} alt="Logo" />
         <h1 style={{ margin: '0 0 20px 0' }}>
-          Hello,{' '}
-          <span style={{ 'text-decoration': 'underline' }}>{firstName}</span>{' '}
-          {lastName}
+          Hello, <span style={{ 'text-decoration': 'underline' }}>{firstName}</span> {lastName}
         </h1>
         <Show when={!!additionalData()}>
           <div class={styles.info}>
             <div class={styles.block}>Age: {additionalData()!.age}</div>
             <div class={styles.block}>
-              Hobbies:{' '}
-              <For each={additionalData()!.hobbies}>
-                {(hobby) => <div>{hobby}</div>}
-              </For>
+              Hobbies: <For each={additionalData()!.hobbies}>{(hobby) => <div>{hobby}</div>}</For>
             </div>
           </div>
         </Show>

package/scaffold/src/src/oc-app.d.ts

@@ -1,2 +1 @@
-/// <reference types="oc-template-solid" />
-/// <reference types="vite/client" />
+/// <reference types="oc-vite/client" />

package/scaffold/src/src/server.ts

@@ -1,5 +1,5 @@
-import { Context } from 'oc-template-solid-compiler';
-import { AdditionalData, ClientProps, OcParameters } from './types';
+import { Server } from 'oc-server';
+import { ClientProps, OcParameters } from './types';
 
 const database = [
   { name: 'John Doe', age: 34, hobbies: ['Swimming', 'Basketball'] },
@@ -10,25 +10,27 @@ async function getUser(userId: number) {
   return database[userId];
 }
 
-export async function data(
-  context: Context<OcParameters>,
-  callback: (error: any, data: ClientProps | AdditionalData) => void
-) {
-  const { userId } = context.params;
+export const server = new Server(async (params: OcParameters): Promise<ClientProps> => {
+  const { userId } = params;
   const user = await getUser(userId);
-  const shouldGetMoreData = context.params.getMoreData;
-  const [firstName, lastName] = user.name.split(/\s+/);
-
-  if (shouldGetMoreData) {
-    return callback(null, {
-      age: user.age,
-      hobbies: user.hobbies
-    });
-  }
 
-  return callback(null, {
+  const [firstName, lastName] = user.name.split(/\s+/);
+  return {
     userId,
     firstName,
     lastName
-  });
+  };
+}).action('getMoreData', async (params: OcParameters) => {
+  const { userId } = params;
+  const user = await getUser(userId);
+  return {
+    age: user.age,
+    hobbies: user.hobbies
+  };
+});
+
+declare module 'oc-server' {
+  interface Register {
+    server: typeof server;
+  }
 }

package/index.js

@@ -1,11 +0,0 @@
-'use strict';
-
-const compile = require('./lib/compile');
-const template = require('oc-template-solid');
-
-module.exports = {
-  compile,
-  getCompiledTemplate: template.getCompiledTemplate,
-  getInfo: template.getInfo,
-  render: template.render
-};

package/lib/compile.js

@@ -1,53 +0,0 @@
-'use strict';
-
-const createCompile = require('oc-generic-template-compiler').createCompile;
-const compileStatics = require('oc-statics-compiler');
-const getInfo = require('oc-template-solid').getInfo;
-const solid = require('vite-plugin-solid');
-const { viteView, viteServer } = require('oc-vite-compiler');
-
-const verifyTypeScriptSetup = require('./verifyConfig');
-const solidOCProviderTemplate = require('./solidOCProviderTemplate');
-const htmlTemplate = require('./htmlTemplate');
-
-const compiler = createCompile({
-  compileView: (options, cb) =>
-    viteView(
-      {
-        ...options,
-        plugins: [solid()],
-        viewWrapper: ({ viewPath }) => solidOCProviderTemplate({ viewPath }),
-        htmlTemplate,
-        externals: getInfo().externals
-      },
-      cb
-    ),
-  compileServer: viteServer,
-  compileStatics,
-  getInfo
-});
-
-const hasTsExtension = (file) => !!file.match(/\.tsx?$/);
-
-// OPTIONS
-// =======
-// componentPath
-// componentPackage,
-// logger,
-// minify
-// ocPackage
-// publishPath
-// verbose,
-// watch,
-// production
-module.exports = function compile(options, callback) {
-  const viewFileName = options.componentPackage.oc.files.template.src;
-  const serverFileName = options.componentPackage.oc.files.data;
-  const usingTypescript = hasTsExtension(viewFileName) || hasTsExtension(serverFileName);
-
-  if (usingTypescript) {
-    verifyTypeScriptSetup(options.componentPath);
-  }
-
-  return compiler(options, callback);
-};

package/lib/htmlTemplate.js

@@ -1,29 +0,0 @@
-const escapeCSS = require('cssesc');
-
-const viewTemplate = ({ templateId, css, bundle, hash }) => `function(model){
-  oc.solidComponents = oc.solidComponents || {};
-  oc.solidComponents['${hash}'] = oc.solidComponents['${hash}'] || (${bundle});
-  if (!model) return;
-  var modelHTML =  model.__html ? model.__html : '';
-  var staticPath = model.component.props._staticPath;
-  var props = JSON.stringify(model.component.props);
-  window.oc = window.oc || {};
-  window.oc.__solidTemplate = window.oc.__solidTemplate || { count: 0 };
-  var count = window.oc.__solidTemplate.count;
-  var templateId = "${templateId}-" + count;
-  window.oc.__solidTemplate.count++;
-  return '<div id="' + templateId + '" class="${templateId}">' + modelHTML + '</div>' +
-    '${css ? '<style>' + escapeCSS(css) + '</style>' : ''}' +
-    '<script>' +
-    'window.oc = window.oc || {};' +
-    'oc.cmd = oc.cmd || [];' +
-    'oc.cmd.push(function(oc){' +
-    '${css ? "oc.events.fire(\\'oc:cssDidMount\\', \\'" + css + "\\');" : ''}' +
-      'var targetNode = document.getElementById("' + templateId + '");' +
-      'targetNode.setAttribute("id","");' +
-      'oc.solidComponents["${hash}"](' + props + ', targetNode);' +
-    '});' +
-  '</script>'
-}`;
-
-module.exports = viewTemplate;

package/lib/oc-app.d.ts

@@ -1,72 +0,0 @@
-interface OC {
-  conf: {
-    templates: Array<{
-      type: string;
-      externals: string[];
-    }>;
-  };
-  cmd: {
-    push: (cb: (oc: OC) => void) => void;
-  };
-  events: {
-    on: (eventName: string, fn: (...data: any[]) => void) => void;
-    off: (eventName: string, fn?: (...data: any[]) => void) => void;
-    fire: (eventName: string, data?: any) => void;
-    reset: () => void;
-  };
-  renderNestedComponent: (ocElement: HTMLElement, cb: () => void) => void;
-}
-
-declare global {
-  interface Window {
-    oc: OC;
-  }
-
-  namespace JSX {
-    interface IntrinsicElements {
-      'oc-component': React.DetailedHTMLProps<
-        React.HTMLAttributes<HTMLElement> & { href: string },
-        HTMLElement
-      >;
-    }
-  }
-}
-
-export interface AcceptLanguage {
-  code: string;
-  script?: any;
-  region: string;
-  quality: number;
-}
-
-export interface Env {
-  name: string;
-}
-
-export interface Plugins {}
-
-export interface External {
-  global: string;
-  url: string;
-  name: string;
-}
-
-export interface Template {
-  type: string;
-  version: string;
-  externals: External[];
-}
-
-export interface Context<T = any, E = Env> {
-  acceptLanguage: AcceptLanguage[];
-  baseUrl: string;
-  env: E;
-  params: T;
-  plugins: Plugins;
-  requestHeaders: Record<string, string>;
-  requestIp: string;
-  setEmptyResponse: () => void;
-  setHeader: (header: string, value: string) => void;
-  staticPath: string;
-  templates: Template[];
-}

package/lib/verifyConfig.js

@@ -1,214 +0,0 @@
-const chalk = require('chalk');
-const fs = require('fs');
-const resolve = require('resolve');
-const path = require('path');
-const os = require('os');
-const immer = require('immer').produce;
-
-function writeJson(fileName, object) {
-  fs.writeFileSync(fileName, JSON.stringify(object, null, 2).replace(/\n/g, os.EOL) + os.EOL);
-}
-
-function verifyTypeScriptSetup(componentPath) {
-  const paths = {
-    appTsConfig: path.resolve(componentPath, 'tsconfig.json'),
-    yarnLockFile: path.resolve(componentPath, 'yarn.lock'),
-    appNodeModules: path.resolve(componentPath, 'node_modules'),
-    appTypeDeclarations: path.resolve(componentPath, 'src', 'oc-app.d.ts')
-  };
-  let firstTimeSetup = false;
-
-  if (!fs.existsSync(paths.appTsConfig)) {
-    writeJson(paths.appTsConfig, {});
-    firstTimeSetup = true;
-  }
-
-  const isYarn = fs.existsSync(paths.yarnLockFile);
-
-  // Ensure typescript is installed
-  let ts;
-  try {
-    ts = require(resolve.sync('typescript', {
-      basedir: paths.appNodeModules
-    }));
-  } catch (_) {
-    console.error(
-      chalk.bold.red(
-        `It looks like you're trying to use TypeScript but do not have ${chalk.bold(
-          'typescript'
-        )} installed.`
-      )
-    );
-    console.error(
-      chalk.bold(
-        'Please install',
-        chalk.cyan.bold('typescript'),
-        'by running',
-        chalk.cyan.bold(isYarn ? 'yarn add typescript' : 'npm install typescript') + '.'
-      )
-    );
-    console.error();
-    process.exit(1);
-  }
-
-  const compilerOptions = {
-    // These are suggested values and will be set when not present in the
-    // tsconfig.json
-    // 'parsedValue' matches the output value from ts.parseJsonConfigFileContent()
-    target: {
-      parsedValue: ts.ScriptTarget.ES5,
-      suggested: 'es5'
-    },
-    lib: { suggested: ['dom', 'dom.iterable', 'esnext'] },
-    allowJs: { suggested: true },
-    skipLibCheck: { suggested: true },
-    esModuleInterop: { suggested: true },
-    allowSyntheticDefaultImports: { suggested: true },
-    strict: { suggested: true },
-    forceConsistentCasingInFileNames: { suggested: true },
-    // TODO: Enable for v4.0 (#6936)
-    // noFallthroughCasesInSwitch: { suggested: true },
-
-    // These values are required and cannot be changed by the user
-    // Keep this in sync with the rollup config
-    module: {
-      parsedValue: ts.ModuleKind.ESNext,
-      value: 'esnext',
-      reason: 'for import() and import/export'
-    },
-    moduleResolution: {
-      parsedValue: ts.ModuleResolutionKind.NodeJs,
-      value: 'node',
-      reason: 'to match rollup resolution'
-    },
-    resolveJsonModule: { value: true, reason: 'to match rollup loader' },
-    isolatedModules: { value: true, reason: 'implementation limitation' },
-    jsx: {
-      parsedValue: ts.JsxEmit.Preserve,
-      suggested: 'preserve'
-    },
-    jsxImportSource: {
-      suggested: 'solid-js'
-    },
-    paths: { value: undefined, reason: 'aliased imports are not supported' }
-  };
-
-  const formatDiagnosticHost = {
-    getCanonicalFileName: (fileName) => fileName,
-    getCurrentDirectory: ts.sys.getCurrentDirectory,
-    getNewLine: () => os.EOL
-  };
-
-  const messages = [];
-  let appTsConfig;
-  let parsedTsConfig;
-  let parsedCompilerOptions;
-  try {
-    const { config: readTsConfig, error } = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile);
-
-    if (error) {
-      throw new Error(ts.formatDiagnostic(error, formatDiagnosticHost));
-    }
-
-    appTsConfig = readTsConfig;
-
-    // Get TS to parse and resolve any "extends"
-    // Calling this function also mutates the tsconfig above,
-    // adding in "include" and "exclude", but the compilerOptions remain untouched
-    let result;
-    parsedTsConfig = immer(readTsConfig, (config) => {
-      result = ts.parseJsonConfigFileContent(config, ts.sys, path.dirname(paths.appTsConfig));
-    });
-
-    if (result.errors && result.errors.length) {
-      throw new Error(ts.formatDiagnostic(result.errors[0], formatDiagnosticHost));
-    }
-
-    parsedCompilerOptions = result.options;
-  } catch (e) {
-    if (e && e.name === 'SyntaxError') {
-      console.error(
-        chalk.red.bold(
-          'Could not parse',
-          chalk.cyan('tsconfig.json') + '.',
-          'Please make sure it contains syntactically correct JSON.'
-        )
-      );
-    }
-
-    console.log(e && e.message ? `${e.message}` : '');
-    process.exit(1);
-  }
-
-  if (appTsConfig.compilerOptions == null) {
-    appTsConfig.compilerOptions = {};
-    firstTimeSetup = true;
-  }
-
-  for (const option of Object.keys(compilerOptions)) {
-    const { parsedValue, value, suggested, reason } = compilerOptions[option];
-
-    const valueToCheck = parsedValue === undefined ? value : parsedValue;
-    const coloredOption = chalk.cyan('compilerOptions.' + option);
-
-    if (suggested != null) {
-      if (parsedCompilerOptions[option] === undefined) {
-        appTsConfig.compilerOptions[option] = suggested;
-        messages.push(
-          `${coloredOption} to be ${chalk.bold('suggested')} value: ${chalk.cyan.bold(
-            suggested
-          )} (this can be changed)`
-        );
-      }
-    } else if (parsedCompilerOptions[option] !== valueToCheck) {
-      appTsConfig.compilerOptions[option] = value;
-      messages.push(
-        `${coloredOption} ${chalk.bold(valueToCheck == null ? 'must not' : 'must')} be ${valueToCheck == null ? 'set' : chalk.cyan.bold(value)
-        }` + (reason != null ? ` (${reason})` : '')
-      );
-    }
-  }
-
-  // tsconfig will have the merged "include" and "exclude" by this point
-  if (parsedTsConfig.include == null) {
-    appTsConfig.include = ['src'];
-    messages.push(`${chalk.cyan('include')} should be ${chalk.cyan.bold('src')}`);
-  }
-
-  if (parsedTsConfig.exclude == null) {
-    appTsConfig.exclude = ['src/_package'];
-    messages.push(`${chalk.cyan('exclude')} should have ${chalk.cyan.bold('src/_package')}`);
-  }
-
-  if (messages.length > 0) {
-    if (firstTimeSetup) {
-      console.log(
-        chalk.bold('Your', chalk.cyan('tsconfig.json'), 'has been populated with default values.')
-      );
-      console.log();
-    } else {
-      console.warn(
-        chalk.bold(
-          'The following changes are being made to your',
-          chalk.cyan('tsconfig.json'),
-          'file:'
-        )
-      );
-      messages.forEach((message) => {
-        console.warn('  - ' + message);
-      });
-      console.warn();
-    }
-    writeJson(paths.appTsConfig, appTsConfig);
-  }
-
-  // Reference `oc-template-solid-compiler` types
-  if (!fs.existsSync(paths.appTypeDeclarations)) {
-    fs.writeFileSync(
-      paths.appTypeDeclarations,
-      `/// <reference types="oc-template-solid" />${os.EOL}`
-    );
-  }
-}
-
-module.exports = verifyTypeScriptSetup;

package/scaffold/src/.eslintrc.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["react-app"]
-}

package/utils/.eslintrc.js

@@ -1,13 +0,0 @@
-module.exports = {
-  env: {
-    commonjs: false
-  },
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true
-    }
-  },
-  extends: '../../../.eslintrc.js'
-};

package/utils/useData.tsx

@@ -1,37 +0,0 @@
-import { createContext, useContext } from 'solid-js';
-
-const DataContext = createContext<any>({});
-
-type Data<T = any> = T & {
-  getData(parameters: T, cb: (err: Error | null, data: any) => void): void;
-  getSetting(setting: 'name' | 'version' | 'baseUrl' | 'staticPath'): string;
-};
-
-type PromiseData<T = any> = T & {
-  getData<O = any>(parameters?: Partial<T>): Promise<O>;
-  getSetting(setting: 'name' | 'version' | 'baseUrl' | 'staticPath'): string;
-};
-
-export const DataProvider = (props: any) => {
-  // @ts-ignore children props
-  return <DataContext.Provider value={props.value}>{props.children}</DataContext.Provider>;
-};
-
-export function useData<T = any>(): PromiseData<T> {
-  const { getData, ...rest }: Data<T>  = useContext(DataContext);
-  function asyncGetData<O = any, I = any>(data: I) {
-    return new Promise<O>((resolve, reject) => {
-      // @ts-ignore
-      getData({ ...rest, ...data }, (err, newData) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(newData);
-        }
-      });
-    });
-  }
-
-  // @ts-ignore
-  return { getData: asyncGetData, ...rest };
-}