Skip to content

Commit 67d6956

Browse files
committed
Merge branch 'main' into FW-6538
2 parents 2e0adfe + c7eb606 commit 67d6956

File tree

24 files changed

+38
-15241
lines changed

24 files changed

+38
-15241
lines changed

docs/developer-resources/guides/first-app-v4/intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ It’s easy to get started. Note that all code referenced in this guide can be [
1111
Download/install these right away to ensure an optimal Ionic development experience:
1212

1313
- [Git](https://git-scm.com/downloads) for version control.
14-
- <strong>SSH client</strong>, such as [PuTTy](https://www.putty.org/), for secure login to Appflow.
14+
- <strong>SSH client</strong>, such as [PuTTy](https://putty.software/), for secure login to Appflow.
1515
- <strong>Node.js</strong> for interacting with the Ionic ecosystem. [Download the LTS version here](https://nodejs.org/en/).
1616
- <strong>A code editor</strong> for... writing code! We are fans of [Visual Studio Code](https://code.visualstudio.com/).
1717
- <strong>Command-line terminal (CLI)</strong>: FYI <strong>Windows</strong> users, for the best Ionic experience, we

src/components/global/Playground/stackblitz.utils.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ const openReactEditor = async (code: string, options?: EditorOptions) => {
173173
'react/variables.css',
174174
'react/tsconfig.json',
175175
'react/package.json',
176-
'react/package-lock.json',
177176
'react/index.html',
178177
'react/vite.config.js',
179178
'react/browserslistrc',
@@ -193,17 +192,16 @@ const openReactEditor = async (code: string, options?: EditorOptions) => {
193192

194193
const appTsx = 'src/App.tsx';
195194
const files = {
196-
'.eslintrc.js': defaultFiles[9],
197-
'.browserslistrc': defaultFiles[8],
198-
'vite.config.js': defaultFiles[7],
199-
'index.html': defaultFiles[6],
195+
'.eslintrc.js': defaultFiles[8],
196+
'.browserslistrc': defaultFiles[7],
197+
'vite.config.js': defaultFiles[6],
198+
'index.html': defaultFiles[5],
200199
'src/index.tsx': defaultFiles[0],
201200
[appTsx]: defaultFiles[1],
202201
'src/main.tsx': code,
203202
'src/theme/variables.css': defaultFiles[2],
204203
'tsconfig.json': defaultFiles[3],
205204
'package.json': JSON.stringify(package_json, null, 2),
206-
'package-lock.json': defaultFiles[5],
207205
...options?.files,
208206
'.stackblitzrc': `{
209207
"startCommand": "yarn run start"
@@ -224,7 +222,6 @@ const openVueEditor = async (code: string, options?: EditorOptions) => {
224222
const defaultFiles = await loadSourceFiles(
225223
[
226224
'vue/package.json',
227-
'vue/package-lock.json',
228225
'vue/index.html',
229226
'vue/variables.css',
230227
'vue/vite.config.ts',
@@ -247,16 +244,15 @@ const openVueEditor = async (code: string, options?: EditorOptions) => {
247244

248245
const mainTs = 'src/main.ts';
249246
const files = {
250-
'src/App.vue': defaultFiles[6],
247+
'src/App.vue': defaultFiles[5],
251248
'src/components/Example.vue': code,
252-
[mainTs]: defaultFiles[5],
253-
'src/theme/variables.css': defaultFiles[3],
254-
'index.html': defaultFiles[2],
255-
'vite.config.ts': defaultFiles[4],
249+
[mainTs]: defaultFiles[4],
250+
'src/theme/variables.css': defaultFiles[2],
251+
'index.html': defaultFiles[1],
252+
'vite.config.ts': defaultFiles[3],
256253
'package.json': JSON.stringify(package_json, null, 2),
257-
'package-lock.json': defaultFiles[1],
258-
'tsconfig.json': defaultFiles[7],
259-
'tsconfig.node.json': defaultFiles[8],
254+
'tsconfig.json': defaultFiles[6],
255+
'tsconfig.node.json': defaultFiles[7],
260256
...options?.files,
261257
'.stackblitzrc': `{
262258
"startCommand": "yarn run dev"

static/code/stackblitz/v6/angular/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"experimentalDecorators": true,
1010
"module": "esnext",
1111
"moduleResolution": "node",
12+
"skipLibCheck": true,
1213
"importHelpers": true,
1314
"target": "es2015",
1415
"typeRoots": ["node_modules/@types"],

0 commit comments

Comments
 (0)