diff --git a/ci/BUILD.bazel b/ci/BUILD.bazel index ead139c9c5..bd5ea24dd8 100644 --- a/ci/BUILD.bazel +++ b/ci/BUILD.bazel @@ -41,13 +41,10 @@ js_binary( "//project/ck3/recursive-vassals:patch", "//ts/cmd/svgshot:npm_pkg.publish", "//ts/cmd/svgshot:npm_pkg.tgz", - "//ts/cmd/svgshot:package.json", "//ts/do-sync:npm_pkg.publish", "//ts/do-sync:npm_pkg.tgz", - "//ts/do-sync:package.json", "//ts/knowitwhenyouseeit:npm_pkg.publish", "//ts/knowitwhenyouseeit:npm_pkg.tgz", - "//ts/knowitwhenyouseeit:package.json", ], entry_point = "postsubmit.js", diff --git a/js/npm/package_json/rules.bzl b/js/npm/package_json/rules.bzl index 7d23c13867..12e8cd95b4 100644 --- a/js/npm/package_json/rules.bzl +++ b/js/npm/package_json/rules.bzl @@ -24,7 +24,7 @@ def package_json(name, targets, template, version, depSpec): ], args = [ "--out", - "../../../$(execpath package.json)", + "../../../$(execpath package_new.json)", "--base", "../../../$(location //:package_json)", "--query", @@ -38,5 +38,5 @@ def package_json(name, targets, template, version, depSpec): "--depOnlyOut", "../../../$(execpath " + depSpec + ")", ], - outs = ["package.json", depSpec], + outs = ["package_new.json", depSpec], ) diff --git a/ts/math/conv_test.ts b/ts/math/conv_test.ts index 73a89099fc..3919305727 100644 --- a/ts/math/conv_test.ts +++ b/ts/math/conv_test.ts @@ -1,9 +1,12 @@ import * as cartesian from '#root/ts/math/cartesian.js'; +import { + Cartestian as C, + Euler as E, + Quaternion as Q, +} from '#root/ts/math/conv.js'; import * as euler_angle from '#root/ts/math/euler_angle.js'; import * as quaternion from '#root/ts/math/quaternion.js'; -import { Cartestian as C, Euler as E, Quaternion as Q } from './conv'; - describe('Conversions', () => { test('Quaternion from EulerAngles', () => { const eulerAngles = new euler_angle.EulerAngle( diff --git a/ts/next.js/component/Redirect/app.tsx b/ts/next.js/component/Redirect/app.tsx index f6fef35c72..2571c48879 100644 --- a/ts/next.js/component/Redirect/app.tsx +++ b/ts/next.js/component/Redirect/app.tsx @@ -4,7 +4,7 @@ * app router. */ -import Head from 'next/head'; +import Head from 'next/head.js'; import { useRouter } from 'next/navigation'; import { useEffect } from 'react'; diff --git a/ts/next.js/component/Redirect/index.tsx b/ts/next.js/component/Redirect/index.tsx index 143ddc0324..aa990993fb 100644 --- a/ts/next.js/component/Redirect/index.tsx +++ b/ts/next.js/component/Redirect/index.tsx @@ -1,5 +1,5 @@ import Head from 'next/head'; -import { useRouter } from 'next/router'; +import { useRouter } from 'next/router.js'; import { useEffect } from 'react'; export interface Props { diff --git a/ts/rules.bzl b/ts/rules.bzl index b868f814a6..7da0a0c6ff 100644 --- a/ts/rules.bzl +++ b/ts/rules.bzl @@ -39,7 +39,7 @@ def ts_project(name, visibility = None, deps = [], ignores_lint = [], resolve_js _ts_project( name = name, - srcs = srcs, + srcs = srcs + [ "//:package_json" ], tsconfig = tsconfig, # swc injects this deps = deps + ["//:node_modules/regenerator-runtime"], diff --git a/tsconfig.json b/tsconfig.json index 9b48faae0f..31220549bc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,11 @@ { "$schema": "https://json.schemastore.org/tsconfig", "compilerOptions": { - "module": "node16", + "module": "esnext", + "moduleResolution": "bundler", "target": "es2020", "strictFunctionTypes": true, "esModuleInterop": true, - "moduleResolution": "node16", "strict": true, "jsx": "react-jsx", "resolveJsonModule": true,