@slicemachine/init 1.1.16-dev-ct-slice-delete.2 → 1.1.16-dev-alpha.4

package/jest.config.js

@@ -11,7 +11,6 @@ module.exports = {
   testEnvironment: "node",
   transform: {
     "^.+\\.(ts|tsx)$": "ts-jest",
-    "^.+\\.js$": "babel-jest",
   },
   testTimeout: 15000,
   testPathIgnorePatterns: ["/node_modules/", "/__stubs__/"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slicemachine/init",
-  "version": "1.1.16-dev-ct-slice-delete.2",
+  "version": "1.1.16-dev-alpha.4",
   "description": "The easiest way to add Slice Machine to your project",
   "license": "MIT",
   "bin": {
@@ -16,13 +16,13 @@
     "prepublishOnly": "npm run test && npm run build",
     "test": "jest",
     "tsc": "tsc --project tsconfig.json --noEmit",
-    "tsc:watch": "tsc --project tsconfig.json --noEmit --watch"
+    "watch": "tsc --project tsconfig.json --noEmit --watch"
   },
   "dependencies": {
     "@hapi/hapi": "^20.2.0",
-    "@prismicio/types-internal": "^0.2.8",
-    "@slicemachine/client": "1.1.16-dev-ct-slice-delete.2",
-    "@slicemachine/core": "1.1.16-dev-ct-slice-delete.2",
+    "@prismicio/types-internal": "^1.5.3",
+    "@slicemachine/client": "1.1.16-dev-alpha.4",
+    "@slicemachine/core": "1.1.16-dev-alpha.4",
     "adm-zip": "^0.5.9",
     "analytics-node": "^6.0.0",
     "axios": "^0.24.0",
@@ -37,9 +37,6 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.8",
-    "@babel/preset-env": "^7.15.8",
-    "@babel/preset-typescript": "^7.15.0",
     "@rollup/plugin-replace": "^3.0.1",
     "@types/adm-zip": "^0.4.34",
     "@types/analytics-node": "^3.1.7",
@@ -52,7 +49,6 @@
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
-    "babel-jest": "^27.0.2",
     "better-npm-audit": "^3.4.0",
     "depcheck": "^1.4.3",
     "eslint": "^7.32.0",
@@ -60,16 +56,16 @@
     "eslint-import-resolver-typescript": "^2.4.0",
     "eslint-plugin-import": "^2.24.0",
     "eslint-plugin-jest": "^24.4.0",
-    "jest": "^27.4.7",
+    "jest": "^29.3.1",
     "mock-fs": "^5.1.2",
     "nock": "^13.1.3",
     "siroc": "^0.16.0",
     "stdout-stderr": "^0.1.13",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^29.0.3",
     "typescript": "^4.4.3"
   },
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "4c130c7471b4034ff2973c3610247d632ad9f55e"
+  "gitHead": "bea0fb6520e9200e0614e9fe062005561227b4f7"
 }

package/src/index.ts

@@ -95,7 +95,12 @@ async function init() {
   );
 
   // Install the required dependencies in the project.
-  await installRequiredDependencies(cwd, frameworkResult.value, wasStarter);
+  await installRequiredDependencies(
+    cwd,
+    frameworkResult.value,
+    wasStarter,
+    frameworkResult.version
+  );
 
   setVersion(cwd);
 

package/src/steps/detect-framework.ts

@@ -7,6 +7,7 @@ import Tracker from "../utils/tracker";
 export type FrameworkResult = {
   value: Models.Frameworks;
   manuallyAdded: boolean;
+  version?: string;
 };
 
 export async function promptForFramework(): Promise<FrameworkResult> {
@@ -31,6 +32,7 @@ export async function promptForFramework(): Promise<FrameworkResult> {
       return {
         value: res.framework,
         manuallyAdded: true,
+        version: undefined,
       };
     });
 }
@@ -47,21 +49,22 @@ export async function detectFramework(cwd: string): Promise<FrameworkResult> {
   spinner.start();
 
   try {
-    const maybeFramework = NodeUtils.Framework.defineFramework({
-      cwd,
-      supportedFrameworks: Object.values(Models.Frameworks),
-    });
+    const { framework, version } =
+      NodeUtils.Framework.defineFrameworkWithVersion({
+        cwd,
+        supportedFrameworks: Object.values(Models.Frameworks),
+      });
 
     spinner.stop();
 
-    if (!maybeFramework || maybeFramework === Models.Frameworks.vanillajs) {
+    if (!framework || framework === Models.Frameworks.vanillajs) {
       logs.writeError("Framework not detected");
       return await promptForFramework();
     }
 
-    const nameToPrint = NodeUtils.Framework.fancyName(maybeFramework);
+    const nameToPrint = NodeUtils.Framework.fancyName(framework);
 
-    if (!NodeUtils.Framework.isFrameworkSupported(maybeFramework)) {
+    if (!NodeUtils.Framework.isFrameworkSupported(framework)) {
       logs.writeError(`${nameToPrint} is currently not supported`);
       console.log(failMessage);
       process.exit(1);
@@ -70,8 +73,9 @@ export async function detectFramework(cwd: string): Promise<FrameworkResult> {
     logs.writeCheck(`${nameToPrint} detected`);
 
     return {
-      value: maybeFramework,
+      value: framework,
       manuallyAdded: false,
+      version,
     };
   } catch (error) {
     spinner.fail("package.json not found");

package/src/steps/install-required-dependencies.ts

@@ -1,5 +1,5 @@
 import path from "path";
-import { execCommand, logs } from "../utils";
+import { checkVersion, execCommand, logs } from "../utils";
 import { CONSTS, Models } from "@slicemachine/core";
 import * as NodeUtils from "@slicemachine/core/build/node-utils";
 
@@ -7,6 +7,7 @@ const {
   PRISMIC_CLIENT,
   PRISMIC_DOM_PACKAGE_NAME,
   PRISMIC_REACT_PACKAGE_NAME,
+  PRISMIC_NEXT,
   SM_PACKAGE_NAME,
   NUXT_PRISMIC,
   PRISMIC_VUE,
@@ -16,12 +17,25 @@ const {
   PRISMIC_TYPES,
 } = CONSTS;
 
-function depsForFramework(framework: Models.Frameworks): string {
+export function nextDeps(version?: string): string {
+  if (checkVersion(">=13.0.0", version)) {
+    return PRISMIC_NEXT;
+  }
+
+  return "";
+}
+
+function depsForFramework(
+  framework: Models.Frameworks,
+  version?: string
+): string {
   switch (framework) {
     case Models.Frameworks.react:
       return `${PRISMIC_REACT_PACKAGE_NAME} ${PRISMIC_CLIENT} ${PRISMIC_HELPERS}`;
     case Models.Frameworks.next:
-      return `${PRISMIC_REACT_PACKAGE_NAME} ${PRISMIC_CLIENT} ${SLICE_SIMULATOR_REACT} ${PRISMIC_HELPERS}`;
+      return `${PRISMIC_REACT_PACKAGE_NAME} ${nextDeps(
+        version
+      )} ${PRISMIC_CLIENT} ${SLICE_SIMULATOR_REACT} ${PRISMIC_HELPERS}`;
     case Models.Frameworks.svelte:
       return `${PRISMIC_DOM_PACKAGE_NAME} ${PRISMIC_CLIENT}`;
     case Models.Frameworks.nuxt:
@@ -35,6 +49,7 @@ function depsForFramework(framework: Models.Frameworks): string {
 
 async function addAndInstallDeps(
   framework: Models.Frameworks,
+  version?: string,
   useYarn = false
 ): Promise<string> {
   const installDevDependencyCommand = useYarn
@@ -46,7 +61,7 @@ async function addAndInstallDeps(
     `${installDevDependencyCommand} ${SM_PACKAGE_NAME} ${PRISMIC_TYPES}`
   );
 
-  const deps = depsForFramework(framework);
+  const deps = depsForFramework(framework, version);
   if (deps) await execCommand(`${installDependencyCommand} ${deps}`);
 
   return stderr;
@@ -61,7 +76,8 @@ async function installDeps(useYarn = false): Promise<string> {
 export async function installRequiredDependencies(
   cwd: string,
   framework: Models.Frameworks,
-  skipDependencies: boolean
+  skipDependencies: boolean,
+  version?: string
 ): Promise<void> {
   const yarnLock = NodeUtils.Files.exists(NodeUtils.YarnLockPath(cwd));
 
@@ -70,7 +86,7 @@ export async function installRequiredDependencies(
 
   const stderr = await (skipDependencies
     ? installDeps(yarnLock)
-    : addAndInstallDeps(framework, yarnLock));
+    : addAndInstallDeps(framework, version, yarnLock));
 
   const pathToPkg = path.join(
     NodeUtils.PackagePaths(cwd).value(),

package/src/utils/index.ts

@@ -5,6 +5,7 @@ export * as logs from "./logs";
 export { Auth } from "./auth";
 export * from "./client";
 export * from "./fs";
+export * from "./versionCheck";
 
 export function findArgument(args: string[], name: string): string | undefined {
   const flagIndex: number = args.indexOf(`--${name}`);

package/src/utils/versionCheck.ts

@@ -0,0 +1,9 @@
+import semver from "semver";
+
+export function checkVersion(threshold: string, version?: string): boolean {
+  if (!version) return false;
+  const parsedVersion = semver.coerce(version);
+  if (parsedVersion === null) return false;
+
+  return semver.satisfies(parsedVersion, threshold);
+}

package/babel.config.js

@@ -1,7 +0,0 @@
-// babel.config.js
-module.exports = {
-  presets: [
-    ["@babel/preset-env", { targets: { node: "current" } }],
-    "@babel/preset-typescript",
-  ],
-};