refactor: update build scripts

Author: adamdbradley

.prettierignore

@@ -2,16 +2,19 @@
 **/*.log
 **/.DS_Store
 *.
+.vscode/settings.json
 .history
 bazel-*
 bazel-bin
 bazel-out
 bazel-qwik
 bazel-testlogs
 dist
+dist-dev
 etc
 external
 node_modules
 temp
 tsc-out
 tsdoc-metadata.json
+integration/**/*.js

BUILD.bazel

@@ -1,26 +1,24 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
-load("@npm//@bazel/typescript:index.bzl", "ts_config")
+load("//scripts:package_build.bzl", "package_build")
 
 package(default_visibility = ["//visibility:public"])
 
-ts_config(
-    name = "tsconfig",
-    src = "tsconfig.json",
+package_build(
+    name = "package",
+    srcs = glob(
+        [
+            "src/**/*.ts",
+            "src/**/*.tsx",
+            "integration/devserver.ts",
+        ],
+        exclude = [
+            "src/**/*.unit.ts",
+            "src/**/*.unit.tsx",
+        ],
+    ),
+    deps = [
+        ":package.json",
+        ":tsconfig.json",
+        ":LICENSE",
+        ":README.md",
+    ]
 )
-
-copy_to_bin(
-    name = "package_json",
-    srcs = [
-        "package.json",
-    ],
-)
-
-exports_files([
-    "LICENSE",
-    "README.md",
-    "core-api-extractor.json",
-    "cypress.json",
-    "package.json",
-    "terser.config.json",
-    "tsconfig.json",
-])

WORKSPACE

@@ -30,40 +30,3 @@ yarn_install(
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )
-
-load("@npm//@bazel/cypress:index.bzl", "cypress_repository")
-
-# The name you pass here names the external repository you can load cypress_web_test from
-cypress_repository(name = "cypress")
-
-_ESBUILD_VERSION = "0.11.14"  # reminder: update SHAs below when changing this value
-
-http_archive(
-    name = "esbuild_darwin",
-    build_file_content = """exports_files(["bin/esbuild"])""",
-    sha256 = "81c8623c4c03a1fc449c37a90dd630025e334d312420d42106a899f78bd5e3fe",
-    strip_prefix = "package",
-    urls = [
-        "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-%s.tgz" % _ESBUILD_VERSION,
-    ],
-)
-
-http_archive(
-    name = "esbuild_windows",
-    build_file_content = """exports_files(["esbuild.exe"])""",
-    sha256 = "d977751550550099cb9deb95d3fc436c21374b3875131589dde162dfb1c03bf4",
-    strip_prefix = "package",
-    urls = [
-        "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-%s.tgz" % _ESBUILD_VERSION,
-    ],
-)
-
-http_archive(
-    name = "esbuild_linux",
-    build_file_content = """exports_files(["bin/esbuild"])""",
-    sha256 = "fbf8d42fbd12d2392893a5d8cea3860e875c47ee715660e844dff822b8747321",
-    strip_prefix = "package",
-    urls = [
-        "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-%s.tgz" % _ESBUILD_VERSION,
-    ],
-)

integration/tsconfig.json

@@ -1,4 +1,4 @@
 {
-  "extends": "../tsconfig.dev.json",
-  "include": ["hello_server", "hello_static", "specs", "todo", "devserver.ts"]
+  "extends": "../tsconfig.json",
+  "include": ["hello_server", "hello_static", "specs", "todo"]
 }

package.json

@@ -1,74 +1,114 @@
 {
   "name": "@builder.io/qwik",
-  "version": "0.0.1",
+  "version": "0.0.11",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
   "main": "index.js",
-  "lint-staged": {
-    "*.*": [
-      "prettier --write --ignore-unknown"
-    ],
-    "*.ts": [
-      "npx eslint"
-    ],
-    "(WORKSPACE|*.bazel|*.bzl)": [
-      "npm run bazel:lint-fix"
-    ]
-  },
   "@comment type": "Setting type to 'commonjs' is important as many of the bazel tooling assumes 'commonjs'. For code which wants ESM a second 'package.json' file needs to be created for just those files.",
   "type": "commonjs",
-  "dependencies": {
-    "source-map-support": "^0.5.19",
-    "@bazel/bazelisk": "^1.7.5",
-    "@bazel/buildifier": "^4.0.1",
-    "@bazel/cypress": "^3.2.0",
-    "cypress": "^6.4.0",
-    "@bazel/esbuild": "^3.6.0",
-    "@bazel/ibazel": "^0.15.10",
-    "@bazel/terser": "^3.2.2",
-    "@bazel/typescript": "3.2.0",
-    "@microsoft/api-extractor": "^7.13.2",
-    "@types/chai": "^4.2.15",
-    "@types/express": "^4.17.9",
-    "@types/mocha": "^8.2.1",
+  "devDependencies": {
+    "@microsoft/api-extractor": "^7.16.1",
+    "@types/express": "^4.17.13",
+    "@types/jest": "^26.0.23",
+    "@types/mri": "^1.1.1",
     "@types/node": "^14.14.10",
     "@types/source-map-support": "^0.5.3",
     "@typescript-eslint/eslint-plugin": "^4.19.0",
     "@typescript-eslint/parser": "^4.19.0",
-    "chai": "^4.3.0",
-    "commander": "^6.2.0",
+    "concurrently": "^6.2.0",
+    "cypress": "^7.7.0",
     "domino": "^2.1.6",
+    "esbuild": "^0.12.13",
+    "esbuild-register": "^2.6.0",
     "eslint": "^7.23.0",
     "eslint-plugin-no-only-tests": "^2.4.0",
     "express": "^4.17.1",
-    "http-server": "^0.12.3",
     "husky": "^5.2.0",
+    "jest": "^27.0.5",
     "lint-staged": "^10.5.4",
-    "mocha": "^8.3.0",
+    "mri": "^1.1.6",
+    "np": "^7.5.0",
     "prettier": "2.3.0",
-    "serve-static": "^1.14.1",
-    "terser": "^5.6.0",
+    "rollup": "^2.52.2",
+    "source-map-support": "^0.5.19",
+    "start-server-and-test": "^1.12.6",
+    "terser": "^5.7.1",
     "todomvc-app-css": "^2.3.0",
     "todomvc-common": "^1.0.5",
     "typescript": "^4.2.0"
   },
   "scripts": {
+    "build": "tsc && node scripts && npm run api.ci",
+    "build.watch": "node scripts --dev --watch",
+    "tsc.check": "tsc --noEmit",
+    "tsc.watch": "tsc --noEmit --watch --preserveWatchOutput",
+    "start": "concurrently \"npm:build.watch\" \"npm:test.watch\" \"npm:tsc.watch\" -n build,test,tsc -c green,magenta,cyan",
+    "api": "tsc && node -r esbuild-register scripts/api.ts",
+    "api.ci": "node -r esbuild-register scripts/api.ts",
+    "api.update": "tsc && node -r esbuild-register scripts/api.ts --dev",
+    "release": "npm run build && npm run validate && np --contents dist-dev/@builder.io-qwik --no-2fa",
+    "test": "npm run build && jest && npm run test.e2e",
+    "test.unit": "jest",
+    "test.watch": "jest --watch",
+    "test.e2e": "start-server-and-test integration.server.prod http://localhost:8081 \"cypress run\"",
+    "test.e2e.open": "start-server-and-test integration.server.prod http://localhost:8081 \"cypress open\"",
+    "integration.server": "node scripts --dev && node integration/devserver.js --port 8080 --mode development",
+    "integration.server.prod": "tsc && node scripts && node integration/devserver.js --port 8081 --mode production",
+    "validate": "node -r esbuild-register scripts/validate.ts",
+    "prepare": "husky install",
+    "lint": "eslint \"**/*.ts*\" && npm run prettier-check",
+    "prettier-check": "prettier --check .",
+    "prettier-fix": "prettier --write .",
     "patch-m1": "npm run patch-m1-bazel && npm run patch-m1-ibazel && npm run patch-m1-buildifier",
     "patch-m1-bazel": "echo Patching Bazel for Apple M1 architecture compatibility && ln -fs ./bazelisk-darwin_amd64 node_modules/@bazel/bazelisk/bazelisk-darwin_arm64",
     "patch-m1-ibazel": "echo Patching iBazel for Apple M1 architecture compatibility && sed -i .bak \"s/'x64' : 'amd64',\\$/'x64' : 'amd64', 'arm64' : 'amd64',/\" ./node_modules/@bazel/ibazel/index.js",
     "patch-m1-buildifier": "echo Patching Buildifier for Apple M1 architecture compatibility && sed -i .bak \"s/'x64' : 'amd64',\\$/'x64' : 'amd64', 'arm64' : 'amd64',/\" ./node_modules/@bazel/buildifier/buildifier.js",
-    "integration:server": "bazel run //integration:devserver",
-    "test:unit": "bazel test  --test_tag_filters=unit  //...",
-    "test:e2e": "bazel test  --test_tag_filters=e2e  //...",
-    "test": "bazel test //...",
-    "lint": "eslint \"**/*.ts*\"",
-    "prettier-check": "prettier --check .",
-    "prettier-fix": "prettier --write .",
     "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier --warnings=attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-actions,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,out-of-order-load,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unsorted-dict-items,unused-variable",
     "bazel:lint": "npm run bazel:format -- --mode=check --lint=warn",
-    "bazel:lint-fix": "npm run bazel:format -- --mode=fix --lint=fix",
-    "cypress": "cypress open",
-    "prepare": "husky install"
+    "bazel:lint-fix": "npm run bazel:format -- --mode=fix --lint=fix"
+  },
+  "contributors": [
+    {
+      "name": "Miško Hevery",
+      "email": "misko@hevery.com",
+      "url": "https://github.com/BuilderIO/qwik"
+    },
+    {
+      "name": "Adam Bradley",
+      "email": "adam@builder.io",
+      "url": "https://twitter.com/adamdbradley"
+    }
+  ],
+  "license": "MIT",
+  "homepage": "https://github.com/BuilderIO/qwik#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/BuilderIO/qwik"
   },
-  "author": "Miško Hevery <misko@hevery.com>",
-  "license": "MIT"
+  "bugs": {
+    "url": "https://github.com/BuilderIO/qwik/issues"
+  },
+  "keywords": [
+    "ssr",
+    "server-side-render",
+    "prerender",
+    "ssg",
+    "static-site-generator",
+    "static-site",
+    "generator",
+    "website",
+    "webapp",
+    "framework",
+    "Builder.io"
+  ],
+  "engines": {
+    "node": ">= 14.14"
+  },
+  "lint-staged": {
+    "*.*": [
+      "prettier --write --ignore-unknown"
+    ],
+    "*.ts": [
+      "npx eslint"
+    ]
+  }
 }

scripts/BUILD.bazel

@@ -0,0 +1,19 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
+
+package(default_visibility = ["//visibility:public"])
+
+# This defines the binary we want as part of the rule.
+nodejs_binary(
+    name = "package_build_binary",
+    entry_point = ":index.js",
+)
+
+filegroup(
+    name = "all_ts",
+    srcs = glob(
+        [
+            "shim/__dirname.js",
+            "*.ts*",
+        ],
+    ),
+)

scripts/build.ts

@@ -0,0 +1,38 @@
+import { buildDevServer } from './devserver';
+import { copyFiles } from './copy-files';
+import { generatePackageJson } from './package-json';
+import { submoduleCore } from './submodule-core';
+import { submoduleJsxRuntime } from './submodule-jsx-runtime';
+import { submoduleOptimizer } from './submodule-optimizer';
+import { submoduleQwikLoader } from './submodule-qwikloader';
+import { submoduleServer } from './submodule-server';
+import { submoduleTesting } from './submodule-testing';
+import { mkdirSync, rmSync } from 'fs';
+import type { BuildConfig } from './util';
+
+export async function build(config: BuildConfig) {
+  try {
+    if (!config.dev) {
+      rmSync(config.pkgDir, { recursive: true, force: true });
+    }
+    try {
+      // ensure the build pkgDir exists
+      mkdirSync(config.pkgDir, { recursive: true });
+    } catch (e) {}
+
+    await Promise.all([
+      submoduleCore(config),
+      submoduleJsxRuntime(config),
+      submoduleQwikLoader(config),
+      submoduleServer(config),
+      submoduleTesting(config),
+      generatePackageJson(config),
+      copyFiles(config),
+      buildDevServer(config),
+    ]);
+
+    await submoduleOptimizer(config);
+  } catch (e) {
+    console.error(e);
+  }
+}

scripts/copy-files.ts

@@ -0,0 +1,13 @@
+import type { BuildConfig } from './util';
+import { copyFile } from 'fs/promises';
+import { basename, join } from 'path';
+
+export async function copyFiles(config: BuildConfig) {
+  const rootFiles = ['README.md', 'LICENSE'];
+
+  await Promise.all(
+    rootFiles.map((f) => {
+      copyFile(join(config.rootDir, f), join(config.pkgDir, basename(f)));
+    })
+  );
+}

scripts/devserver.ts

@@ -0,0 +1,19 @@
+import { build } from 'esbuild';
+import { join } from 'path';
+import { BuildConfig, importPath, watcher } from './util';
+
+export async function buildDevServer(config: BuildConfig) {
+  const integrationDir = join(config.rootDir, 'integration');
+
+  const r = await build({
+    entryPoints: [join(integrationDir, 'devserver.ts')],
+    outdir: integrationDir,
+    bundle: true,
+    format: 'cjs',
+    platform: 'node',
+    sourcemap: 'external',
+    watch: watcher(config),
+    external: ['esbuild', 'express', 'mri', 'source-map-support'],
+    plugins: [importPath(/^@builder\.io\/qwik\/optimizer$/, join(config.pkgDir, 'optimizer.cjs'))],
+  });
+}